Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/api/rlabkey-api-experiment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<![CDATA[
Rows via createAndLoad = 3
Rows via insert = 2
already exists
duplicate key
Rows via merge = 10
Has audit transaction id = TRUE
]]>
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/SampleTypeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public void testImportTypeOptions()
String overlap = "Name1\tToBee\n";
String newData = "Name2\tSee\n";
setFormElement(Locator.name("text"), header + overlap + newData);
clickButton("Submit", "already exists");
clickButton("Submit", "duplicate key");

log("Switch to 'Insert and Replace'");
importDataPage.setCopyPasteMerge(true);
Expand All @@ -481,7 +481,7 @@ public void testImportTypeOptions()
importDataPage = drt.clickImportBulkData();
importDataPage.setFile(sampleData);
final String errorText = importDataPage.submitExpectingError();
Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("already exists"));
Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("duplicate key"));
// TODO: Regression check for Issue 44202: Ugly error when data import fails due to duplicate key
// Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.length() < 100);

Expand Down