Merge branch 'master' of https://github.com/electric-cloud/EC-WebSphere

electric-cloud · Aug 31, 2018 · a786480 · a786480
2 parents 2c3a65f + 9a42134
commit a786480
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/specs/src/test/groovy/com/electriccloud/plugin/spec/StartDeploymentManager.groovy b/specs/src/test/groovy/com/electriccloud/plugin/spec/StartDeploymentManager.groovy
@@ -82,12 +82,12 @@ class StartDeploymentManager extends PluginTestHelper {
 
     @Shared
     def stopLocations = [
-        defaultLocation: is_windows ? 'C:/IBM/WebSphere/AppServer/bin/stopManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/stopManager.sh',
+        defaultLocation: is_windows ? 'C:/IBM/WebSphere/bin/stopManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/stopManager.sh',
     ]
 
     @Shared
     def startLocations = [
-        defaultLocation: is_windows ? 'C:/IBM/WebSphere/AppServer/bin/startManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/startManager.sh',
+        defaultLocation: is_windows ? 'C:/IBM/WebSphere/bin/startManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/startManager.sh',
         wrong: 'wrong/path/startManager.sh'
     ]
 
@@ -162,6 +162,7 @@ class StartDeploymentManager extends PluginTestHelper {
         createConfiguration(confignames.correctJSR160RMI, [doNotRecreate: false])
         createConfiguration(confignames.correctNone, [doNotRecreate: false])
         createConfiguration(confignames.correctRMI, [doNotRecreate: false])
+        change_logs()
 
         importProject(projectName, 'dsl/RunProcedure.dsl', [projName: projectName,
                 resName : wasResourceName,
@@ -372,6 +373,17 @@ class StartDeploymentManager extends PluginTestHelper {
         return dslWithTimeout(code)
     }
 
-
+    def change_logs(version){
+        if (is_windows){
+            jobLogs.'default'[0] = jobLogs.'default'[0].replace("'", "\"")
+            jobLogs.'profile'[0] = jobLogs.'profile'[0].replace("'", "\"")
+            jobLogs.'log'[0] = jobLogs.'log'[0].replace("'", "\"")
+            jobLogs.'timeOk'[0] = jobLogs.'timeOk'[0].replace("'", "\"")
+            jobLogs.'addParam'[0] = jobLogs.'addParam'[0].replace("'", "\"")
+            jobLogs.'addParams'[0] = jobLogs.'addParams'[0].replace("'", "\"")
+            jobLogs.'all'[0] = jobLogs.'all'[0].replace("'", "\"")
+            jobLogs.'log'[1] = ''
+        }
+    }
 
 }
diff --git a/specs/src/test/groovy/com/electriccloud/plugin/spec/StopApplicationServers.groovy b/specs/src/test/groovy/com/electriccloud/plugin/spec/StopApplicationServers.groovy
@@ -27,6 +27,8 @@ class StopApplicationServers extends PluginTestHelper {
     def wasPath =     System.getenv('WSADMIN_PATH')
     @Shared
     def wasAppPath =  System.getenv('WAS_APPPATH')
+    @Shared
+    def is_windows = System.getenv("IS_WINDOWS")
 
     @Shared
     def confignames = [
@@ -290,6 +292,7 @@ class StopApplicationServers extends PluginTestHelper {
         testCases.systemTest8 | confignames.correctSOAP | serverLists.all       | '300'   | summaries.warning_both    | jobLogs.warning_both   | 'warning'       | null
     }
 
+
     @Unroll
     def 'StopApplicationServer - Positive(for multiple): #testCaseID.name #testCaseID.description'() {
 
@@ -334,6 +337,7 @@ class StopApplicationServers extends PluginTestHelper {
     @Unroll
     def 'StopApplicationServer - Negative: : #testCaseID.name #testCaseID.description'(){
         assumeFalse(wasHost=='websphere80nd' && (testCaseID.name=='C363350' || testCaseID.name=='C363351'))
+        assumeFalse(is_windows && (testCaseID.name=='C363350' || testCaseID.name=='C363351'))
 
         if (startedServers){
             startApplicationServer(startedServers)

diff --git a/specs/src/test/groovy/com/electriccloud/plugin/spec/StopDeploymentManager.groovy b/specs/src/test/groovy/com/electriccloud/plugin/spec/StopDeploymentManager.groovy
@@ -82,13 +82,13 @@ class StopDeploymentManager extends PluginTestHelper {
 
     @Shared
     def stopLocations = [
-        defaultLocation: is_windows ? 'C:/IBM/WebSphere/AppServer/bin/stopManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/stopManager.sh',
+        defaultLocation: is_windows ? 'C:/IBM/WebSphere/bin/stopManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/stopManager.sh',
         wrong: '/wrong/path/stopManager.sh'
     ]
 
     @Shared
     def startLocations = [
-        defaultLocation: is_windows ? 'C:/IBM/WebSphere/AppServer/bin/startManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/startManager.sh'
+        defaultLocation: is_windows ? 'C:/IBM/WebSphere/bin/startManager.bat' : '/opt/IBM/WebSphere/AppServer/bin/startManager.sh'
     ]
 
     @Shared
@@ -163,6 +163,7 @@ class StopDeploymentManager extends PluginTestHelper {
         createConfiguration(confignames.correctJSR160RMI, [doNotRecreate: false])
         createConfiguration(confignames.correctNone, [doNotRecreate: false])
         createConfiguration(confignames.correctRMI, [doNotRecreate: false])
+        change_logs()
 
         importProject(projectName, 'dsl/RunProcedure.dsl', [projName: projectName,
                 resName : wasResourceName,
@@ -413,4 +414,17 @@ class StopDeploymentManager extends PluginTestHelper {
         return dslWithTimeout(code)
     }
 
+    def change_logs(version){
+        if (is_windows){
+            jobLogs.'default'[0] = jobLogs.'default'[0].replace("'", "\"")
+            jobLogs.'profile'[0] = jobLogs.'profile'[0].replace("'", "\"")
+            jobLogs.'logs'[0] = jobLogs.'logs'[0].replace("'", "\"")
+            jobLogs.'timeOk'[0] = jobLogs.'timeOk'[0].replace("'", "\"")
+            jobLogs.'addParam'[0] = jobLogs.'addParam'[0].replace("'", "\"")
+            jobLogs.'addParams'[0] = jobLogs.'addParams'[0].replace("'", "\"")
+            jobLogs.'all'[0] = jobLogs.'all'[0].replace("'", "\"")
+            jobLogs.'logs'[1] = ''
+        }
+    }
+
 }