Merge pull request #1401 from CloudSlang/tests

Tests Fix
CloudSlang · Jan 16, 2023 · e3f9432 · e3f9432
2 parents 3027ef5 + 3cfdfea
commit e3f9432
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 0 deletions.
diff --git a/...slang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ArgumentsBindingTest.java b/...slang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ArgumentsBindingTest.java
@@ -22,7 +22,9 @@
 import io.cloudslang.lang.entities.bindings.values.ValueFactory;
 import io.cloudslang.lang.runtime.bindings.scripts.ScriptEvaluator;
 import io.cloudslang.lang.runtime.services.ScriptsService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionNotCachedEngine;
@@ -459,6 +461,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/InputsBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/InputsBindingTest.java
@@ -21,7 +21,9 @@
 import io.cloudslang.lang.entities.bindings.values.ValueFactory;
 import io.cloudslang.lang.runtime.bindings.scripts.ScriptEvaluator;
 import io.cloudslang.lang.runtime.services.ScriptsService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
@@ -558,6 +560,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/OutputsBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/OutputsBindingTest.java
@@ -20,7 +20,9 @@
 import io.cloudslang.lang.runtime.bindings.scripts.ScriptEvaluator;
 import io.cloudslang.lang.runtime.services.ScriptsService;
 import io.cloudslang.lang.runtime.steps.ReadOnlyContextAccessor;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
@@ -266,6 +268,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ResultBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ResultBindingTest.java
@@ -21,7 +21,9 @@
 import io.cloudslang.lang.entities.bindings.values.ValueFactory;
 import io.cloudslang.lang.runtime.bindings.scripts.ScriptEvaluator;
 import io.cloudslang.lang.runtime.services.ScriptsService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
@@ -243,6 +245,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java b/...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java
@@ -19,7 +19,9 @@
 import io.cloudslang.lang.entities.bindings.values.ValueFactory;
 import io.cloudslang.lang.runtime.services.ScriptsService;
 import io.cloudslang.runtime.api.python.PythonEvaluationResult;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutor;
@@ -209,6 +211,11 @@ protected PythonInterpreter initInterpreter(Set<String> dependencies) {
             };
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java b/...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java
@@ -17,7 +17,9 @@
 import io.cloudslang.lang.entities.bindings.values.ValueFactory;
 import io.cloudslang.lang.runtime.services.ScriptsService;
 import io.cloudslang.runtime.api.python.PythonExecutionResult;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutor;
@@ -199,6 +201,11 @@ protected PythonInterpreter initInterpreter(Set<String> dependencies) {
             };
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java
@@ -27,7 +27,9 @@
 import io.cloudslang.lang.runtime.services.ScriptsService;
 import io.cloudslang.lang.runtime.steps.ContentTestActions.NonSerializableObject;
 import io.cloudslang.runtime.api.java.JavaRuntimeService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.api.sequential.SequentialExecutionService;
 import io.cloudslang.runtime.impl.java.JavaExecutionCachedEngine;
 import io.cloudslang.runtime.impl.java.JavaRuntimeServiceImpl;
@@ -1206,6 +1208,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java
@@ -40,7 +40,9 @@
 import io.cloudslang.lang.runtime.env.RunEnvironment;
 import io.cloudslang.lang.runtime.events.LanguageEventData;
 import io.cloudslang.lang.runtime.services.ScriptsService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
@@ -510,6 +512,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java
@@ -31,7 +31,9 @@
 import io.cloudslang.lang.runtime.env.RunEnvironment;
 import io.cloudslang.lang.runtime.events.LanguageEventData;
 import io.cloudslang.lang.runtime.services.ScriptsService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
@@ -606,6 +608,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonRuntimeService")
         public PythonRuntimeService externalPythonRuntimeService() {
             return new PythonRuntimeServiceImpl();

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java
@@ -37,7 +37,9 @@
 import io.cloudslang.lang.runtime.env.RunEnvironment;
 import io.cloudslang.lang.runtime.events.LanguageEventData;
 import io.cloudslang.lang.runtime.services.ScriptsService;
+import io.cloudslang.runtime.api.python.PythonExecutorConfigurationDataService;
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
+import io.cloudslang.runtime.api.python.entities.PythonExecutorDetails;
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
@@ -642,6 +644,11 @@ public PythonExecutionEngine pythonExecutionEngine() {
             return new PythonExecutionCachedEngine();
         }
 
+        @Bean(name = "pythonExecutorConfigurationDataService")
+        public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataService() {
+            return PythonExecutorDetails::new;
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
             return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),

diff --git a/cloudslang-tests/src/test/resources/META-INF/spring/systemTestContext.xml b/cloudslang-tests/src/test/resources/META-INF/spring/systemTestContext.xml
@@ -22,4 +22,8 @@
     <score:worker uuid="-1"/>
 
     <bean class="io.cloudslang.lang.systemtests.TriggerFlows"/>
+    <bean id="pythonExecutorDetails" class="io.cloudslang.runtime.api.python.entities.PythonExecutorDetails"/>
+    <bean name="pythonExecutorConfigurationDataService" class="io.cloudslang.runtime.impl.python.external.StubPythonExecutorConfigurationDataServiceImpl">
+        <lookup-method name="getPythonExecutorConfiguration" bean="pythonExecutorDetails"/>
+    </bean>
 </beans>