From 1ec92f5a0f443571a6ad014a7556aaa6b10a9868 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 8 Jul 2025 10:05:25 -0700 Subject: [PATCH 1/2] update duplicate key msg in tests --- src/org/labkey/test/tests/SampleTypeTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/SampleTypeTest.java b/src/org/labkey/test/tests/SampleTypeTest.java index 3c687fdaaf..dbd7f07ed0 100644 --- a/src/org/labkey/test/tests/SampleTypeTest.java +++ b/src/org/labkey/test/tests/SampleTypeTest.java @@ -449,7 +449,7 @@ public void testImportTypeOptions() String overlap = "Name1\tToBee\n"; String newData = "Name2\tSee\n"; setFormElement(Locator.name("text"), header + overlap + newData); - clickButton("Submit", "duplicate key"); + clickButton("Submit", "already exists"); log("Switch to 'Insert and Replace'"); importDataPage.setCopyPasteMerge(true); @@ -474,7 +474,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("duplicate key")); + Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("already exists")); // 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); From 90bf2371272cfdb74e629af4e84f7dbb74b87a22 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 10 Jul 2025 09:23:35 -0700 Subject: [PATCH 2/2] update duplicate key msg --- data/api/rlabkey-api-experiment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/api/rlabkey-api-experiment.xml b/data/api/rlabkey-api-experiment.xml index 294539277e..ceb0030015 100644 --- a/data/api/rlabkey-api-experiment.xml +++ b/data/api/rlabkey-api-experiment.xml @@ -285,7 +285,7 @@