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

fix tests #1420

Merged
merged 3 commits into from
Sep 6, 2023
Merged

fix tests #1420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95ae446
fix tests
Sep 6, 2023
60d5b2c
small refactor
Sep 6, 2023
24e626a
Merge branch 'master' of https://github.com/CloudSlang/cloud-slang in…
Sep 6, 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
9 changes: 8 additions & 1 deletion ...slang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ArgumentsBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionNotCachedEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -476,7 +478,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
9 changes: 8 additions & 1 deletion cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/InputsBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -575,7 +577,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
9 changes: 8 additions & 1 deletion cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/OutputsBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -283,7 +285,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
9 changes: 8 additions & 1 deletion cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ResultBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -260,7 +262,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
9 changes: 8 additions & 1 deletion ...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonExecutor;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -226,7 +228,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
9 changes: 8 additions & 1 deletion ...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonExecutor;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -216,7 +218,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
9 changes: 8 additions & 1 deletion cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.api.execution.precondition.ExecutionPreconditionService;
Expand Down Expand Up @@ -532,7 +534,12 @@ public PythonRuntimeService externalPythonExecutorService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonRuntimeService")
Expand Down
9 changes: 8 additions & 1 deletion cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.score.api.EndBranchDataContainer;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -623,7 +625,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonRuntimeService")
Expand Down
9 changes: 8 additions & 1 deletion cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -659,7 +661,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerServiceImpl.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down