From 4047b0625310320c762f72e62c52ac7d0f279631 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Thu, 3 Jul 2025 09:47:49 -0700 Subject: [PATCH 1/2] Use OS-specific file separator for expected file paths --- .../labkey/test/tests/core/admin/AllowedFileExtensionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java index 70b95debb2..70642ba06e 100644 --- a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java +++ b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java @@ -381,7 +381,7 @@ public void testAllowedFileExtensionsInSampleType() { fieldMap = Map.of("Name", String.format("S-%d", i), stFileField, fileMap.get(allowedType).getAbsolutePath()); sampleTypeHelper.insertRow(fieldMap); - expectedValues.add(String.format(" sampletype/%s", fileMap.get(allowedType).getName())); + expectedValues.add(" sampletype" + File.separator + fileMap.get(allowedType).getName()); i++; } From 6af7441666bcf112b344d409940a5c06fe31cc75 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Thu, 3 Jul 2025 09:49:17 -0700 Subject: [PATCH 2/2] Leave string.format --- .../labkey/test/tests/core/admin/AllowedFileExtensionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java index 70642ba06e..e20c43fb95 100644 --- a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java +++ b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java @@ -381,7 +381,7 @@ public void testAllowedFileExtensionsInSampleType() { fieldMap = Map.of("Name", String.format("S-%d", i), stFileField, fileMap.get(allowedType).getAbsolutePath()); sampleTypeHelper.insertRow(fieldMap); - expectedValues.add(" sampletype" + File.separator + fileMap.get(allowedType).getName()); + expectedValues.add(String.format(" sampletype%s%s", File.separator, fileMap.get(allowedType).getName())); i++; }