Ids 10028

cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java

@@ -3134,7 +3134,7 @@ private static void updateCwsUiConfig() throws IOException {
 		if (cws_project_webapp_root != null && !cws_project_webapp_root.equals("none") && cws_project_webapp_root.length() > 1) {
 
 			String linkName = cws_project_webapp_root.substring(0, 1).toUpperCase() + cws_project_webapp_root.substring(1);
-			projectLink = "<li><a href=\"/" + cws_project_webapp_root + "\"><span class=\"glyphicon glyphicon-wrench\"></span> &nbsp;" + linkName + "</a></li>";
+			projectLink = "<li class=\"nav-item\"><a class=\"nav-link\" href=\"/" + cws_project_webapp_root + "\"><img height=\"16\" width=\"16\" src=\"/${base}/images/utility_wrench.svg\" />" + linkName + "</a></li>";
 		}
 
 		content = content.replace("__CWS_PROJECT_LINK__", projectLink);

cws-test/src/test/java/jpl/cws/test/WebTestUtil.java

@@ -22,9 +22,13 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.JavascriptExecutor;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  *
  * @author ghollins
@@ -284,9 +288,13 @@ public void startProcDef(String procDef, String procName, long procTime) {
 
 	public void enableWorkers(String procDef) {
 		WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(30));
-
-		wait.until(ExpectedConditions.elementToBeClickable(By.id("pv-"+procDef)));
+		sleep(5000);
 		WebElement enable = findElById("pv-"+procDef);
+
+		JavascriptExecutor js = (JavascriptExecutor) driver;
+	  	js.executeScript("arguments[0].scrollIntoViewIfNeeded();", enable);
+      	sleep(5000);
+
 		enable.click();
 		sleep(1000);
 
@@ -312,6 +320,11 @@ public void disableWorkers(String procDef) {
 
 		wait.until(ExpectedConditions.elementToBeClickable(By.id("pv-"+procDef)));
 		WebElement enable = findElById("pv-"+procDef);
+
+		JavascriptExecutor js = (JavascriptExecutor) driver;
+	  	js.executeScript("arguments[0].scrollIntoViewIfNeeded();", enable);
+	  	sleep(1000);
+
 		enable.click();
 		sleep(1000);
 
@@ -447,8 +460,10 @@ public void deleteProc(String procName) {
 		if(driver.getPageSource().contains(procName)) {
 			disableWorkers(procName);
 
-			wait.until(ExpectedConditions.elementToBeClickable(By.id("delete-"+procName)));
 			WebElement delButton = driver.findElement(By.id("delete-"+procName));
+			JavascriptExecutor js = (JavascriptExecutor) driver;
+		  	js.executeScript("arguments[0].scrollIntoViewIfNeeded();", delButton);
+
 			delButton.click();
 
 			waitForElementID("delete-proc-def");

cws-test/src/test/java/jpl/cws/test/integration/ui/DeploymentsTestIT.java

@@ -89,7 +89,7 @@ public void processCompletedTest() throws IOException {
 				String color = driver.findElement(By.className("progress-bar-success")).getCssValue("background-color");
 				log.info(color);
 
-				if (color.equals("rgba(92, 184, 92, 1)")) { //color = green
+				if (color.equals("rgba(0, 128, 0, 1)")) { 
 					scriptPass = true;
 					testCasesCompleted++;
 				}

cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java

@@ -60,23 +60,23 @@ public void runResultsTest() throws IOException {
 
 			goToPage("processes");
 
-			waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input");
+			waitForElementXPath("//input[@id=\'dt-search-0\']");
 
 			sleep(5000);
 
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click();
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_history_page");
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER);
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).click();
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys("test_history_page");
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys(Keys.ENTER);
 
 			waitForElementID("processes-table");
 
 			log.info("Verifying the header and output from the model.");
-			WebElement historyButton = findElByXPath("//a[contains(text(),'History')]");
+			WebElement historyButton = findElByXPath("//button[contains(text(),'History')]");
 			waitForElement(historyButton);
 			scrollTo(historyButton);
 			historyButton.click();
 
-			findOnPage("CWS - History");
+			findOnPage("History");
 
 			WebElement hideLineCheckbox = findElByXPath("//input[@id='showall']");
 			waitForElement(hideLineCheckbox);

cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java

@@ -1,3 +1,4 @@
+
 package jpl.cws.test.integration.ui;
 
 import static org.junit.Assert.assertTrue;
@@ -130,7 +131,10 @@ public void runStartInitiatorTest() throws IOException {
 			driver.findElement(By.id("saveXmlBtn")).click();
 
 			waitForElementID("saveConfirmBtn");
-			driver.findElement(By.id("saveConfirmBtn")).click();
+			WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn"));
+
+            js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn);
+			saveConfirmBtn.click();
 
 			wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn")));
 
@@ -175,7 +179,12 @@ public void runStartInitiatorTest() throws IOException {
 				String color = driver.findElement(By.className("progress-bar-success")).getCssValue("background-color");
 				log.info(color);
 
-				if (color.equals("rgba(92, 184, 92, 1)")) { //color = green
+				WebElement progressBar = driver.findElement(By.className("progress-bar-success"));
+				js.executeScript("arguments[0].scrollIntoViewIfNeeded();", progressBar);
+				sleep(1000);
+				screenShot("InitiatorTestIT-runStartInitiatorTestColor");
+
+				if (color.equals("rgba(0, 128, 0, 1)")) { 
 					scriptPass = true;
 					testCasesCompleted++;
 				}
@@ -198,22 +207,24 @@ public void runVariableProcTest() throws IOException {
 			goToPage("processes");
 
 			log.info("Filtering results for Test Initiators Page test.");
-			waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input");
+			waitForElementXPath("//input[@id=\'dt-search-0\']");
 
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click();
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_initiators_page");
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER);
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).click();
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys("test_initiators_page");
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys(Keys.ENTER);
 
 			waitForElementID("processes-table");
 
 			log.info("Clicking on Test Initiators Page history.");
-			WebElement historyButton = findElByXPath("//a[contains(text(),'History')]");
+			sleep(5000);
+			WebElement historyButton = findElByXPath("//button[contains(text(),'History')]");
 			waitForElement(historyButton);
 			historyButton.sendKeys(Keys.RETURN);
 
 			findOnPage("CWS - History");
 
 			log.info("Looking for 'variable1 = foo' and 'variable2 = bar'");
+
 			if (findOnPage("Setting (string) variable1 = foo")
 					&& findOnPage("Setting (string) variable2 = bar")) {
 				scriptPass = true;
@@ -320,7 +331,7 @@ public void runCronInitiatorTest() throws IOException {
 				String color = driver.findElement(By.className("progress-bar-success")).getCssValue("background-color");
 				log.info(color);
 
-				if (color.equals("rgba(92, 184, 92, 1)")) { //color = green
+				if (color.equals("rgba(0, 128, 0, 1)")) {
 					scriptPass = true;
 					procCounter = procCounter + 2;
 					testCasesCompleted++;

cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java

@@ -177,7 +177,10 @@ public void runStartLoadTest() throws IOException {
             driver.findElement(By.id("saveXmlBtn")).click();
 
             waitForElementID("saveConfirmBtn");
-            driver.findElement(By.id("saveConfirmBtn")).click();
+            WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn"));
+
+            js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn);
+            saveConfirmBtn.click();
 
             wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn")));
 

cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java

@@ -117,27 +117,28 @@ public void runTableColumnTest() throws IOException {
 			findElByXPath("//div[@id='logData_wrapper']/div/div/div/button/span").click();
 
 			log.info("Checking CWS Host.");
-			findElByXPath("//a[text()='CWS Host']").click();
+			findElByXPath("//button/span[text()='CWS Host']").click();
 			sleep(1000);
 
 			log.info("Checking CWS Worker ID.");
-			findElByXPath("//a[text()='CWS Worker ID']").click();
+			findElByXPath("//button/span[text()='CWS Worker ID']").click();
 			sleep(1000);
 
 			log.info("Checking ProcDefKey.");
-			findElByXPath("//a[text()='Proc Def Key']").click();
+			findElByXPath("//button/span[text()='Proc Def Key']").click();
 			sleep(1000);
 
 			log.info("Checking ProcInstId.");
-			findElByXPath("//a[text()='Proc Inst ID']").click();
+			findElByXPath("//button/span[text()='Proc Inst ID']").click();
 			sleep(1000);
 
-			wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.tagName("table")));
+			// wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.tagName("table")));
 			WebElement myTable = driver.findElement(By.tagName("table"));
 
 			log.info("Checking data from table to ensure all checkboxes were clicked: " + myTable.getText());
+			log.info(myTable.getText());
 
-			if (myTable.getText().contains("Time Stamp CWS Host CWS Worker ID Log Level Thread Name Proc Def Key Proc Inst ID Message")) {
+			if (myTable.getText().contains("Time Stamp\nCWS Host\nCWS Worker ID\nLog Level\nThread Name\nProc Def Key\nProc Inst ID\nMessage")) {
 				scriptPass = true;
 				log.info("All checkboxes were successfully checked.");
 				testCasesCompleted++;

cws-test/src/test/java/jpl/cws/test/integration/ui/ProcessesTestIT.java

@@ -75,11 +75,11 @@ public void runStatusCompleteTest() throws IOException {
 			sleep(8000);
 
 			log.info("Locating Test Processes Page from table rows and verifying that it completed.");
-			waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input");
+			waitForElementXPath("//input[@id=\'dt-search-0\']");
 
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click();
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_snippets_page");
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER);
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).click();
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys("test_snippets_page");
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys(Keys.ENTER);
 
 			waitForElementID("processes-table");
 			//selenium: check if "test_processes_page" is on the page

cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java

@@ -118,16 +118,16 @@ public void runSnippetsModelTest() throws IOException {
 			goToPage("processes");
 			sleep(8000);
 
-			waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input");
+			waitForElementXPath("//input[@id=\'dt-search-0\']");
 
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click();
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_snippets_page");
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER);
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).click();
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys("test_snippets_page");
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys(Keys.ENTER);
 
 			waitForElementID("processes-table");
 
 			log.info("Clicking on Test Snippets Page history.");
-			WebElement historyButton = findElByXPath("//a[contains(text(),'History')]");
+			WebElement historyButton = findElByXPath("//button[contains(text(),'History')]");
 			waitForElement(historyButton);
 			scrollTo(historyButton);
 			historyButton.click();
@@ -160,7 +160,12 @@ public void runValidateButtonTest() {
 
 			waitForElementID("validateAndSaveSnippetsSubmitBtn");
 			log.info("Clicking on 'Validate and Save' button.");
-			driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn")).click();
+
+			WebElement validateAndSaveButton = driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn"));
+			JavascriptExecutor js = (JavascriptExecutor) driver;
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", validateAndSaveButton);
+
+	  		validateAndSaveButton.click();
 
 			log.info("Verifying 'Saved the snippets' shows up on the page.");
 			if(findOnPage("Saved the snippets")) {
@@ -219,7 +224,12 @@ public void runUpdateSnippetTest() throws IOException {
 
 			waitForElementID("validateAndSaveSnippetsSubmitBtn");
 			log.info("Clicking on 'Validate and Save' button...");
-			driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn")).click();
+
+			WebElement validateAndSaveButton = driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn"));
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", validateAndSaveButton);
+	  		sleep(2000);
+
+	  		validateAndSaveButton.click();
 
 			log.info("Verifying 'Saved the snippets' shows up on the page.");
 			if(findOnPage("Saved the snippets")) {
@@ -255,7 +265,11 @@ public void runUpdateErrorTest() throws IOException {
 
 			waitForElementID("validateAndSaveSnippetsSubmitBtn");
 			log.info("Clicking on 'Validate and Save' button");
-			driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn")).click();
+
+			WebElement validateAndSaveButton = driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn"));
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", validateAndSaveButton);
+
+	  		validateAndSaveButton.click();
 
 			log.info("Looking for 'ERROR: invalid code.' on page.");
 			if(findOnPage("ERROR: invalid code.")) {
@@ -293,7 +307,11 @@ public void runReloadEditorTest() throws IOException {
 
 			waitForElementID("validateAndSaveSnippetsSubmitBtn");
 			log.info("Clicking on 'Validate and Save' button");
-			driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn")).click();
+
+			WebElement validateAndSaveButton = driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn"));
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", validateAndSaveButton);
+
+			validateAndSaveButton.click();
 
 			log.info("Looking for 'ERROR: invalid code.' on page.");
 			if(findOnPage("ERROR: invalid code.")) {
@@ -304,8 +322,13 @@ public void runReloadEditorTest() throws IOException {
 				driver.findElement(By.id("revertSnippetsSubmitBtn")).click();
 
 				waitForElementID("validateAndSaveSnippetsSubmitBtn");
+
+				validateAndSaveButton = driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn"));
+		  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", validateAndSaveButton);
+		  		sleep(2000);
+
 				log.info("Clicking on 'Validate and Save' button");
-				driver.findElement(By.id("validateAndSaveSnippetsSubmitBtn")).click();
+				validateAndSaveButton.click();
 
 				log.info("Verifying 'Saved the snippets' shows up on the page.");
 				if(findOnPage("Saved the snippets")) {

cws-test/src/test/java/jpl/cws/test/integration/ui/WebTestIT.java

@@ -11,6 +11,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.openqa.selenium.JavascriptExecutor;
+
 /**
  *
  * @author ghollins
@@ -207,16 +209,23 @@ public void runHelloWorldTest() {
 			sleep(1000);
 			log.info("Found a completed task.");
 
-			waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input");
+			waitForElementXPath("//input[@id=\'dt-search-0\']");
+
+			WebElement filter = driver.findElement(By.xpath("//input[@id=\'dt-search-0\']"));
 
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click();
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_hello_world");
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER);
+			JavascriptExecutor js = (JavascriptExecutor) driver;
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", filter);
+	  		// filter.click();
+
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys("test_hello_world");
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys(Keys.ENTER);
 
 			waitForElementID("processes-table");
 
-			waitForElementXPath("//a[contains(text(),'History')]");
-			WebElement historyButton = driver.findElement(By.xpath("//a[contains(text(),'History')]"));
+			waitForElementXPath("//button[contains(text(),'History')]");
+			WebElement historyButton = driver.findElement(By.xpath("//button[contains(text(),'History')]"));
+			js.executeScript("arguments[0].scrollIntoViewIfNeeded();", historyButton);
+
 			historyButton.click();
 			sleep(1000);
 
@@ -250,17 +259,25 @@ public void runGroovyTest() {
 			sleep(1000);
 			log.info("Found a completed task.");
 
-			waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input");
+			waitForElementXPath("//input[@id=\'dt-search-0\']");
+
+			WebElement filter = driver.findElement(By.xpath("//input[@id=\'dt-search-0\']"));
 
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click();
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_groovy_script");
-			driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER);
+			JavascriptExecutor js = (JavascriptExecutor) driver;
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", filter);
+
+			// filter.click();
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys("test_groovy_script");
+			driver.findElement(By.xpath("//input[@id=\'dt-search-0\']")).sendKeys(Keys.ENTER);
 
 			waitForElementID("processes-table");
 
-			waitForElementXPath("//a[contains(text(),'History')]");
-			WebElement historyButton = driver.findElement(By.xpath("//a[contains(text(),'History')]"));
+			waitForElementXPath("//button[contains(text(),'History')]");
+			WebElement historyButton = driver.findElement(By.xpath("//button[contains(text(),'History')]"));
+			js.executeScript("arguments[0].scrollIntoViewIfNeeded();", historyButton);
+
 			historyButton.click();
+
 			sleep(1000);
 
 			findOnPage("Groovy.");