Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,17 @@ 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<BaseManageVaccineDesignVisitPage.Visit> 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<BaseManageVaccineDesignVisitPage.Visit> 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, TestDataGenerator.CHARSET_STRING, "").name(), 6.0, 7.0),
new BaseManageVaccineDesignVisitPage.Visit(TestDataGenerator.randomName("NewVisit2", 3, 3, TestDataGenerator.CHARSET_STRING, "").name(), 8.0, 8.0)
);


Expand All @@ -126,6 +122,7 @@ public void preTest()
clickProject(getProjectName());
}

//Sometimes fails intermittently GitHub Issue 1335.
@Test
public void testStudyProtocolDesigner()
{
Expand Down Expand Up @@ -294,7 +291,7 @@ public void testManageTreatmentsSingleTable()
{
ManageTreatmentsSingleTablePage singleManagementTable;
TreatmentDialog treatmentDialog;
List<String> EXPECTED_HEADERS = new ArrayList<>(Arrays.asList("Group / Cohort", "Participant Count", "Enrollment", "Visit 1", "Visit 2", "NewVisit1", "NewVisit2"));
List<String> 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:
Expand Down