From 7496e0a8c7045deb3ffed0930d2137d8253ddc81 Mon Sep 17 00:00:00 2001 From: Karel Suta Date: Wed, 13 Jul 2016 13:05:48 +0200 Subject: [PATCH] kie-server-tests: move container disposing to base test class (#539) --- .../jbpm/DeploymentDescriptorIntegrationTest.java | 1 - .../server/integrationtests/jbpm/FormServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/ImageServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/PerProcessInstanceIntegrationTest.java | 1 - .../integrationtests/jbpm/RuleRelatedProcessIntegrationTest.java | 1 - .../jbpm/rest/FormServiceRestOnlyIntegrationTest.java | 1 - .../jbpm/rest/ImageServiceRestOnlyIntegrationTest.java | 1 - .../shared/basetests/KieServerBaseIntegrationTest.java | 1 + .../server/integrationtests/common/KieServerIntegrationTest.java | 1 - .../integrationtests/drools/ActivationGroupIntegrationTest.java | 1 - .../integrationtests/drools/AgendaGroupIntegrationTest.java | 1 - .../server/integrationtests/drools/AgendaIntegrationTest.java | 1 - .../drools/ConcurrentRequestsIntegrationTest.java | 1 - .../drools/ContainerIsolationIntegrationTest.java | 1 - .../drools/GuidedDecisionTableIntegrationTest.java | 1 - .../drools/GuidedDecisionTreeIntegrationTest.java | 1 - .../drools/KieServerBackwardCompatDroolsIntegrationTest.java | 1 - .../integrationtests/drools/KieServerDroolsIntegrationTest.java | 1 - .../drools/MultiModuleProjectIntegrationTest.java | 1 - .../integrationtests/drools/ObjectHandlingIntegrationTest.java | 1 - .../integrationtests/drools/RuleTemplateIntegrationTest.java | 1 - .../integrationtests/drools/SpreadsheetIntegrationTest.java | 1 - .../drools/StatelessSessionUsageIntegrationTest.java | 1 - .../drools/rest/RestMalformedRequestIntegrationTest.java | 1 - .../jbpm/BARuntimeDataServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/DocumentServiceIntegrationTest.java | 1 - .../server/integrationtests/jbpm/JobServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/ProcessDefinitionIntegrationTest.java | 1 - .../integrationtests/jbpm/ProcessServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/QueryDataServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/RuntimeDataServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/UserTaskEscalationIntegrationTest.java | 1 - .../integrationtests/jbpm/UserTaskServiceIntegrationTest.java | 1 - .../integrationtests/jbpm/jms/JmsQueueIntegrationTest.java | 1 - .../integrationtests/jbpm/rest/JbpmRestIntegrationTest.java | 1 - .../integrationtests/optaplanner/OptaplannerIntegrationTest.java | 1 - 36 files changed, 1 insertion(+), 35 deletions(-) diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DeploymentDescriptorIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DeploymentDescriptorIntegrationTest.java index 0d15b39377..dfc7fc626f 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DeploymentDescriptorIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DeploymentDescriptorIntegrationTest.java @@ -53,7 +53,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/FormServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/FormServiceIntegrationTest.java index 8e0b4624fa..9585bdc4e9 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/FormServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/FormServiceIntegrationTest.java @@ -41,7 +41,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/definition-project").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/ImageServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/ImageServiceIntegrationTest.java index 8f197867ed..dc23da188e 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/ImageServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/ImageServiceIntegrationTest.java @@ -38,7 +38,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/definition-project").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/PerProcessInstanceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/PerProcessInstanceIntegrationTest.java index b20d595959..70192764e4 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/PerProcessInstanceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/PerProcessInstanceIntegrationTest.java @@ -57,7 +57,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/RuleRelatedProcessIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/RuleRelatedProcessIntegrationTest.java index e77e605b35..c9ff67877e 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/RuleRelatedProcessIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/RuleRelatedProcessIntegrationTest.java @@ -51,7 +51,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/FormServiceRestOnlyIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/FormServiceRestOnlyIntegrationTest.java index 07d79da4e9..038d9aebfa 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/FormServiceRestOnlyIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/FormServiceRestOnlyIntegrationTest.java @@ -62,7 +62,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/definition-project").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/ImageServiceRestOnlyIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/ImageServiceRestOnlyIntegrationTest.java index 4fcbe272ef..cf46ea22e9 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/ImageServiceRestOnlyIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/rest/ImageServiceRestOnlyIntegrationTest.java @@ -61,7 +61,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/definition-project").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/main/java/org/kie/server/integrationtests/shared/basetests/KieServerBaseIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/main/java/org/kie/server/integrationtests/shared/basetests/KieServerBaseIntegrationTest.java index 52c2ded043..63da3f644a 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/main/java/org/kie/server/integrationtests/shared/basetests/KieServerBaseIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/main/java/org/kie/server/integrationtests/shared/basetests/KieServerBaseIntegrationTest.java @@ -69,6 +69,7 @@ public static void setupClass() throws Exception { server.startKieServer(); } setupCustomSettingsXml(); + disposeAllContainers(); } private static void setupCustomSettingsXml() { diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/test/java/org/kie/server/integrationtests/common/KieServerIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/test/java/org/kie/server/integrationtests/common/KieServerIntegrationTest.java index 913fbc706f..65090543b6 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/test/java/org/kie/server/integrationtests/common/KieServerIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-common/src/test/java/org/kie/server/integrationtests/common/KieServerIntegrationTest.java @@ -42,7 +42,6 @@ public class KieServerIntegrationTest extends RestJmsSharedBaseIntegrationTest { public static void initialize() throws Exception { KieServerDeployer.createAndDeployKJar(releaseId1); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId1); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ActivationGroupIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ActivationGroupIntegrationTest.java index 519aa6e6e6..0cae568708 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ActivationGroupIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ActivationGroupIntegrationTest.java @@ -32,7 +32,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/activation-group").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaGroupIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaGroupIntegrationTest.java index d2a0107608..4054fcfda3 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaGroupIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaGroupIntegrationTest.java @@ -32,7 +32,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/agenda-group").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaIntegrationTest.java index 98566524a9..87ac48c7b2 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaIntegrationTest.java @@ -31,7 +31,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/agenda-group").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ConcurrentRequestsIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ConcurrentRequestsIntegrationTest.java index dc3c676a9f..dc2567de0a 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ConcurrentRequestsIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ConcurrentRequestsIntegrationTest.java @@ -58,7 +58,6 @@ public static void initialize() throws Exception { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/stateless-session-kjar").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ContainerIsolationIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ContainerIsolationIntegrationTest.java index bb4abd3f6b..4a42878319 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ContainerIsolationIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ContainerIsolationIntegrationTest.java @@ -52,7 +52,6 @@ public static void deployArtifacts() { KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/container-isolation-kjar1").getFile()); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/container-isolation-kjar2").getFile()); - disposeAllContainers(); createContainer(CONTAINER_1_ID, kjar1); createContainer(CONTAINER_2_ID, kjar2); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTableIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTableIntegrationTest.java index f204262154..8b81bf4877 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTableIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTableIntegrationTest.java @@ -54,7 +54,6 @@ public static void buildAndDeployArtifacts() { kjarClassLoader = KieServices.Factory.get().newKieContainer(releaseId).getClassLoader(); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTreeIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTreeIntegrationTest.java index 7d72145ff8..92e07855e2 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTreeIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTreeIntegrationTest.java @@ -54,7 +54,6 @@ public static void buildAndDeployArtifacts() { kjarClassLoader = KieServices.Factory.get().newKieContainer(releaseId).getClassLoader(); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerBackwardCompatDroolsIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerBackwardCompatDroolsIntegrationTest.java index 3dab9c855d..0f5afa9e4a 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerBackwardCompatDroolsIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerBackwardCompatDroolsIntegrationTest.java @@ -58,7 +58,6 @@ public static void initialize() throws Exception { File jar = KieServerDeployer.getRepository().resolveArtifact(releaseId).getFile(); kjarClassLoader = new URLClassLoader(new URL[]{jar.toURI().toURL()}); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerDroolsIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerDroolsIntegrationTest.java index 51c3605101..ef07555279 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerDroolsIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/KieServerDroolsIntegrationTest.java @@ -69,7 +69,6 @@ public static void initialize() throws Exception { File jar = KieServerDeployer.getRepository().resolveArtifact(releaseId).getFile(); kjarClassLoader = new URLClassLoader(new URL[]{jar.toURI().toURL()}); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/MultiModuleProjectIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/MultiModuleProjectIntegrationTest.java index c4dbb5fcd8..464575103a 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/MultiModuleProjectIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/MultiModuleProjectIntegrationTest.java @@ -54,7 +54,6 @@ public static void buildAndDeployArtifacts() { // the parent will build and deploy also all of its modules, so no need to deploy them individually KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/multimodule-project").getFile()); - disposeAllContainers(); createContainer(CONTAINER_1_ID, releaseIdRules1); createContainer(CONTAINER_2_ID, releaseIdRules2); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ObjectHandlingIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ObjectHandlingIntegrationTest.java index b94a6c5fce..adee152783 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ObjectHandlingIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/ObjectHandlingIntegrationTest.java @@ -40,7 +40,6 @@ public static void buildAndDeployArtifacts() { kjarClassLoader = KieServices.Factory.get().newKieContainer(releaseId).getClassLoader(); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/RuleTemplateIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/RuleTemplateIntegrationTest.java index 820b3b4a3d..bcf8844f34 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/RuleTemplateIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/RuleTemplateIntegrationTest.java @@ -54,7 +54,6 @@ public static void buildAndDeployArtifacts() { kjarClassLoader = KieServices.Factory.get().newKieContainer(releaseId).getClassLoader(); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/SpreadsheetIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/SpreadsheetIntegrationTest.java index fac8bdd2cd..12d65d6d1c 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/SpreadsheetIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/SpreadsheetIntegrationTest.java @@ -54,7 +54,6 @@ public static void buildAndDeployArtifacts() { kjarClassLoader = KieServices.Factory.get().newKieContainer(releaseId).getClassLoader(); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/StatelessSessionUsageIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/StatelessSessionUsageIntegrationTest.java index 222b80e78c..3666195352 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/StatelessSessionUsageIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/StatelessSessionUsageIntegrationTest.java @@ -54,7 +54,6 @@ public static void deployArtifacts() { kjarClassLoader = KieServices.Factory.get().newKieContainer(releaseId).getClassLoader(); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/rest/RestMalformedRequestIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/rest/RestMalformedRequestIntegrationTest.java index 1fe26ebc90..f1ac71b57f 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/rest/RestMalformedRequestIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-drools/src/test/java/org/kie/server/integrationtests/drools/rest/RestMalformedRequestIntegrationTest.java @@ -48,7 +48,6 @@ public static void deployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/state-is-kept-for-stateful-session").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/BARuntimeDataServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/BARuntimeDataServiceIntegrationTest.java index d8c6dcb870..cb6faffb2d 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/BARuntimeDataServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/BARuntimeDataServiceIntegrationTest.java @@ -47,7 +47,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DocumentServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DocumentServiceIntegrationTest.java index 2ac695cda1..ab70175e96 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DocumentServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DocumentServiceIntegrationTest.java @@ -53,7 +53,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/JobServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/JobServiceIntegrationTest.java index a0975beb31..659803b0f7 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/JobServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/JobServiceIntegrationTest.java @@ -56,7 +56,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessDefinitionIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessDefinitionIntegrationTest.java index 4559f203f1..d240cdef92 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessDefinitionIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessDefinitionIntegrationTest.java @@ -50,7 +50,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessServiceIntegrationTest.java index 0031a9e254..2d7b158cc9 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessServiceIntegrationTest.java @@ -59,7 +59,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/QueryDataServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/QueryDataServiceIntegrationTest.java index 60b6bb7bd0..6894c4d600 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/QueryDataServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/QueryDataServiceIntegrationTest.java @@ -59,7 +59,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); // Having timeout issues due to kjar dependencies -> raised timeout. KieServicesClient client = createDefaultStaticClient(EXTENDED_TIMEOUT); ServiceResponse reply = client.createContainer(CONTAINER_ID, new KieContainerResource(CONTAINER_ID, releaseId)); diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/RuntimeDataServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/RuntimeDataServiceIntegrationTest.java index b1db9a410b..2c0792a802 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/RuntimeDataServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/RuntimeDataServiceIntegrationTest.java @@ -68,7 +68,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskEscalationIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskEscalationIntegrationTest.java index 044e5a8823..04e3eb70ea 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskEscalationIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskEscalationIntegrationTest.java @@ -88,7 +88,6 @@ public static void buildAndDeployArtifacts() { KieServerDeployer.buildAndDeployCommonMavenParent(); KieServerDeployer.buildAndDeployMavenProject(ClassLoader.class.getResource("/kjars-sources/definition-project").getFile()); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskServiceIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskServiceIntegrationTest.java index 5417529602..52735a8843 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskServiceIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskServiceIntegrationTest.java @@ -58,7 +58,6 @@ public static void buildAndDeployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(releaseId); - disposeAllContainers(); createContainer(CONTAINER_ID, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/jms/JmsQueueIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/jms/JmsQueueIntegrationTest.java index b22c869f5a..f6a6b62694 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/jms/JmsQueueIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/jms/JmsQueueIntegrationTest.java @@ -68,7 +68,6 @@ public static void buildAndDeployArtifacts() { containerRemoteController = new ContainerRemoteController(TestConfig.getContainerId(), TestConfig.getContainerPort()); - disposeAllContainers(); createContainer(CONTAINER_ID, RELEASE_ID); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java index bcea5d8fe5..d241fe5e7f 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java @@ -62,7 +62,6 @@ public static void buildAndDeployArtifacts() { acceptHeadersByFormat.put(MarshallingFormat.JAXB, "application/xml;q=0.9,application/json;q=0.3");// xml is preferred over json acceptHeadersByFormat.put(MarshallingFormat.JSON, "application/json;q=0.9,application/xml;q=0.3");// json is preferred over xml - disposeAllContainers(); createContainer(CONTAINER, releaseId); } diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-optaplanner/src/test/java/org/kie/server/integrationtests/optaplanner/OptaplannerIntegrationTest.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-optaplanner/src/test/java/org/kie/server/integrationtests/optaplanner/OptaplannerIntegrationTest.java index 37a27d6287..87b4d9ce2c 100644 --- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-optaplanner/src/test/java/org/kie/server/integrationtests/optaplanner/OptaplannerIntegrationTest.java +++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-optaplanner/src/test/java/org/kie/server/integrationtests/optaplanner/OptaplannerIntegrationTest.java @@ -59,7 +59,6 @@ public static void deployArtifacts() { kieContainer = KieServices.Factory.get().newKieContainer(kjar1); - disposeAllContainers(); createContainer(CONTAINER_1_ID, kjar1); }