From 8248ad23ed468d8a88945cb04f45307230b56828 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 23 Jul 2025 09:41:38 -0700 Subject: [PATCH] Revert support for case insensitive sample/data names --- data/api/rlabkey-api-experiment.xml | 2 +- src/org/labkey/test/tests/SampleTypeTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/api/rlabkey-api-experiment.xml b/data/api/rlabkey-api-experiment.xml index ceb0030015..294539277e 100644 --- a/data/api/rlabkey-api-experiment.xml +++ b/data/api/rlabkey-api-experiment.xml @@ -285,7 +285,7 @@ diff --git a/src/org/labkey/test/tests/SampleTypeTest.java b/src/org/labkey/test/tests/SampleTypeTest.java index d294a853f2..88b1b6547f 100644 --- a/src/org/labkey/test/tests/SampleTypeTest.java +++ b/src/org/labkey/test/tests/SampleTypeTest.java @@ -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); @@ -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);