kie-server-tests: move container disposing to base test class (kiegro…

…up#539)
jiripetrlik · Jul 13, 2016 · 7496e0a · 7496e0a
1 parent 8c31e39
commit 7496e0a
Show file tree

Hide file tree

Showing 36 changed files with 1 addition and 35 deletions.
diff --git a/...c/test/java/org/kie/server/integrationtests/jbpm/DeploymentDescriptorIntegrationTest.java b/...c/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/...ts-all/src/test/java/org/kie/server/integrationtests/jbpm/FormServiceIntegrationTest.java b/...ts-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/...s-all/src/test/java/org/kie/server/integrationtests/jbpm/ImageServiceIntegrationTest.java b/...s-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/...src/test/java/org/kie/server/integrationtests/jbpm/PerProcessInstanceIntegrationTest.java b/...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/...src/test/java/org/kie/server/integrationtests/jbpm/RuleRelatedProcessIntegrationTest.java b/...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/...st/java/org/kie/server/integrationtests/jbpm/rest/FormServiceRestOnlyIntegrationTest.java b/...st/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/...t/java/org/kie/server/integrationtests/jbpm/rest/ImageServiceRestOnlyIntegrationTest.java b/...t/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/...n/java/org/kie/server/integrationtests/shared/basetests/KieServerBaseIntegrationTest.java b/...n/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/...common/src/test/java/org/kie/server/integrationtests/common/KieServerIntegrationTest.java b/...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/.../src/test/java/org/kie/server/integrationtests/drools/ActivationGroupIntegrationTest.java b/.../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/...ools/src/test/java/org/kie/server/integrationtests/drools/AgendaGroupIntegrationTest.java b/...ools/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/...ts-drools/src/test/java/org/kie/server/integrationtests/drools/AgendaIntegrationTest.java b/...ts-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/...c/test/java/org/kie/server/integrationtests/drools/ConcurrentRequestsIntegrationTest.java b/...c/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/...c/test/java/org/kie/server/integrationtests/drools/ContainerIsolationIntegrationTest.java b/...c/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/.../test/java/org/kie/server/integrationtests/drools/GuidedDecisionTableIntegrationTest.java b/.../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/...c/test/java/org/kie/server/integrationtests/drools/GuidedDecisionTreeIntegrationTest.java b/...c/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/.../org/kie/server/integrationtests/drools/KieServerBackwardCompatDroolsIntegrationTest.java b/.../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/.../src/test/java/org/kie/server/integrationtests/drools/KieServerDroolsIntegrationTest.java b/.../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/...c/test/java/org/kie/server/integrationtests/drools/MultiModuleProjectIntegrationTest.java b/...c/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/...s/src/test/java/org/kie/server/integrationtests/drools/ObjectHandlingIntegrationTest.java b/...s/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/...ols/src/test/java/org/kie/server/integrationtests/drools/RuleTemplateIntegrationTest.java b/...ols/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/...ools/src/test/java/org/kie/server/integrationtests/drools/SpreadsheetIntegrationTest.java b/...ools/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/...est/java/org/kie/server/integrationtests/drools/StatelessSessionUsageIntegrationTest.java b/...est/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/...java/org/kie/server/integrationtests/drools/rest/RestMalformedRequestIntegrationTest.java b/...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/...c/test/java/org/kie/server/integrationtests/jbpm/BARuntimeDataServiceIntegrationTest.java b/...c/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/...pm/src/test/java/org/kie/server/integrationtests/jbpm/DocumentServiceIntegrationTest.java b/...pm/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/...ts-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/JobServiceIntegrationTest.java b/...ts-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/.../src/test/java/org/kie/server/integrationtests/jbpm/ProcessDefinitionIntegrationTest.java b/.../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/...bpm/src/test/java/org/kie/server/integrationtests/jbpm/ProcessServiceIntegrationTest.java b/...bpm/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/...m/src/test/java/org/kie/server/integrationtests/jbpm/QueryDataServiceIntegrationTest.java b/...m/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<KieContainerResource> reply = client.createContainer(CONTAINER_ID, new KieContainerResource(CONTAINER_ID, releaseId));

diff --git a/...src/test/java/org/kie/server/integrationtests/jbpm/RuntimeDataServiceIntegrationTest.java b/...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/...src/test/java/org/kie/server/integrationtests/jbpm/UserTaskEscalationIntegrationTest.java b/...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/...pm/src/test/java/org/kie/server/integrationtests/jbpm/UserTaskServiceIntegrationTest.java b/...pm/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/...-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/jms/JmsQueueIntegrationTest.java b/...-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/...jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java b/...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/...src/test/java/org/kie/server/integrationtests/optaplanner/OptaplannerIntegrationTest.java b/...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);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,6 @@ public static void buildAndDeployArtifacts() { @@
             kieContainer = KieServices.Factory.get().newKieContainer(releaseId);
-            disposeAllContainers();
             createContainer(CONTAINER_ID, releaseId);
         }
@@ Expand Down @@