Skip to content

Commit

Permalink
Merge branch 'develop' into proj-m20-to-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@wcgunter
wcgunter committed Nov 8, 2023
2 parents 5550187 + a5df5ba commit 1b66cb0
Show file tree
Hide file tree
Showing 57 changed files with 1,509 additions and 368 deletions.
4 changes: 0 additions & 4 deletions cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,9 @@ public void runHistoryPageTest() {
log.info("------ START HistoryTestIT:runResultsTest ------");
gotoLoginPage();
login();

goToPage("deployments");

startProcDef("test_history_page", "Test History Page", 90000);

runResultsTest();

if(Integer.toString(testCasesCompleted).equals("1")) {
scriptPass = true;
} else {
Expand Down
157 changes: 81 additions & 76 deletions cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,44 +83,47 @@ public void runStartInitiatorTest() throws IOException {
JavascriptExecutor js = (JavascriptExecutor) driver;
js.executeScript("ace.edit('editorDiv').navigateFileEnd();");
js.executeScript("ace.edit('editorDiv').setValue('');");
String initiatorXML = String.join(System.getProperty("line.separator"),
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
"<beans ",
" xmlns=\"http://www.springframework.org/schema/beans\"",
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
" xsi:schemaLocation=\"",
" http://www.springframework.org/schema/beans",
" http://www.springframework.org/schema/beans/spring-beans.xsd\">",
"",
" <bean id=\"repeat_1\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"test_initiators_page\" />",
" <property name=\"delayBetweenProcesses\" value=\"1000\" />",
" <property name=\"maxRepeats\" value=\"10\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"",
" <bean id=\"cron_initiator\" class=\"jpl.cws.process.initiation.cron.CronInitiator\">",
" <property name=\"procDefKey\" value=\"test_initiators_page\" />",
" <property name=\"cronExpression\" value=\" 0 0/1 * 1/1 * ? *\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"</beans>",
"",
"");

aceEditor.sendKeys(initiatorXML.replace(" ", ""));
String initiatorXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<beans \n" +
" xmlns=\"http://www.springframework.org/schema/beans\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"\n" +
" http://www.springframework.org/schema/beans\n" +
" http://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
"\n" +
" <bean id=\"repeat_1\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_initiators_page\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"1000\" />\n" +
" <property name=\"maxRepeats\" value=\"10\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"\n" +
" <bean id=\"cron_initiator\" class=\"jpl.cws.process.initiation.cron.CronInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_initiators_page\" />\n" +
" <property name=\"cronExpression\" value=\" 0 0/1 * 1/1 * ? *\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"</beans>\n" +
"\n" +
"\n" +
"";


initiatorXML = initiatorXML.replace("\n", "\\n").replace("\"", "\\\"");

js.executeScript("ace.edit('editorDiv').setValue(\"" + initiatorXML + "\");");

waitForElementID("saveXmlBtn");
log.info("Saving changes..");
Expand Down Expand Up @@ -248,44 +251,46 @@ public void runCronInitiatorTest() throws IOException {
JavascriptExecutor js = (JavascriptExecutor) driver;
js.executeScript("ace.edit('editorDiv').navigateFileEnd();");
js.executeScript("ace.edit('editorDiv').setValue('');");
String initiatorXML = String.join(System.getProperty("line.separator"),
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
"<beans ",
" xmlns=\"http://www.springframework.org/schema/beans\"",
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
" xsi:schemaLocation=\"",
" http://www.springframework.org/schema/beans",
" http://www.springframework.org/schema/beans/spring-beans.xsd\">",
"",
" <bean id=\"repeat_1\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"test_initiators_page\" />",
" <property name=\"delayBetweenProcesses\" value=\"1000\" />",
" <property name=\"maxRepeats\" value=\"10\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"",
" <bean id=\"cron_initiator\" class=\"jpl.cws.process.initiation.cron.CronInitiator\">",
" <property name=\"procDefKey\" value=\"test_initiators_page\" />",
" <property name=\"cronExpression\" value=\" 0 0/1 * 1/1 * ? *\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"</beans>",
"",
"");

aceEditor.sendKeys(initiatorXML.replace(" ", ""));
String initiatorXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<beans \n" +
" xmlns=\"http://www.springframework.org/schema/beans\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"\n" +
" http://www.springframework.org/schema/beans\n" +
" http://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
"\n" +
" <bean id=\"repeat_1\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_initiators_page\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"1000\" />\n" +
" <property name=\"maxRepeats\" value=\"10\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"\n" +
" <bean id=\"cron_initiator\" class=\"jpl.cws.process.initiation.cron.CronInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_initiators_page\" />\n" +
" <property name=\"cronExpression\" value=\" 0 0/1 * 1/1 * ? *\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"</beans>\n" +
"\n" +
"";


initiatorXML = initiatorXML.replace("\n", "\\n").replace("\"", "\\\"");

js.executeScript("ace.edit('editorDiv').setValue(\"" + initiatorXML + "\");");

waitForElementID("saveXmlBtn");
driver.findElement(By.id("saveXmlBtn")).click();
Expand Down
158 changes: 80 additions & 78 deletions cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,84 +91,86 @@ public void runStartLoadTest() throws IOException {
JavascriptExecutor js = (JavascriptExecutor) driver;
js.executeScript("ace.edit('editorDiv').navigateFileEnd();");
js.executeScript("ace.edit('editorDiv').setValue('');");
String initiatorXML = String.join(System.getProperty("line.separator"),
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
"<beans ",
" xmlns=\"http://www.springframework.org/schema/beans\"",
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
" xsi:schemaLocation=\"",
" http://www.springframework.org/schema/beans",
" http://www.springframework.org/schema/beans/spring-beans.xsd\">",
"",
" <bean id=\"repeat_1\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"external_pwd\" />",
" <property name=\"delayBetweenProcesses\" value=\"10\" />",
" <property name=\"maxRepeats\" value=\"200\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"",
" <bean id=\"repeat_2\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"test_simplest\" />",
" <property name=\"delayBetweenProcesses\" value=\"10\" />",
" <property name=\"maxRepeats\" value=\"200\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"",
" <bean id=\"repeat_3\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"test_initiators_page\" />",
" <property name=\"delayBetweenProcesses\" value=\"10\" />",
" <property name=\"maxRepeats\" value=\"200\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"",
" <bean id=\"repeat_4\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"test_hello_world\" />",
" <property name=\"delayBetweenProcesses\" value=\"10\" />",
" <property name=\"maxRepeats\" value=\"200\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"",
" <bean id=\"repeat_5\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">",
" <property name=\"procDefKey\" value=\"test_logs_page\" />",
" <property name=\"delayBetweenProcesses\" value=\"10\" />",
" <property name=\"maxRepeats\" value=\"200\" />",
" <property name=\"procVariables\">",
" <map>",
" <entry key=\"variable1\" value=\"foo\"></entry>",
" <entry key=\"variable2\" value=\"bar\"></entry>",
" </map>",
" </property>",
" </bean>",
"",
"</beans>",
"",
"");

aceEditor.sendKeys(initiatorXML.replace(" ", ""));
String initiatorXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<beans \n" +
" xmlns=\"http://www.springframework.org/schema/beans\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"\n" +
" http://www.springframework.org/schema/beans\n" +
" http://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
"\n" +
" <bean id=\"repeat_1\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"external_pwd\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"10\" />\n" +
" <property name=\"maxRepeats\" value=\"200\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"\n" +
" <bean id=\"repeat_2\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_simplest\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"10\" />\n" +
" <property name=\"maxRepeats\" value=\"200\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"\n" +
" <bean id=\"repeat_3\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_initiators_page\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"10\" />\n" +
" <property name=\"maxRepeats\" value=\"200\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"\n" +
" <bean id=\"repeat_4\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_hello_world\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"10\" />\n" +
" <property name=\"maxRepeats\" value=\"200\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"\n" +
" <bean id=\"repeat_5\" class=\"jpl.cws.process.initiation.RepeatingDelayInitiator\">\n" +
" <property name=\"procDefKey\" value=\"test_logs_page\" />\n" +
" <property name=\"delayBetweenProcesses\" value=\"10\" />\n" +
" <property name=\"maxRepeats\" value=\"200\" />\n" +
" <property name=\"procVariables\">\n" +
" <map>\n" +
" <entry key=\"variable1\" value=\"foo\"></entry>\n" +
" <entry key=\"variable2\" value=\"bar\"></entry>\n" +
" </map>\n" +
" </property>\n" +
" </bean>\n" +
"\n" +
"</beans>\n" +
"\n" +
"";


initiatorXML = initiatorXML.replace("\n", "\\n").replace("\"", "\\\"");

js.executeScript("ace.edit('editorDiv').setValue(\"" + initiatorXML + "\");");

waitForElementID("saveXmlBtn");
log.info("Saving changes..");
Expand Down
Loading

0 comments on commit 1b66cb0

Please sign in to comment.