Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI lib updates 1 #178

Merged
merged 31 commits into from
Oct 27, 2023
Merged

UI lib updates 1 #178

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7a24c80
Update bootstrap to 3.3.7
wcgunter Aug 9, 2023
62bffaf
Remove unnecessary console logs
wcgunter Aug 9, 2023
0b238cf
organization, add comments to deployments page
wcgunter Aug 9, 2023
2680e67
Unused library
wcgunter Aug 9, 2023
0c69417
Update jquery, add migration tool (temp)
wcgunter Aug 9, 2023
e0dca34
Update to jQuery 3.7.0
wcgunter Aug 9, 2023
1e55920
Update ace.js, first run through of pages
wcgunter Aug 10, 2023
f8a6279
updated selinium
brentjk Sep 19, 2023
34dcba2
updated pom to selenium that had cdp 117 compatibility
brentjk Sep 26, 2023
5423c06
just for troubleshooting
brentjk Sep 27, 2023
ebb37fa
just for troubleshooting
brentjk Sep 27, 2023
f3afbb4
for troubleshooting only
brentjk Oct 3, 2023
fb8721e
Show all button replaced. This crashes selenium and leads to a faliur…
brentjk Oct 3, 2023
61e870e
------ START WorkersTestIT:runThreadLimitTest ------ fixed for xml in…
brentjk Oct 9, 2023
e913332
Testing - I have a feeling that a jquery change is causing the error …
wcgunter Oct 16, 2023
a6daa97
Revert logging changes
wcgunter Oct 16, 2023
c6e2fea
Add migration plugin
wcgunter Oct 16, 2023
2157d22
Merge branch 'develop' into UI-lib-updates-1
wcgunter Oct 17, 2023
92f22c6
Update how initiator is loaded into aceeditor
wcgunter Oct 24, 2023
e653bc5
Update test to be more specific about how it is failing (log whether …
wcgunter Oct 24, 2023
1c3abb3
Remove incorrect junit function call
wcgunter Oct 24, 2023
b948d09
Update how we type in ace editor
wcgunter Oct 24, 2023
0d5fac3
Mimic working test for ace editor
wcgunter Oct 24, 2023
9e9cb22
Remove formatting
wcgunter Oct 24, 2023
da4f70f
Test with load test
wcgunter Oct 24, 2023
87bd3df
Make updates to initiator test
wcgunter Oct 24, 2023
46b9560
Revert change made in history test
wcgunter Oct 25, 2023
e258cc3
Remove temporary logging
wcgunter Oct 25, 2023
c633955
Remove temp
wcgunter Oct 27, 2023
71fb159
Remove lingering temp
wcgunter Oct 27, 2023
d8ee519
Merge remote-tracking branch 'origin/UI-lib-updates-1' into UI-lib-up…
wcgunter Oct 27, 2023
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
1 change: 1 addition & 0 deletions cws-test/src/test/java/jpl/cws/test/WebTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ protected boolean findOnPage(String text) {
}

if (!found) {
log.info("TEMP: " + driver.getPageSource());
log.error("text '" + text + "' NOT FOUND on page");
Assert.fail("text '" + text + "' NOT FOUND on page");
}
Expand Down
4 changes: 0 additions & 4 deletions cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java
View file
Open in desktop
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
159 changes: 83 additions & 76 deletions cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java
View file
Open in desktop
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,48 @@ 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" +
"";

log.info("TEMP: " + initiatorXML);

initiatorXML = initiatorXML.replace("\n", "\\n").replace("\"", "\\\"");
log.info("TEMP: post: " + initiatorXML);

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

waitForElementID("saveXmlBtn");
driver.findElement(By.id("saveXmlBtn")).click();
Expand Down
160 changes: 82 additions & 78 deletions cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,84 +91,88 @@ 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" +
"";

log.info("TEMP: " + initiatorXML);

initiatorXML = initiatorXML.replace("\n", "\\n").replace("\"", "\\\"");
log.info("TEMP: post: " + initiatorXML);

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

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