Merge branch 'release/0.4.0'

holunda-io · Nov 22, 2022 · b4d9cb8 · b4d9cb8
2 parents e3644a6 + 3e09694
commit b4d9cb8
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 50 deletions.
diff --git a/examples/basic-junit5/pom.xml b/examples/basic-junit5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit5</artifactId>
@@ -22,11 +22,14 @@
       <artifactId>h2</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.extension.mockito</groupId>
-      <artifactId>camunda-bpm-mockito</artifactId>
-      <version>5.16.0</version>
+      <groupId>org.camunda.community.mockito</groupId>
+      <artifactId>camunda-platform-7-mockito</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.tngtech.jgiven</groupId>
+      <artifactId>jgiven-junit5</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>
       <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
@@ -63,6 +66,10 @@
         <groupId>com.tngtech.jgiven</groupId>
         <artifactId>jgiven-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/...basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/BasicProcessApplication.kt b/...basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/BasicProcessApplication.kt
@@ -8,9 +8,10 @@ import org.springframework.context.annotation.Bean
 import java.time.temporal.ChronoUnit
 import java.util.*
 
+fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
+
 @EnableProcessApplication
 class BasicProcessApplication {
-  fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
 
   @Bean(APPROVE_REQUEST_TASK_LISTENER)
   fun approveRequestTaskListener() = TaskListener {

diff --git a/...-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/ApprovalProcessStages.kt b/...-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/ApprovalProcessStages.kt
@@ -18,8 +18,8 @@ import org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareTests.externalTask
 import org.camunda.bpm.engine.test.mock.Mocks
 import org.camunda.bpm.engine.variable.Variables
 import org.camunda.bpm.engine.variable.Variables.putValue
-import org.camunda.bpm.extension.mockito.CamundaMockito.getJavaDelegateMock
-import org.camunda.bpm.extension.mockito.CamundaMockito.registerJavaDelegateMock
+import org.camunda.community.mockito.DelegateExpressions.getJavaDelegateMock
+import org.camunda.community.mockito.DelegateExpressions.registerJavaDelegateMock
 
 @JGivenProcessStage
 class ApprovalProcessActionStage : ProcessStage<ApprovalProcessActionStage, ApprovalProcessBean>() {

diff --git a/examples/basic/pom.xml b/examples/basic/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic</artifactId>
@@ -24,7 +24,6 @@
     <dependency>
       <groupId>org.camunda.community.mockito</groupId>
       <artifactId>camunda-platform-7-mockito</artifactId>
-      <version>6.17.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -33,7 +32,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.springboot</groupId>
+      <groupId>com.tngtech.jgiven</groupId>
+      <artifactId>jgiven-junit</artifactId>
+    </dependency>
+    <dependency>
+    <groupId>org.camunda.bpm.springboot</groupId>
       <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
@@ -62,6 +65,10 @@
         <groupId>com.tngtech.jgiven</groupId>
         <artifactId>jgiven-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/examples/basic/src/main/kotlin/io/holunda/testing/examples/basic/BasicProcessApplication.kt b/examples/basic/src/main/kotlin/io/holunda/testing/examples/basic/BasicProcessApplication.kt
@@ -8,9 +8,10 @@ import org.springframework.context.annotation.Bean
 import java.time.temporal.ChronoUnit
 import java.util.*
 
+fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
+
 @EnableProcessApplication
 class BasicProcessApplication {
-  fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
 
   @Bean(APPROVE_REQUEST_TASK_LISTENER)
   fun approveRequestTaskListener() = TaskListener {

diff --git a/examples/basic/src/test/kotlin/io/holunda/testing/examples/basic/ApprovalProcessTest.kt b/examples/basic/src/test/kotlin/io/holunda/testing/examples/basic/ApprovalProcessTest.kt
@@ -11,7 +11,8 @@ import io.toolisticon.testing.jgiven.WHEN
 import org.camunda.bpm.engine.test.Deployment
 import org.camunda.bpm.engine.test.ProcessEngineRule
 import org.camunda.bpm.engine.variable.Variables.putValue
-import org.camunda.bpm.spring.boot.starter.test.helper.StandaloneInMemoryTestConfiguration
+import org.camunda.community.process_test_coverage.junit4.platform7.rules.TestCoverageProcessEngineRuleBuilder
+import org.junit.ClassRule
 import org.junit.Rule
 import org.junit.Test
 import java.time.Period
@@ -21,11 +22,17 @@ import java.util.*
 @Deployment(resources = [ApprovalProcessBean.RESOURCE])
 open class ApprovalProcessTest : ScenarioTest<ApprovalProcessActionStage, ApprovalProcessActionStage, ApprovalProcessThenStage>() {
 
-  @get: Rule
-  val rule: ProcessEngineRule = StandaloneInMemoryTestConfiguration().rule()
+  companion object {
+    @get: ClassRule
+    @JvmStatic
+    val processEngineRule: ProcessEngineRule = TestCoverageProcessEngineRuleBuilder.create().build()
+  }
+
+  @get:Rule
+  val localRule: ProcessEngineRule = processEngineRule
 
   @ScenarioState
-  val camunda = rule.processEngine
+  val camunda = localRule.processEngine
 
   @Test
   fun `should deploy`() {

diff --git a/examples/basic/src/test/resources/camunda.cfg.xml b/examples/basic/src/test/resources/camunda.cfg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <bean id="processEngineConfiguration"
+        class="org.camunda.community.process_test_coverage.engine.platform7.ProcessCoverageInMemProcessEngineConfiguration">
+    <property name="history" value="full"/>
+  </bean>
+</beans>
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples</artifactId>
@@ -15,6 +15,7 @@
   <properties>
     <spring-boot.version>2.7.5</spring-boot.version>
     <camunda-process-test-coverage.version>2.0.0</camunda-process-test-coverage.version>
+    <camunda-platform-7-mockito.version>6.17.1</camunda-platform-7-mockito.version>
   </properties>
 
   <modules>
@@ -56,6 +57,19 @@
         <version>${project.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.camunda.community.mockito</groupId>
+        <artifactId>camunda-platform-7-mockito</artifactId>
+        <version>${camunda-platform-7-mockito.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.tngtech.jgiven</groupId>
+        <artifactId>jgiven-junit5</artifactId>
+        <version>${jgiven.version}</version>
+      </dependency>
+
+
     </dependencies>
   </dependencyManagement>
 

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -6,37 +6,23 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven</artifactId>
   <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>com.tngtech.jgiven</groupId>
-      <artifactId>jgiven-junit</artifactId>
-      <version>${jgiven.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.tngtech.jgiven</groupId>
-      <artifactId>jgiven-junit5</artifactId>
-      <version>${jgiven.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.tngtech.jgiven</groupId>
-      <artifactId>jgiven-spring</artifactId>
-      <version>${jgiven.version}</version>
+      <groupId>io.toolisticon.testing</groupId>
+      <artifactId>jgiven-kotlin</artifactId>
     </dependency>
+
     <dependency>
       <groupId>com.tngtech.jgiven</groupId>
-      <artifactId>jgiven-html5-report</artifactId>
+      <artifactId>jgiven-core</artifactId>
       <version>${jgiven.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.toolisticon.testing</groupId>
-      <artifactId>jgiven-kotlin</artifactId>
-    </dependency>
 
     <!-- This is a test library not a BOM, trying to avoid transitive dependencies -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.holunda.testing</groupId>
   <artifactId>camunda-bpm-jgiven-parent</artifactId>
-  <version>0.3.0</version>
+  <version>0.4.0</version>
   <packaging>pom</packaging>
 
 
@@ -45,25 +45,21 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+
       <dependency>
         <groupId>com.tngtech.jgiven</groupId>
         <artifactId>jgiven-junit</artifactId>
         <version>${jgiven.version}</version>
       </dependency>
       <dependency>
         <groupId>com.tngtech.jgiven</groupId>
-        <artifactId>jgiven-spring</artifactId>
-        <version>${jgiven.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.tngtech.jgiven</groupId>
-        <artifactId>jgiven-spring-junit4</artifactId>
+        <artifactId>jgiven-junit5</artifactId>
         <version>${jgiven.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.tngtech.jgiven</groupId>
-        <artifactId>jgiven-html5-report</artifactId>
-        <version>${jgiven.version}</version>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
       </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
@@ -80,11 +76,6 @@
         <artifactId>camunda-engine</artifactId>
         <version>${camunda.version}</version>
       </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.camunda.bpm</groupId>
         <artifactId>camunda-bpm-assert</artifactId>