From 8c08b13ee6f1f051e15f71bf0241876c8313d5bc Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Tue, 21 Jul 2026 10:51:52 -0700 Subject: [PATCH 1/3] fix --- .../test/tests/study/StudyProtocolDesignerTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java b/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java index 37718e80714..789189eac89 100644 --- a/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java +++ b/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java @@ -91,12 +91,13 @@ private static String trickyVisitLabel(String part) return TestDataGenerator.randomName(part, 3, 3, TRICKY_CHARACTERS, null).name(); } + private static final List VISITS = Arrays.asList( - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("Enrollment"), 0.0, 0.0), - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("Visit 1"), 1.0, 1.0), - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("Visit 2"), 2.0, 2.0), - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("Visit 3"), 3.0, 3.0), - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("Visit 4"), 4.0, 4.0) + new BaseManageVaccineDesignVisitPage.Visit("Enrollment", 0.0, 0.0), + new BaseManageVaccineDesignVisitPage.Visit("Visit 1", 1.0, 1.0), + new BaseManageVaccineDesignVisitPage.Visit("Visit 2", 2.0, 2.0), + new BaseManageVaccineDesignVisitPage.Visit("Visit 3", 3.0, 3.0), + new BaseManageVaccineDesignVisitPage.Visit("Visit 4", 4.0, 4.0) ); private static final List NEW_VISITS = Arrays.asList( new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("NewVisit1"), 6.0, 7.0), @@ -294,7 +295,7 @@ public void testManageTreatmentsSingleTable() { ManageTreatmentsSingleTablePage singleManagementTable; TreatmentDialog treatmentDialog; - List EXPECTED_HEADERS = new ArrayList<>(Arrays.asList("Group / Cohort", "Participant Count", "Enrollment", "Visit 1", "Visit 2", "NewVisit1", "NewVisit2")); + List EXPECTED_HEADERS = new ArrayList<>(Arrays.asList("Group / Cohort", "Participant Count", "Enrollment", "Visit 1", "Visit 2", NEW_VISITS.get(0).getLabel(), NEW_VISITS.get(1).getLabel())); String tempText; // These are the expected Immunogen options: From 9f4344aa6d2ecbe1412e80b184c878802c3f25cc Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Tue, 21 Jul 2026 10:56:00 -0700 Subject: [PATCH 2/3] fix style --- .../test/tests/study/StudyProtocolDesignerTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java b/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java index 789189eac89..2315a85c076 100644 --- a/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java +++ b/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java @@ -86,11 +86,6 @@ public class StudyProtocolDesignerTest extends BaseWebDriverTest implements Post private static final String[] NEW_COHORTS = {"TestCohort", "OtherTestCohort"}; private static final String[] CHALLENGES = {"Challenge1", "Challenge2", "Challenge3"}; - private static String trickyVisitLabel(String part) - { - return TestDataGenerator.randomName(part, 3, 3, TRICKY_CHARACTERS, null).name(); - } - private static final List VISITS = Arrays.asList( new BaseManageVaccineDesignVisitPage.Visit("Enrollment", 0.0, 0.0), @@ -100,8 +95,8 @@ private static String trickyVisitLabel(String part) new BaseManageVaccineDesignVisitPage.Visit("Visit 4", 4.0, 4.0) ); private static final List NEW_VISITS = Arrays.asList( - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("NewVisit1"), 6.0, 7.0), - new BaseManageVaccineDesignVisitPage.Visit(trickyVisitLabel("NewVisit2"), 8.0, 8.0) + new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit1", 3, 3, TRICKY_CHARACTERS, null).name(), 6.0, 7.0), + new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit2", 3, 3, TRICKY_CHARACTERS, null).name(), 8.0, 8.0) ); From 385794c8fb688255ded8458fc813e3eb030f89b1 Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Wed, 22 Jul 2026 10:14:51 -0700 Subject: [PATCH 3/3] exclude backslash --- .../labkey/test/tests/study/StudyProtocolDesignerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java b/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java index 2315a85c076..84bb4806b2d 100644 --- a/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java +++ b/study/test/src/org/labkey/test/tests/study/StudyProtocolDesignerTest.java @@ -94,9 +94,10 @@ public class StudyProtocolDesignerTest extends BaseWebDriverTest implements Post new BaseManageVaccineDesignVisitPage.Visit("Visit 3", 3.0, 3.0), new BaseManageVaccineDesignVisitPage.Visit("Visit 4", 4.0, 4.0) ); + private static final List NEW_VISITS = Arrays.asList( - new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit1", 3, 3, TRICKY_CHARACTERS, null).name(), 6.0, 7.0), - new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit2", 3, 3, TRICKY_CHARACTERS, null).name(), 8.0, 8.0) + new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit1", 3, 3, TRICKY_CHARACTERS, "\\").name(), 6.0, 7.0), + new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit2", 3, 3, TRICKY_CHARACTERS, "\\").name(), 8.0, 8.0) );