diff --git a/qa/integration-tests-engine-jakarta/pom.xml b/qa/integration-tests-engine-jakarta/pom.xml index 1a4ce579ec3..fb011ece572 100644 --- a/qa/integration-tests-engine-jakarta/pom.xml +++ b/qa/integration-tests-engine-jakarta/pom.xml @@ -713,20 +713,8 @@ **/CallActivityContextSwitchTest.java - **/TestMultipleClasspathRoots.java - **/TestResourceName.java - **/TestWarDeploymentDeployChangedOnlyWithJarAsLib.java - **/TestWarDeploymentWithDiagram.java - **/TestWarDeploymentWithoutDiagram.java - **/TestWarDeploymentWithoutProcessDefinitions.java - **/TestWarDeploymentWithoutProcessesXml.java **/CdiBeanCallActivityResolutionTest.java - **/CdiBeanCaseTaskResolutionTest.java - **/CallActivityContextSwitchTest.java - **/FailingJobBoundaryTimerWithDelegateVariablesTest.java - **/SignalEventCatchBoundaryWithVariablesTest.java - **/TimerRecalculationTest.java - **/CdiProcessApplicationEventSupportTest.java + diff --git a/qa/integration-tests-engine-jakarta/src/test/resources/org/camunda/bpm/integrationtest/beans.xml b/qa/integration-tests-engine-jakarta/src/test/resources/org/camunda/bpm/integrationtest/beans.xml index e779ef1895d..ae70ed1680b 100644 --- a/qa/integration-tests-engine-jakarta/src/test/resources/org/camunda/bpm/integrationtest/beans.xml +++ b/qa/integration-tests-engine-jakarta/src/test/resources/org/camunda/bpm/integrationtest/beans.xml @@ -2,4 +2,4 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" version="4.0" bean-discovery-mode="all"> - \ No newline at end of file + diff --git a/qa/integration-tests-engine/pom.xml b/qa/integration-tests-engine/pom.xml index e3b0c018072..544b0b4cc96 100644 --- a/qa/integration-tests-engine/pom.xml +++ b/qa/integration-tests-engine/pom.xml @@ -554,7 +554,7 @@ - src/test/java-tomcat + src/test/java-tomcat9 diff --git a/qa/integration-tests-engine/src/test/java-tomcat/org/camunda/bpm/integrationtest/util/TestContainer.java b/qa/integration-tests-engine/src/test/java-tomcat/org/camunda/bpm/integrationtest/util/TestContainer.java index 5b52dd261f8..c64eceac892 100644 --- a/qa/integration-tests-engine/src/test/java-tomcat/org/camunda/bpm/integrationtest/util/TestContainer.java +++ b/qa/integration-tests-engine/src/test/java-tomcat/org/camunda/bpm/integrationtest/util/TestContainer.java @@ -25,12 +25,20 @@ */ public class TestContainer { + /** + * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR. + * To solve these issues, Weld is added to the Tomcat server libs folder. + */ + public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResources(webArchive); + webArchive.addAsLibraries(DeploymentHelper.getWeld()); + } + public static void addContainerSpecificResources(WebArchive webArchive) { webArchive - .addAsManifestResource("context.xml") - .addAsLibraries(DeploymentHelper.getWeld()) - .addClass(TestProcessApplication.class) - .addAsWebInfResource("web.xml"); + .addAsManifestResource("context.xml") + .addClass(TestProcessApplication.class) + .addAsWebInfResource("web.xml"); } public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchive) { @@ -40,11 +48,19 @@ public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchiv .addAsWebInfResource("web-without-weld.xml", "web.xml"); } + /** + * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR. + * To solve these issues, Weld is added to the Tomcat server libs folder. + */ + public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResourcesForNonPa(webArchive); + webArchive.addAsLibraries(DeploymentHelper.getWeld()); + } + public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) { webArchive - .addAsManifestResource("context.xml") - .addAsLibraries(DeploymentHelper.getWeld()) - .addAsWebInfResource("web.xml"); + .addAsManifestResource("context.xml") + .addAsWebInfResource("web.xml"); } public static void addContainerSpecificResourcesForNonPaWithoutWeld(WebArchive webArchive) { diff --git a/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestConstants.java b/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestConstants.java new file mode 100644 index 00000000000..15ab0b4f8d2 --- /dev/null +++ b/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestConstants.java @@ -0,0 +1,41 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.camunda.bpm.integrationtest.util; + +/** + * @author Thorben Lindhauer + * + */ +public class TestConstants { + + public final static String APP_NAME = ""; + public final static String PROCESS_ENGINE_SERVICE_JNDI_NAME = "java:comp/env/ProcessEngineService"; + public final static String PROCESS_APPLICATION_SERVICE_JNDI_NAME = "java:comp/env/ProcessApplicationService"; + + public static String getAppName() { + return APP_NAME; + } + + public String getEngineService() { + return PROCESS_ENGINE_SERVICE_JNDI_NAME; + } + + public String getProcessApplicationService() { + return PROCESS_APPLICATION_SERVICE_JNDI_NAME; + } + +} diff --git a/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestContainer.java b/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestContainer.java new file mode 100644 index 00000000000..083bd28951a --- /dev/null +++ b/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestContainer.java @@ -0,0 +1,88 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.camunda.bpm.integrationtest.util; + +import org.jboss.shrinkwrap.api.spec.WebArchive; + +/** + * Tomcat test container. + * + * @author Daniel Meyer + */ +public class TestContainer { + + /** + * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR. + * To solve these issues, Weld is added to the Tomcat server libs folder. + */ + public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResources(webArchive); + } + + public static void addContainerSpecificResources(WebArchive webArchive) { + webArchive + .addAsManifestResource("context.xml") + .addClass(TestProcessApplication.class) + .addAsWebInfResource("web.xml") + .addAsLibraries(DeploymentHelper.getWeld()); + } + + public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchive) { + webArchive + .addAsManifestResource("context.xml") + .addClass(TestProcessApplication.class) + .addAsWebInfResource("web-without-weld.xml", "web.xml"); + } + + /** + * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR. + * To solve these issues, Weld is added to the Tomcat server libs folder. + */ + public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResourcesForNonPa(webArchive); + } + + public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) { + webArchive + .addAsManifestResource("context.xml") + .addAsWebInfResource("web.xml") + .addAsLibraries(DeploymentHelper.getWeld()); + } + + public static void addContainerSpecificResourcesForNonPaWithoutWeld(WebArchive webArchive) { + webArchive + .addAsManifestResource("context.xml") + .addAsWebInfResource("web-without-weld.xml", "web.xml"); + } + + public static void addContainerSpecificProcessEngineConfigurationClass(WebArchive deployment) { + // nothing to do + } + + public static void addSpinJacksonJsonDataFormat(WebArchive webArchive) { + webArchive.addAsLibraries(DeploymentHelper.getSpinJacksonJsonDataFormatForServer("tomcat")); + } + + public static void addJodaTimeJacksonModule(WebArchive webArchive) { + webArchive.addAsLibraries(DeploymentHelper.getJodaTimeModuleForServer("tomcat")); + } + + public static void addCommonLoggingDependency(WebArchive webArchive) { + // nothing to do + } + +} diff --git a/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestProcessApplication.java b/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestProcessApplication.java new file mode 100644 index 00000000000..31e54cf695c --- /dev/null +++ b/qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestProcessApplication.java @@ -0,0 +1,30 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.camunda.bpm.integrationtest.util; + +import org.camunda.bpm.application.ProcessApplication; +import org.camunda.bpm.application.impl.ServletProcessApplication; + +/** + * @author Daniel Meyer + * + */ +@ProcessApplication +// Using fully-qualified class name instead of import statement to allow for automatic Jakarta transformation +public class TestProcessApplication extends org.camunda.bpm.application.impl.ServletProcessApplication { + +} diff --git a/qa/integration-tests-engine/src/test/java-wildfly26-servlet/org/camunda/bpm/integrationtest/util/TestContainer.java b/qa/integration-tests-engine/src/test/java-wildfly26-servlet/org/camunda/bpm/integrationtest/util/TestContainer.java index 24df1b03d5e..48c9f046f3f 100644 --- a/qa/integration-tests-engine/src/test/java-wildfly26-servlet/org/camunda/bpm/integrationtest/util/TestContainer.java +++ b/qa/integration-tests-engine/src/test/java-wildfly26-servlet/org/camunda/bpm/integrationtest/util/TestContainer.java @@ -26,6 +26,10 @@ */ public class TestContainer { + public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResources(webArchive); + } + public static void addContainerSpecificResources(WebArchive archive) { addContainerSpecificResourcesWithoutWeld(archive); } @@ -34,6 +38,10 @@ public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchiv webArchive.addClass(TestProcessApplication.class); } + public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResourcesForNonPa(webArchive); + } + public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) { addContainerSpecificResourcesForNonPaWithoutWeld(webArchive); } diff --git a/qa/integration-tests-engine/src/test/java-wildfly26/org/camunda/bpm/integrationtest/util/TestContainer.java b/qa/integration-tests-engine/src/test/java-wildfly26/org/camunda/bpm/integrationtest/util/TestContainer.java index cfa895e1d89..4a5f1ce6bf2 100644 --- a/qa/integration-tests-engine/src/test/java-wildfly26/org/camunda/bpm/integrationtest/util/TestContainer.java +++ b/qa/integration-tests-engine/src/test/java-wildfly26/org/camunda/bpm/integrationtest/util/TestContainer.java @@ -25,6 +25,10 @@ */ public class TestContainer { + public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResources(webArchive); + } + public static void addContainerSpecificResources(WebArchive webArchive) { addContainerSpecificResourcesWithoutWeld(webArchive); } @@ -33,6 +37,10 @@ public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchiv webArchive.addAsLibraries(DeploymentHelper.getEjbClient()); } + public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) { + addContainerSpecificResourcesForNonPa(webArchive); + } + public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) { addContainerSpecificResourcesForNonPaWithoutWeld(webArchive); } @@ -56,4 +64,4 @@ public static void addJodaTimeJacksonModule(WebArchive webArchive) { public static void addCommonLoggingDependency(WebArchive webArchive) { webArchive.addAsManifestResource("jboss-deployment-structure-with-commons-logging.xml", "jboss-deployment-structure.xml"); } -} \ No newline at end of file +} diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/war/TestWarDeploymentWithoutProcessesXml.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/war/TestWarDeploymentWithoutProcessesXml.java index e040f8cf752..1e8c07b2200 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/war/TestWarDeploymentWithoutProcessesXml.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/war/TestWarDeploymentWithoutProcessesXml.java @@ -43,7 +43,7 @@ public static WebArchive processArchive() { .addAsWebInfResource("org/camunda/bpm/integrationtest/beans.xml", "beans.xml") .addAsLibraries(DeploymentHelper.getEngineCdi()) .addClass(AbstractFoxPlatformIntegrationTest.class); - + TestContainer.addContainerSpecificResources(deployment); return deployment; diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanCaseTaskResolutionTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanCaseTaskResolutionTest.java index b094f641b0c..4f39ab38d26 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanCaseTaskResolutionTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanCaseTaskResolutionTest.java @@ -60,7 +60,7 @@ public static WebArchive clientDeployment() { .addClass(AbstractFoxPlatformIntegrationTest.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedAsyncTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedAsyncTest.java index a23186f4a7b..6b48ed57697 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedAsyncTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedAsyncTest.java @@ -53,7 +53,7 @@ public static WebArchive clientDeployment() { .addClass(DependentScopedBean.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedSyncTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedSyncTest.java index 81905f5f851..7936a69cb87 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedSyncTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedSyncTest.java @@ -53,7 +53,7 @@ public static WebArchive clientDeployment() { .addClass(DependentScopedBean.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanResolutionTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanResolutionTest.java index cb58d1d5f8e..954831f41f5 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanResolutionTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanResolutionTest.java @@ -60,7 +60,7 @@ public static WebArchive clientDeployment() { .addClass(AbstractFoxPlatformIntegrationTest.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanSignallableActivityBehaviorResolutionTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanSignallableActivityBehaviorResolutionTest.java index 5a48f0cc2ee..6bcfe45e0df 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanSignallableActivityBehaviorResolutionTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanSignallableActivityBehaviorResolutionTest.java @@ -54,7 +54,7 @@ public static WebArchive clientDeployment() { .addClass(AbstractFoxPlatformIntegrationTest.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiCallActivityVersionTagTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiCallActivityVersionTagTest.java index e450b6f3771..7f6a1035ecb 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiCallActivityVersionTagTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiCallActivityVersionTagTest.java @@ -49,7 +49,7 @@ public static WebArchive clientDeployment() { .addClass(AbstractFoxPlatformIntegrationTest.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiDelegateBeanResolutionTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiDelegateBeanResolutionTest.java index cd4e5486c42..3774cfb12d2 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiDelegateBeanResolutionTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiDelegateBeanResolutionTest.java @@ -30,7 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; - /** *

