diff --git a/README.md b/README.md
index 069f4d8f..a4e93ebe 100644
--- a/README.md
+++ b/README.md
@@ -14,19 +14,19 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m
## Prerequisites
-- [**Maven**](https://docs.docker.com/get-docker/): Used to dynamically download libraries and other required project dependencies.
+- [**Maven**](https://maven.apache.org/download.cgi): Used to dynamically download libraries and other required project dependencies.
- For Home-brew users:
- Install Maven using: `brew install maven`
- Verify installation using: `mvn -v`
-- [**Docker**](https://maven.apache.org/download.cgi): Used to run external Elasticsearch, and create and configure mariaDB database container
-- MariaDB or MySQL database set up on either your local machine or a remote host. You will also need to create the following:
- - A database for CWS to use. `cws_dev` is a good default name.
- - A database user with full access to the above database.
- - Recommended minimum system requirements from Docker Resources window:
+- [**Docker**](https://docs.docker.com/get-docker/): Used to run external Elasticsearch, and create and configure mariaDB database container
+ - Recommended minimum system requirements from Docker Resources window:
- CPUs: 4
- Memory: 5.00 GB
- Swap: 1 GB
- Disk image size: 59.6 GB
+- MariaDB or MySQL database set up on either your local machine or a remote host. You will also need to create the following:
+ - A database for CWS to use. `cws_dev` is a good default name.
+ - A database user with full access to the above database.
- [**ITerm2**](https://iterm2.com/): Currently these build scripts include commands to open new terminal windows using ITerm2, so they are best run from that terminal.
- **Logstash 7.16.2+**: Download Logstash (OSS version) for the Windows platform. Rename the ZIP file from 'logstash-oss-7.16.2-windows-x86_64.zip' to 'logstash-7.16.2.zip' and place in `install/logging/`. This is a temporary workaround while we clean up our installation process. You can find the zip download [here](https://www.elastic.co/downloads/past-releases/logstash-oss-7-16-2).
- **Elasticsearch 7.16.2+**: CWS requires an externally-configured elasticsearch cluster to be set up. You can use an SSL Secure Elasticsearch with or without authentication, or an Insecure HTTP Elasticsearch.
diff --git a/cws-test/pom.xml b/cws-test/pom.xml
index b9a556ee..1127fb5a 100644
--- a/cws-test/pom.xml
+++ b/cws-test/pom.xml
@@ -107,7 +107,14 @@
h2
test
-
+
+
+ io.github.bonigarcia
+ webdrivermanager
+ 5.2.0
+ test
+
+
@@ -379,7 +386,7 @@
-
+
diff --git a/cws-test/src/test/java/jpl/cws/test/WebTest.java b/cws-test/src/test/java/jpl/cws/test/WebTest.java
index fb7674c4..de881885 100644
--- a/cws-test/src/test/java/jpl/cws/test/WebTest.java
+++ b/cws-test/src/test/java/jpl/cws/test/WebTest.java
@@ -15,7 +15,6 @@ public class WebTest extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(WebTest.class);
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void loginTest() {
log.info("------ START loginTest ------");
gotoLoginPage();
@@ -25,7 +24,6 @@ public void loginTest() {
}
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void deployTest() {
log.info("------ START deployTest ------");
gotoLoginPage();
@@ -36,33 +34,25 @@ public void deployTest() {
}
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void runProcessTest() {
log.info("------ START runProcessTest ------");
gotoLoginPage();
login();
- startProcessFromConsole("test_simplest");
+ startProcDef("test_simplest", "Test Simplest");
+ deleteProc("test_simplest");
logout();
log.info("------ END runProcessTest ------");
}
private void uploadProcessDefinitionFile() {
- WebElement fileUploadInput = findElById("file");
+ WebElement fileUploadInput = findElById("file-input");
fileUploadInput.sendKeys(TEST_BPMN_DIR+"/test_simplest.bpmn");
- WebElement deployProcDefBtn = findElById("deployProcDefBtn");
+ WebElement deployProcDefBtn = findElById("bpmn-form");
deployProcDefBtn.click();
findOnPage("Deployed process definition");
findOnPage("test_simplest");
}
-
- private void startProcessFromConsole(String procDefKey) {
- findOnPage(procDefKey);
- WebElement startIcon = findElById("start_"+procDefKey+"_icon");
- log.info("Clicking on " + startIcon);
- startIcon.click();
- findOnPage("Scheduled the '"+procDefKey+"' process.");
- }
-
-
+
+
}
diff --git a/cws-test/src/test/java/jpl/cws/test/WebTestIT.java b/cws-test/src/test/java/jpl/cws/test/WebTestIT.java
index fa0d38fd..3232c224 100644
--- a/cws-test/src/test/java/jpl/cws/test/WebTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/WebTestIT.java
@@ -25,7 +25,6 @@ public class WebTestIT extends WebTestUtil {
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void testGoogleSearch() throws InterruptedException, IOException {
driver.get("http://www.google.com");
@@ -44,7 +43,6 @@ public void testGoogleSearch() throws InterruptedException, IOException {
}
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void loginTest() {
log.info("------ START loginTest ------");
gotoLoginPage();
@@ -54,7 +52,6 @@ public void loginTest() {
}
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void deployTest() {
log.info("------ START deployTest ------");
gotoLoginPage();
@@ -66,7 +63,6 @@ public void deployTest() {
}
@Test
- @Ignore (value="Not portable (specific to Wood/local-setup)")
public void runDeployTest() {
log.info("------ START deployTest ------");
gotoLoginPage();
@@ -78,14 +74,21 @@ public void runDeployTest() {
WebElement enable = findElById("pv-test_set_vars");
enable.click();
sleep(1000);
-
+
WebElement allWorkers = findElById("all-workers");
- allWorkers.click();
- sleep(1000);
-
WebElement allWorkersDone = findElById("done-workers-btn");
- allWorkersDone.click();
- sleep(10000);
+
+ if(allWorkers.isSelected()) {
+ allWorkersDone.click();
+ sleep(1000);
+ } else {
+ allWorkers.click();
+ sleep(1000);
+ allWorkersDone.click();
+ sleep(1000);
+ }
+
+ sleep(2000);
// Start Instance
@@ -98,7 +101,11 @@ public void runDeployTest() {
WebElement start = driver.findElement(By.xpath("//*[contains(@class,'start-process-action')]"));
start.click();
sleep(5000);
-
+
+ WebElement searchProcessField = driver.findElement(By.xpath("//input[contains(@class,'form-control')]"));
+ searchProcessField.sendKeys("Test Set Variables");
+ sleep(5000);
+
WebElement li = driver.findElement(By.xpath("//*[contains(text(),'Test Set Variables')]"));
li.click();
sleep(5000);
@@ -111,20 +118,18 @@ public void runDeployTest() {
// Go back to CWS
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
cws.click();
- findOnPage("
CWS - Dashboard");
-
-
- gotoDeployments();
+ findOnPage("CWS - Deployments");
+
// Wait for Finish
- sleep(25000);
-
+ sleep(90000);
+
+ deleteProc("test_set_vars");
logout();
log.info("------ END deployTest ------");
}
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void runErrorHandlingTest() {
log.info("------ START deployTest ------");
gotoLoginPage();
@@ -138,14 +143,21 @@ public void runErrorHandlingTest() {
enable.click();
sleep(1000);
-
+
WebElement allWorkers = findElById("all-workers");
- allWorkers.click();
- sleep(1000);
-
WebElement allWorkersDone = findElById("done-workers-btn");
- allWorkersDone.click();
- sleep(10000);
+
+ if(allWorkers.isSelected()) {
+ allWorkersDone.click();
+ sleep(1000);
+ } else {
+ allWorkers.click();
+ sleep(1000);
+ allWorkersDone.click();
+ sleep(1000);
+ }
+
+ sleep(2000);
// Start Instance (1) through Camunda
@@ -158,7 +170,11 @@ public void runErrorHandlingTest() {
WebElement start = driver.findElement(By.xpath("//*[contains(@class,'start-process-action')]"));
start.click();
sleep(5000);
-
+
+ WebElement searchProcessField = driver.findElement(By.xpath("//input[contains(@class,'form-control')]"));
+ searchProcessField.sendKeys("Test Error Handling");
+ sleep(5000);
+
WebElement li = driver.findElement(By.xpath("//*[contains(text(),'Test Error Handling')]"));
li.click();
sleep(5000);
@@ -171,20 +187,18 @@ public void runErrorHandlingTest() {
// Go back to CWS
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
cws.click();
- findOnPage("CWS - Dashboard");
-
- gotoDeployments();
-
+ findOnPage("CWS - Deployments");
+
// Wait for Finish
- sleep(90000);
+ sleep(180000);
procCounter++;
-
+
+ deleteProc("test_error_handling");
logout();
log.info("------ END deployTest ------");
}
@Test
- @Ignore (value="Not portable (specific to Hasan/local-setup)")
public void runHelloWorldTest() {
log.info("------ START deployTest ------");
gotoLoginPage();
@@ -199,16 +213,18 @@ public void runHelloWorldTest() {
WebElement allWorkers = findElById("all-workers");
WebElement allWorkersDone = findElById("done-workers-btn");
-
- if(allWorkers.isEnabled()) {
+
+ if(allWorkers.isSelected()) {
allWorkersDone.click();
- sleep(10000);
+ sleep(1000);
} else {
allWorkers.click();
sleep(1000);
allWorkersDone.click();
- sleep(10000);
+ sleep(1000);
}
+
+ sleep(2000);
WebElement tasks = driver.findElement(By.xpath("//a[@href='/camunda/app/tasklist']"));
tasks.click();
@@ -219,7 +235,11 @@ public void runHelloWorldTest() {
WebElement start = driver.findElement(By.xpath("//*[contains(@class,'start-process-action')]"));
start.click();
sleep(5000);
-
+
+ WebElement searchProcessField = driver.findElement(By.xpath("//input[contains(@class,'form-control')]"));
+ searchProcessField.sendKeys("Test Hello World");
+ sleep(5000);
+
WebElement li = driver.findElement(By.xpath("//*[contains(text(),'Test Hello World')]"));
li.click();
sleep(5000);
@@ -232,7 +252,10 @@ public void runHelloWorldTest() {
// Go back to CWS
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
cws.click();
- findOnPage("CWS - Dashboard");
+ findOnPage("CWS - Deployments");
+
+ // Wait for Finish
+ sleep(90000);
/*
@@ -265,9 +288,7 @@ public void runHelloWorldTest() {
sleep(1000);
*/
-
- goToPage("deployments");
-
+
if(findOnPage("completed")) {
goToProcesses();
@@ -285,9 +306,10 @@ public void runHelloWorldTest() {
WebElement filterSubmit = findElById("filter-submit-btn");
filterSubmit.click();
sleep(1000);
-
- WebElement logCheck = findElById("processes-table");
- logCheck.click();
+
+ waitForElementXPath("//button[contains(text(),'History')]");
+ WebElement historyButton = driver.findElement(By.xpath("//button[contains(text(),'History')]"));
+ historyButton.click();
sleep(1000);
findOnPage("ls");
@@ -301,17 +323,18 @@ public void runHelloWorldTest() {
} else {
log.info("Process did not complete either in time or at all");
}
-
+
+ deleteProc("test_hello_world");
logout();
log.info("------ END deployTest ------");
}
@Test
- @Ignore (value="Not portable (specific to Hollins/local-setup)")
public void runProcessTest() {
log.info("------ START runProcessTest ------");
gotoLoginPage();
login();
- startProcessFromConsole("test_simplest");
+ startProcDef("test_simplest", "Test Simplest");
+ deleteProc("test_simplest");
logout();
log.info("------ END runProcessTest ------");
}
@@ -346,15 +369,7 @@ private void uploadErrorHandlingProcessDefinitionFile() {
deployFile("test_error_handling");
}
-
- private void startProcessFromConsole(String procDefKey) {
- findOnPage(procDefKey);
- WebElement startIcon = findElById("start_"+procDefKey+"_icon");
- log.info("Clicking on " + startIcon);
- startIcon.click();
- findOnPage("Scheduled the '"+procDefKey+"' process.");
- }
-
+
//Demo for Sarjil
private void goToProcesses() {
if(findOnPage("completed")) {
diff --git a/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java b/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java
index 841dc45a..96fc0103 100644
--- a/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java
+++ b/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java
@@ -31,6 +31,7 @@
import org.openqa.selenium.support.ui.WebDriverWait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.github.bonigarcia.wdm.WebDriverManager;
/**
*
@@ -119,13 +120,14 @@ public void quitDriver() {
protected void initChromeDriver() {
- //System.setProperty("webdriver.chrome.driver", "/Users/path/to/chromedriver");
ChromeOptions chromeOptions = new ChromeOptions();
// Turn on headless mode for Bamboo
- chromeOptions.setHeadless(true);
+ chromeOptions.setHeadless(false);
+ chromeOptions.setAcceptInsecureCerts(true);
- driver = new ChromeDriver(chromeOptions);
+ WebDriverManager.chromedriver().setup();
+ driver = new ChromeDriver(chromeOptions);
log.info("Driver initialized: " + driver);
}
@@ -206,8 +208,9 @@ protected void login() {
protected void logout() {
waitForElementID("logoutLink");
- WebElement submitBtn = driver.findElement(By.id("logoutLink")); //findElById("logoutLink");
- submitBtn.click();
+ // WebElement submitBtn = driver.findElement(By.id("logoutLink")); //findElById("logoutLink");
+ // submitBtn.click();
+ driver.get("http://"+HOSTNAME+":"+PORT + "/cws-ui/logout");
// Verify we have moved to the login page
findOnPage("Please log in");
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/DeploymentsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/DeploymentsTestIT.java
index 86a5d3d5..13a7a035 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/DeploymentsTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/DeploymentsTestIT.java
@@ -26,7 +26,6 @@
* @author hasan
*
*/
-@Ignore
@RunWith(JUnit4.class)
public class DeploymentsTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(DeploymentsTestIT.class);
@@ -387,9 +386,9 @@ public void runOneWorkerTest() throws IOException {
enable.click();
log.info("Enabling one worker.");
- waitForElementXPath("//label[contains(text(),'worker0001')]");
- WebElement worker0001 = driver.findElement(By.xpath("//label[contains(text(),'worker0001')]"));
- worker0001.click();
+ waitForElementXPath("//label[contains(text(),'worker0000')]");
+ WebElement worker0000 = driver.findElement(By.xpath("//label[contains(text(),'worker0000')]"));
+ worker0000.click();
WebElement oneWorkerDone = findElById("done-workers-btn");
waitForElement(oneWorkerDone);
@@ -415,7 +414,7 @@ public void runOneWorkerTest() throws IOException {
}
}
- driver.findElement(By.xpath("//label[contains(text(),'worker0001')]")).click();
+ driver.findElement(By.xpath("//label[contains(text(),'worker0000')]")).click();
sleep(1000);
oneWorkerDone.click();
wait.until(ExpectedConditions.invisibilityOf(oneWorkerDone));
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java
index b3c3d8cf..37acb83f 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java
@@ -20,7 +20,6 @@
* @author hasan
*
*/
-@Ignore
public class HistoryTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(HistoryTestIT.class);
private static int testCasesCompleted = 0;
@@ -85,10 +84,10 @@ public void runResultsTest() throws IOException {
findOnPage("CWS - History");
if (findOnPage("History Page")
- && findOnPage("Command 'mkdir Test' exit value:0.")
- && findOnPage("Command 'ls' exit value:0.")
+ && findOnPage("Command 'mkdir Test' exit code:0.")
+ && findOnPage("Command 'ls' exit code:0.")
&& findOnPage("LINE: Test")
- && findOnPage("Command 'rmdir Test' exit value:0.")) {
+ && findOnPage("Command 'rmdir Test' exit code:0.")) {
scriptPass = true;
testCasesCompleted++;
}
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java
index 8d84fbca..a41390cc 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java
@@ -23,7 +23,6 @@
* @author hasan
*
*/
-@Ignore
public class InitiatorsTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(InitiatorsTestIT.class);
private static int testCasesCompleted = 0;
@@ -46,12 +45,19 @@ public void runInitiatorsPageTest() throws IOException {
enable.click();
sleep(1000);
- waitForElementID("all-workers");
- driver.findElement(By.id("all-workers")).click();
+ WebElement allWorkers = findElById("all-workers");
+ WebElement allWorkersDone = findElById("done-workers-btn");
+ if(allWorkers.isSelected()) {
+ allWorkersDone.click();
+ sleep(1000);
+ } else {
+ allWorkers.click();
+ sleep(1000);
+ allWorkersDone.click();
+ sleep(1000);
+ }
- waitForElementID("done-workers-btn");
- driver.findElement(By.id("done-workers-btn")).click();
sleep(2000);
@@ -149,7 +155,15 @@ public void runStartInitiatorTest() throws IOException {
assert(!enableAll.isSelected()); //verify the enableAll action button is not selected.
- js.executeScript("arguments[0].click();", enableAction);
+ if(!enableAction.isSelected()) {
+ js.executeScript("arguments[0].click();", findElById("toggle_repeat_1"));
+ sleep(1000);
+ } else { // toggle off and on to start
+ js.executeScript("arguments[0].click();", findElById("toggle_repeat_1"));
+ sleep(1000);
+ js.executeScript("arguments[0].click();", findElById("toggle_repeat_1"));
+ sleep(1000);
+ }
procCounter = 10 + procCounter; //for the 10 procs started.
@@ -157,7 +171,7 @@ public void runStartInitiatorTest() throws IOException {
log.info("Changing status refresh to 1 second.");
Select select = new Select(findElById("refresh-rate"));
- select.selectByVisibleText("1 second refresh rate");
+ select.selectByValue("1");
sleep(20000);
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java
index 51b03e8d..e82eb6b9 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java
@@ -21,7 +21,6 @@
* @author hasan
*
*/
-@Ignore
public class LogsTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(LogsTestIT.class);
private static int testCasesCompleted = 0;
@@ -56,7 +55,7 @@ public void runLogsPageTest() {
scriptPass = false;
}
deleteProc("test_logs_page");
- deleteProc("output_refresh_test");
+ // deleteProc("output_refresh_test");
logout();
assertTrue("Logs Page Test reported unexpected success value (scriptPass="+scriptPass+")", scriptPass);
}
@@ -69,10 +68,10 @@ public void runOutputTest() throws IOException {
goToPage("logs");
- log.info("Looking for text, 'Graphite', 'Command ls exit value:0', and 'Deployed process definitions: test_logs_page.bpmn'.");
+ log.info("Looking for text, 'Graphite', 'Command ls exit exit code:0', and 'Deployed process definitions: test_logs_page.bpmn'.");
if (findOnPage("Graphite")
- && findOnPage("Command 'ls' exit value:0.")
+ && findOnPage("Command 'ls' exit code:0.")
&& findOnPage("Deployed process definition: 'test_logs_page.bpmn'")) {
scriptPass = true;
testCasesCompleted++;
@@ -100,26 +99,32 @@ public void runTableColumnTest() throws IOException {
waitForElementID("cwshost-chkbox");
log.info("Checking CWS Host.");
findElById("cwshost-chkbox").click();
+ sleep(1000);
waitForElementID("cwswid-chkbox");
log.info("Checking CWS ID.");
findElById("cwswid-chkbox").click();
+ sleep(1000);
waitForElementID("loglvl-chkbox");
log.info("Checking Log Level.");
findElById("loglvl-chkbox").click();
+ sleep(1000);
waitForElementID("thn-chkbox");
log.info("Checking Thread Name.");
findElById("thn-chkbox").click();
+ sleep(1000);
waitForElementID("pdk-chkbox");
log.info("Checking Process Definition Key.");
findElById("pdk-chkbox").click();
+ sleep(1000);
waitForElementID("pid-chkbox");
log.info("Checking Process ID.");
findElById("pid-chkbox").click();
+ sleep(1000);
wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.tagName("table")));
WebElement myTable = driver.findElement(By.tagName("table"));
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/ProcessesTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/ProcessesTestIT.java
index 511a5124..d9a6c1c6 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/ProcessesTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/ProcessesTestIT.java
@@ -21,7 +21,6 @@
* @author hasan
*
*/
-@Ignore
public class ProcessesTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(ProcessesTestIT.class);
private static int testCasesCompleted = 0;
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java
index 63d6aee0..e1181b83 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java
@@ -20,7 +20,6 @@
* @author hasan
*
*/
-@Ignore
public class SnippetsTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(SnippetsTestIT.class);
private static int testCasesCompleted = 0;
@@ -273,6 +272,7 @@ public void runReloadEditorTest() throws IOException {
try {
log.info("------ START SnippetsTestIT:ReloadEditorTest ------");
driver.navigate().refresh();
+ sleep(2000);
WebElement aceEditor = driver.findElement(By.cssSelector("textarea.ace_text-input"));
log.info("Updating snippets through Ace Editor.");
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/SystemLevelTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/SystemLevelTestIT.java
index 68239b87..db8bc385 100644
--- a/cws-test/src/test/java/jpl/cws/test/integration/ui/SystemLevelTestIT.java
+++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/SystemLevelTestIT.java
@@ -23,7 +23,6 @@
* @author hasan
*
*/
-@Ignore
public class SystemLevelTestIT extends WebTestUtil {
private static final Logger log = LoggerFactory.getLogger(SystemLevelTestIT.class);
private static int testCasesCompleted = 0;
@@ -69,8 +68,8 @@ && findOnPage("0 running")) {
WebElement myTable = driver.findElement(By.id("workers-table"));
List myRows = myTable.findElements(By.tagName("td"));
log.info("Getting info from Worker table...");
- log.info("Checking if the worker table has 'worker0001'");
- if (myRows.get(0).getText().contains("worker0001")) {
+ log.info("Checking if the worker table has 'worker-#############'");
+ if (myRows.get(0).getText().contains("worker-")) {
log.info("SUCCESS: Found at least one worker up.");
scriptPass = true;
testCasesCompleted++;
diff --git a/cws-test/src/test/resources/bpmn/test_simplest.bpmn b/cws-test/src/test/resources/bpmn/test_simplest.bpmn
index 913ad38d..823ca808 100644
--- a/cws-test/src/test/resources/bpmn/test_simplest.bpmn
+++ b/cws-test/src/test/resources/bpmn/test_simplest.bpmn
@@ -1,7 +1,7 @@
-
+
-
+
SequenceFlow_1
@@ -16,32 +16,32 @@
SequenceFlow_1
SequenceFlow_2
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+