Skip to content

Commit 15dfdde

Browse files
authored
Revert support for case insensitive sample/data names (#2576)
1 parent b0e42cd commit 15dfdde

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

data/api/rlabkey-api-experiment.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
<![CDATA[
286286
Rows via createAndLoad = 3
287287
Rows via insert = 2
288-
already exists
288+
duplicate key
289289
Rows via merge = 10
290290
Has audit transaction id = TRUE
291291
]]>

src/org/labkey/test/tests/SampleTypeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public void testImportTypeOptions()
456456
String overlap = "Name1\tToBee\n";
457457
String newData = "Name2\tSee\n";
458458
setFormElement(Locator.name("text"), header + overlap + newData);
459-
clickButton("Submit", "already exists");
459+
clickButton("Submit", "duplicate key");
460460

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

0 commit comments

Comments
 (0)