Deploys two different applications, a process archive and a cleint application.

* @@ -61,7 +60,7 @@ public static WebArchive clientDeployment() { .addClass(AbstractFoxPlatformIntegrationTest.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResources(webArchive); + TestContainer.addContainerSpecificResourcesEmbedCdiLib(webArchive); return webArchive; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiRetryConfigurationTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiRetryConfigurationTest.java index 487caafaf6b..42cb25f791a 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiRetryConfigurationTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiRetryConfigurationTest.java @@ -53,7 +53,7 @@ public static WebArchive clientDeployment() { .addClass(DependentScopedBean.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/classloading/jobexecution/ClassloadingByJobPriorityTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/classloading/jobexecution/ClassloadingByJobPriorityTest.java index 65cfda309b7..f8d9bf76090 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/classloading/jobexecution/ClassloadingByJobPriorityTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/classloading/jobexecution/ClassloadingByJobPriorityTest.java @@ -90,4 +90,4 @@ protected static Asset modelAsAsset(BpmnModelInstance modelInstance) { return new ByteArrayAsset(bytes); } -} \ No newline at end of file +} diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.java index f9ca7444e88..acbe5d0020f 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.java @@ -24,9 +24,13 @@ import org.camunda.bpm.engine.task.Task; import org.camunda.bpm.engine.task.TaskQuery; import org.camunda.bpm.integrationtest.util.AbstractFoxPlatformIntegrationTest; +import org.camunda.bpm.integrationtest.util.DeploymentHelper; +import org.camunda.bpm.integrationtest.util.TestConstants; +import org.camunda.bpm.integrationtest.util.TestContainer; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,16 +44,34 @@ public class DelegatedVariableMappingTest extends AbstractFoxPlatformIntegration @Deployment(name = "mainDeployment") public static WebArchive createProcessArchiveDeplyoment() { - return initWebArchiveDeployment("mainDeployment.war") - .addClass(DelegateVarMapping.class) - .addAsResource("org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.testCallSubProcessWithDelegatedVariableMapping.bpmn20.xml") - .addAsResource("org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.testCallSubProcessWithDelegatedVariableMappingExpression.bpmn20.xml"); + WebArchive webArchive = ShrinkWrap.create(WebArchive.class, "mainDeployment.war") + .addAsWebInfResource("org/camunda/bpm/integrationtest/beans.xml", "beans.xml") + .addAsLibraries(DeploymentHelper.getEngineCdi()) + .addAsResource("META-INF/processes.xml", "META-INF/processes.xml") + .addClass(AbstractFoxPlatformIntegrationTest.class) + .addClass(TestConstants.class) + .addClass(DelegateVarMapping.class) + .addAsResource("org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.testCallSubProcessWithDelegatedVariableMapping.bpmn20.xml") + .addAsResource("org/camunda/bpm/integrationtest/functional/delegation/DelegatedVariableMappingTest.testCallSubProcessWithDelegatedVariableMappingExpression.bpmn20.xml"); + + TestContainer.addContainerSpecificResourcesEmbedCdiLib(webArchive); + + return webArchive; } @Deployment(name = "calledDeployment") public static WebArchive createSecondProcessArchiveDeployment() { - return initWebArchiveDeployment("calledDeployment.war") - .addAsResource("org/camunda/bpm/integrationtest/functional/delegation/simpleSubProcess.bpmn20.xml"); + WebArchive webArchive = ShrinkWrap.create(WebArchive.class, "calledDeployment.war") + .addAsWebInfResource("org/camunda/bpm/integrationtest/beans.xml", "beans.xml") + .addAsLibraries(DeploymentHelper.getEngineCdi()) + .addAsResource("META-INF/processes.xml", "META-INF/processes.xml") + .addClass(AbstractFoxPlatformIntegrationTest.class) + .addClass(TestConstants.class) + .addAsResource("org/camunda/bpm/integrationtest/functional/delegation/simpleSubProcess.bpmn20.xml"); + + TestContainer.addContainerSpecificResourcesEmbedCdiLib(webArchive); + + return webArchive; } @Inject diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/dmn/BusinessRuleTaskVersionTagTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/dmn/BusinessRuleTaskVersionTagTest.java index f7875c6361d..b42d7f3f21d 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/dmn/BusinessRuleTaskVersionTagTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/dmn/BusinessRuleTaskVersionTagTest.java @@ -49,7 +49,7 @@ public static WebArchive clientDeployment() { .addClass(AbstractFoxPlatformIntegrationTest.class) .addAsLibraries(DeploymentHelper.getEngineCdi()); - TestContainer.addContainerSpecificResourcesForNonPa(deployment); + TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment); return deployment; } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/event/CdiProcessApplicationEventSupportTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/event/CdiProcessApplicationEventSupportTest.java index 5756db9f1b3..306ff2b0c0c 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/event/CdiProcessApplicationEventSupportTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/event/CdiProcessApplicationEventSupportTest.java @@ -24,8 +24,11 @@ import org.camunda.bpm.integrationtest.util.AbstractFoxPlatformIntegrationTest; import org.camunda.bpm.integrationtest.util.DeploymentHelper; import org.camunda.bpm.integrationtest.util.TestContainer; +import org.camunda.bpm.integrationtest.util.TestProcessApplication; +import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java index 645b8269668..853170deea9 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java @@ -20,10 +20,6 @@ import java.util.List; -import javax.inject.Inject; - -import org.camunda.bpm.engine.ManagementService; -import org.camunda.bpm.engine.RuntimeService; import org.camunda.bpm.engine.runtime.Job; import org.camunda.bpm.engine.runtime.ProcessInstance; import org.camunda.bpm.integrationtest.jobexecutor.beans.DemoDelegate; @@ -54,28 +50,23 @@ public static WebArchive processArchive() { .addAsResource("org/camunda/bpm/integrationtest/jobexecutor/ImmediatelyFailing.bpmn20.xml"); } - @Inject - private RuntimeService runtimeService; - @Inject - private ManagementService managementService; - @Test public void testFailingJobBoundaryTimerWithDelegateVariables() throws InterruptedException { ProcessInstance pi = runtimeService.startProcessInstanceByKey("ImmediatelyFailing"); - List jobs = managementService.createJobQuery().list(); + List jobs = managementService.createJobQuery().processInstanceId(pi.getProcessInstanceId()).list(); assertEquals(1, jobs.size()); assertEquals(3, jobs.get(0).getRetries()); assertEquals(1, runtimeService.createExecutionQuery().processInstanceId(pi.getProcessInstanceId()).activityId("usertask1").count()); assertEquals(2, runtimeService.createExecutionQuery().processInstanceId(pi.getProcessInstanceId()).count()); - assertEquals(1, managementService.createJobQuery().executable().count()); + assertEquals(1, managementService.createJobQuery().processInstanceId(pi.getProcessInstanceId()).executable().count()); waitForJobExecutorToProcessAllJobs(); - assertEquals(0, managementService.createJobQuery().executable().count()); // should be 0, because it has failed 3 times - assertEquals(1, managementService.createJobQuery().withException().count()); // should be 1, because job failed! + assertEquals(0, managementService.createJobQuery().processInstanceId(pi.getProcessInstanceId()).executable().count()); // should be 0, because it has failed 3 times + assertEquals(1, managementService.createJobQuery().processInstanceId(pi.getProcessInstanceId()).withException().count()); // should be 1, because job failed! assertEquals(1, runtimeService.createExecutionQuery().processInstanceId(pi.getProcessInstanceId()).activityId("usertask1").count()); assertEquals(2, runtimeService.createExecutionQuery().processInstanceId(pi.getProcessInstanceId()).count()); @@ -83,7 +74,7 @@ public void testFailingJobBoundaryTimerWithDelegateVariables() throws Interrupte taskService.complete(taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult().getId()); // complete task with failed job => complete process assertEquals(0, runtimeService.createExecutionQuery().processInstanceId(pi.getProcessInstanceId()).count()); - assertEquals(0, managementService.createJobQuery().count()); // should be 0, because process is finished. + assertEquals(0, managementService.createJobQuery().processInstanceId(pi.getProcessInstanceId()).count()); // should be 0, because process is finished. } } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/SignalEventCatchBoundaryWithVariablesTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/SignalEventCatchBoundaryWithVariablesTest.java index 2850a869f3d..25370cd4b12 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/SignalEventCatchBoundaryWithVariablesTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/SignalEventCatchBoundaryWithVariablesTest.java @@ -20,9 +20,6 @@ import java.util.HashMap; -import javax.inject.Inject; - -import org.camunda.bpm.engine.RuntimeService; import org.camunda.bpm.engine.runtime.ProcessInstance; import org.camunda.bpm.integrationtest.util.AbstractFoxPlatformIntegrationTest; import org.jboss.arquillian.container.test.api.Deployment; @@ -44,9 +41,6 @@ public static WebArchive processArchive() { .addAsResource("org/camunda/bpm/integrationtest/jobexecutor/SignalEventCatchBoundaryWithVariablesTest.throwAlertSignalWithDelegate.bpmn20.xml"); } - @Inject - private RuntimeService runtimeService; - @Test public void testSignalCatchBoundaryWithVariables() throws InterruptedException { HashMap variables1 = new HashMap(); diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/util/AbstractFoxPlatformIntegrationTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/util/AbstractFoxPlatformIntegrationTest.java index d22058b971c..20b08423fd9 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/util/AbstractFoxPlatformIntegrationTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/util/AbstractFoxPlatformIntegrationTest.java @@ -75,7 +75,6 @@ public static WebArchive initWebArchiveDeployment(String name, String processesX return archive; } - public static WebArchive initWebArchiveDeployment(String name) { return initWebArchiveDeployment(name, "META-INF/processes.xml"); } @@ -85,6 +84,7 @@ public static WebArchive initWebArchiveDeployment() { } + @Before public void setupBeforeTest() { processEngineService = BpmPlatform.getProcessEngineService(); diff --git a/qa/tomcat-runtime/pom.xml b/qa/tomcat-runtime/pom.xml index 7713242484d..4365e539582 100644 --- a/qa/tomcat-runtime/pom.xml +++ b/qa/tomcat-runtime/pom.xml @@ -53,6 +53,13 @@ runtime + + org.jboss.weld.servlet + weld-servlet-shaded + 5.1.2.Final + runtime + + org.camunda.bpm.qa camunda-qa-ensure-clean-db