Skip to content

Integration tests for SaveRowsApiCommand #2568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 7 commits into from
Jul 18, 2025
Merged

Integration tests for SaveRowsApiCommand #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
50a4c9b
Integration tests for SaveRowsApiCommand
labkey-nicka Jul 16, 2025
018789d
addCommands
labkey-nicka Jul 17, 2025
4ad4469
SaveRowsCommand -> BaseRowsCommand
labkey-nicka Jul 17, 2025
7d05e87
SaveRowsResponse -> RowsResponse
labkey-nicka Jul 17, 2025
c7dc4f6
SaveRowsApi -> SaveRows
labkey-nicka Jul 17, 2025
a1279dd
Update usages
labkey-nicka Jul 17, 2025
50b35e0
Test updates
labkey-nicka Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/org/labkey/test/WebTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import org.labkey.remoteapi.SimplePostCommand;
import org.labkey.remoteapi.query.DeleteRowsCommand;
import org.labkey.remoteapi.query.Filter;
import org.labkey.remoteapi.query.SaveRowsResponse;
import org.labkey.remoteapi.query.RowsResponse;
import org.labkey.remoteapi.query.SelectRowsCommand;
import org.labkey.serverapi.reader.Readers;
import org.labkey.test.util.InstallCert;
Expand Down Expand Up @@ -200,7 +200,7 @@ public static void deleteApiKey(Connection connection, String apiKey)
{
DeleteRowsCommand deleteRowsCommand = new DeleteRowsCommand("core", "apiKeys");
deleteRowsCommand.setRows(rows);
SaveRowsResponse response = deleteRowsCommand.execute(connection, null);
RowsResponse response = deleteRowsCommand.execute(connection, null);
savedApiKeys.remove(apiKey);
deletedApiKeys.add(apiKey);
Assert.assertEquals("Wrong number of rows affected by apiKey deletion", 1, response.getRowsAffected());
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/ApiKeyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.labkey.remoteapi.query.GetQueryDetailsResponse;
import org.labkey.remoteapi.query.GetSchemasCommand;
import org.labkey.remoteapi.query.ImportDataResponse;
import org.labkey.remoteapi.query.SaveRowsResponse;
import org.labkey.remoteapi.query.RowsResponse;
import org.labkey.remoteapi.query.SelectRowsCommand;
import org.labkey.remoteapi.query.SelectRowsResponse;
import org.labkey.remoteapi.query.Sort;
Expand Down Expand Up @@ -379,7 +379,7 @@ private void verifyValidAPIKey(Connection connection, String userEmail) throws I
valueCount.incrementAndGet();
assertEquals("Rows imported", 1, importResponse.getRowCount());

SaveRowsResponse saveResponse = queryApiHelper.insertRows(List.of(Map.of(LIST_VALUE, "value" + valueCount.get())));
RowsResponse saveResponse = queryApiHelper.insertRows(List.of(Map.of(LIST_VALUE, "value" + valueCount.get())));
valueCount.incrementAndGet();
assertEquals("Rows inserted", 1, saveResponse.getRowsAffected());

Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/AuditLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.labkey.remoteapi.CommandException;
import org.labkey.remoteapi.Connection;
import org.labkey.remoteapi.query.InsertRowsCommand;
import org.labkey.remoteapi.query.SaveRowsResponse;
import org.labkey.remoteapi.query.RowsResponse;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.TestFileUtils;
Expand Down Expand Up @@ -437,7 +437,7 @@ public void testDetailedQueryUpdateAuditLog() throws IOException, CommandExcepti
Map<String, Object> rowMap = new HashMap<>();
rowMap.put("name", "Kia");
insertCmd.addRow(rowMap);
SaveRowsResponse resp1 = insertCmd.execute(cn, AUDIT_DETAILED_TEST_PROJECT);
RowsResponse resp1 = insertCmd.execute(cn, AUDIT_DETAILED_TEST_PROJECT);

Map<String, String> auditLog = getAuditLogRow(this, "Query update events", "Query Name", "Manufacturers");
assertEquals("Did not find expected audit log for summary log level", "1 row(s) were inserted.", auditLog.get("Comment"));
Expand Down
10 changes: 5 additions & 5 deletions src/org/labkey/test/tests/ContainerContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.labkey.remoteapi.query.DeleteRowsCommand;
import org.labkey.remoteapi.query.Filter;
import org.labkey.remoteapi.query.InsertRowsCommand;
import org.labkey.remoteapi.query.SaveRowsResponse;
import org.labkey.remoteapi.query.RowsResponse;
import org.labkey.remoteapi.query.SelectRowsCommand;
import org.labkey.remoteapi.query.SelectRowsResponse;
import org.labkey.test.BaseWebDriverTest;
Expand Down Expand Up @@ -612,7 +612,7 @@ private String insertEmissionTest(String workbookId, String suffix, int vehicleI
rowMap.put("result", false);

insertCmd.addRow(rowMap);
SaveRowsResponse response = insertCmd.execute(cn, getProjectName() + "/" + workbookId);
RowsResponse response = insertCmd.execute(cn, getProjectName() + "/" + workbookId);
Map<String, Object> row = response.getRows().get(0);
Integer rowId = (Integer)row.get("RowId");
return rowId.toString();
Expand Down Expand Up @@ -694,15 +694,15 @@ private int createRequiredRecords() throws IOException, CommandException
Map<String,Object> rowMap = new HashMap<>();
rowMap.put("name", MANUFACTURER);
insertCmd.addRow(rowMap);
SaveRowsResponse resp1 = insertCmd.execute(cn, getProjectName());
RowsResponse resp1 = insertCmd.execute(cn, getProjectName());

//then create model
InsertRowsCommand insertCmd2 = new InsertRowsCommand("vehicle", "models");
rowMap = new HashMap<>();
rowMap.put("manufacturerId", resp1.getRows().get(0).get("rowid"));
rowMap.put("name", MODEL);
insertCmd2.addRow(rowMap);
SaveRowsResponse resp2 = insertCmd2.execute(cn, getProjectName());
RowsResponse resp2 = insertCmd2.execute(cn, getProjectName());

InsertRowsCommand insertCmd3 = new InsertRowsCommand("vehicle", "vehicles");
rowMap = new HashMap<>();
Expand All @@ -713,7 +713,7 @@ private int createRequiredRecords() throws IOException, CommandException
rowMap.put("LastService", new Date());

insertCmd3.addRow(rowMap);
SaveRowsResponse response = insertCmd3.execute(cn, getProjectName());
RowsResponse response = insertCmd3.execute(cn, getProjectName());

Map<String, Object> row = response.getRows().get(0);
return (Integer)row.get("RowId");
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/DomainDesignerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.labkey.remoteapi.domain.GetDomainDetailsCommand;
import org.labkey.remoteapi.domain.PropertyDescriptor;
import org.labkey.remoteapi.query.Filter;
import org.labkey.remoteapi.query.SaveRowsResponse;
import org.labkey.remoteapi.query.RowsResponse;
import org.labkey.remoteapi.query.SelectRowsResponse;
import org.labkey.serverapi.collections.ArrayListMap;
import org.labkey.test.BaseWebDriverTest;
Expand Down Expand Up @@ -144,7 +144,7 @@ public void testListNumericFormatting() throws Exception
dgen.addCustomRow(Map.of("Number", 3, "integerField", 123456789, "decimalField", 12345.678));
dgen.addCustomRow(Map.of("Number", 4, "integerField", 98765432, "decimalField", 1234.56789));
dgen.addCustomRow(Map.of("Number", 5, "integerField", 4, "decimalField", 5.654));
SaveRowsResponse response = dgen.insertRows(createDefaultConnection(), dgen.getRows());
RowsResponse response = dgen.insertRows(createDefaultConnection(), dgen.getRows());

goToProjectHome();
clickAndWait(Locator.linkWithText(listName));
Expand Down
10 changes: 5 additions & 5 deletions src/org/labkey/test/tests/ExternalSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.labkey.remoteapi.query.DeleteRowsCommand;
import org.labkey.remoteapi.query.Filter;
import org.labkey.remoteapi.query.InsertRowsCommand;
import org.labkey.remoteapi.query.SaveRowsResponse;
import org.labkey.remoteapi.query.RowsResponse;
import org.labkey.remoteapi.query.SelectRowsCommand;
import org.labkey.remoteapi.query.SelectRowsResponse;
import org.labkey.remoteapi.query.Sort;
Expand Down Expand Up @@ -305,7 +305,7 @@ void doTestUneditable()

try
{
SaveRowsResponse resp = cmd.execute(cn, PROJECT_NAME);
RowsResponse resp = cmd.execute(cn, PROJECT_NAME);
fail("Expected to throw CommandException");
}
catch (CommandException ex)
Expand Down Expand Up @@ -403,7 +403,7 @@ int[] insertViaJavaApi(String containerPath, Connection cn, Row... rows) throws
for (Row row : rows)
cmd.addRow(row.toMap());

SaveRowsResponse resp = cmd.execute(cn, containerPath);
RowsResponse resp = cmd.execute(cn, containerPath);
assertEquals("Expected to insert " + rows.length + " rows", rows.length, resp.getRowsAffected().intValue());

int[] pks = new int[rows.length];
Expand Down Expand Up @@ -449,7 +449,7 @@ Row[] updateViaJavaApi(String containerPath, Connection cn, Row... rows) throws
UpdateRowsCommand cmd = new UpdateRowsCommand(USER_SCHEMA_NAME, TABLE_NAME);
for (Row row : rows)
cmd.addRow(row.toMap());
SaveRowsResponse resp = cmd.execute(cn, containerPath);
RowsResponse resp = cmd.execute(cn, containerPath);
assertEquals("Expected to update " + rows.length + " rows", rows.length, resp.getRowsAffected().intValue());

Row[] updated = new Row[rows.length];
Expand Down Expand Up @@ -491,7 +491,7 @@ void deleteViaJavaApi(String containerPath, Connection cn, int... pks) throws IO
for (Integer pk : pks)
cmd.addRow(Collections.singletonMap("RowId", pk));

SaveRowsResponse resp = cmd.execute(cn, containerPath);
RowsResponse resp = cmd.execute(cn, containerPath);
assertEquals("Expected to delete " + pks.length + " rows", pks.length, resp.getRowsAffected().intValue());

SelectRowsCommand selectCmd = new SelectRowsCommand(USER_SCHEMA_NAME, TABLE_NAME);
Expand Down
Loading