Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.

Commit b4d9cb8

Browse files
zambrovskizambrovski
committed
Merge branch 'release/0.4.0'
2 parents e3644a6 + 3e09694 commit b4d9cb8

File tree

10 files changed

+75
-50
lines changed

10 files changed

+75
-50
lines changed

‎examples/basic-junit5/pom.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.holunda.testing</groupId>
88
<artifactId>camunda-bpm-jgiven-examples</artifactId>
9-
<version>0.3.0</version>
9+
<version>0.4.0</version>
1010
</parent>
1111

1212
<artifactId>camunda-bpm-jgiven-examples-basic-junit5</artifactId>
@@ -22,11 +22,14 @@
2222
<artifactId>h2</artifactId>
2323
</dependency>
2424
<dependency>
25-
<groupId>org.camunda.bpm.extension.mockito</groupId>
26-
<artifactId>camunda-bpm-mockito</artifactId>
27-
<version>5.16.0</version>
25+
<groupId>org.camunda.community.mockito</groupId>
26+
<artifactId>camunda-platform-7-mockito</artifactId>
2827
<scope>test</scope>
2928
</dependency>
29+
<dependency>
30+
<groupId>com.tngtech.jgiven</groupId>
31+
<artifactId>jgiven-junit5</artifactId>
32+
</dependency>
3033
<dependency>
3134
<groupId>org.camunda.bpm.springboot</groupId>
3235
<artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
@@ -63,6 +66,10 @@
6366
<groupId>com.tngtech.jgiven</groupId>
6467
<artifactId>jgiven-maven-plugin</artifactId>
6568
</plugin>
69+
<plugin>
70+
<groupId>org.springframework.boot</groupId>
71+
<artifactId>spring-boot-maven-plugin</artifactId>
72+
</plugin>
6673
</plugins>
6774
</build>
6875

‎examples/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/BasicProcessApplication.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import org.springframework.context.annotation.Bean
88
import java.time.temporal.ChronoUnit
99
import java.util.*
1010

11+
fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
12+
1113
@EnableProcessApplication
1214
class BasicProcessApplication {
13-
fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
1415

1516
@Bean(APPROVE_REQUEST_TASK_LISTENER)
1617
fun approveRequestTaskListener() = TaskListener {

‎examples/basic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/ApprovalProcessStages.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareTests.externalTask
1818
import org.camunda.bpm.engine.test.mock.Mocks
1919
import org.camunda.bpm.engine.variable.Variables
2020
import org.camunda.bpm.engine.variable.Variables.putValue
21-
import org.camunda.bpm.extension.mockito.CamundaMockito.getJavaDelegateMock
22-
import org.camunda.bpm.extension.mockito.CamundaMockito.registerJavaDelegateMock
21+
import org.camunda.community.mockito.DelegateExpressions.getJavaDelegateMock
22+
import org.camunda.community.mockito.DelegateExpressions.registerJavaDelegateMock
2323

2424
@JGivenProcessStage
2525
class ApprovalProcessActionStage : ProcessStage<ApprovalProcessActionStage, ApprovalProcessBean>() {

‎examples/basic/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.holunda.testing</groupId>
88
<artifactId>camunda-bpm-jgiven-examples</artifactId>
9-
<version>0.3.0</version>
9+
<version>0.4.0</version>
1010
</parent>
1111

1212
<artifactId>camunda-bpm-jgiven-examples-basic</artifactId>
@@ -24,7 +24,6 @@
2424
<dependency>
2525
<groupId>org.camunda.community.mockito</groupId>
2626
<artifactId>camunda-platform-7-mockito</artifactId>
27-
<version>6.17.1</version>
2827
<scope>test</scope>
2928
</dependency>
3029
<dependency>
@@ -33,7 +32,11 @@
3332
<scope>test</scope>
3433
</dependency>
3534
<dependency>
36-
<groupId>org.camunda.bpm.springboot</groupId>
35+
<groupId>com.tngtech.jgiven</groupId>
36+
<artifactId>jgiven-junit</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.camunda.bpm.springboot</groupId>
3740
<artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
3841
<scope>test</scope>
3942
</dependency>
@@ -62,6 +65,10 @@
6265
<groupId>com.tngtech.jgiven</groupId>
6366
<artifactId>jgiven-maven-plugin</artifactId>
6467
</plugin>
68+
<plugin>
69+
<groupId>org.springframework.boot</groupId>
70+
<artifactId>spring-boot-maven-plugin</artifactId>
71+
</plugin>
6572
</plugins>
6673
</build>
6774

‎examples/basic/src/main/kotlin/io/holunda/testing/examples/basic/BasicProcessApplication.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import org.springframework.context.annotation.Bean
88
import java.time.temporal.ChronoUnit
99
import java.util.*
1010

11+
fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
12+
1113
@EnableProcessApplication
1214
class BasicProcessApplication {
13-
fun main(args: Array<String>) = runApplication<BasicProcessApplication>(*args).let { Unit }
1415

1516
@Bean(APPROVE_REQUEST_TASK_LISTENER)
1617
fun approveRequestTaskListener() = TaskListener {

‎examples/basic/src/test/kotlin/io/holunda/testing/examples/basic/ApprovalProcessTest.kt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import io.toolisticon.testing.jgiven.WHEN
1111
import org.camunda.bpm.engine.test.Deployment
1212
import org.camunda.bpm.engine.test.ProcessEngineRule
1313
import org.camunda.bpm.engine.variable.Variables.putValue
14-
import org.camunda.bpm.spring.boot.starter.test.helper.StandaloneInMemoryTestConfiguration
14+
import org.camunda.community.process_test_coverage.junit4.platform7.rules.TestCoverageProcessEngineRuleBuilder
15+
import org.junit.ClassRule
1516
import org.junit.Rule
1617
import org.junit.Test
1718
import java.time.Period
@@ -21,11 +22,17 @@ import java.util.*
2122
@Deployment(resources = [ApprovalProcessBean.RESOURCE])
2223
open class ApprovalProcessTest : ScenarioTest<ApprovalProcessActionStage, ApprovalProcessActionStage, ApprovalProcessThenStage>() {
2324

24-
@get: Rule
25-
val rule: ProcessEngineRule = StandaloneInMemoryTestConfiguration().rule()
25+
companion object {
26+
@get: ClassRule
27+
@JvmStatic
28+
val processEngineRule: ProcessEngineRule = TestCoverageProcessEngineRuleBuilder.create().build()
29+
}
30+
31+
@get:Rule
32+
val localRule: ProcessEngineRule = processEngineRule
2633

2734
@ScenarioState
28-
val camunda = rule.processEngine
35+
val camunda = localRule.processEngine
2936

3037
@Test
3138
fun `should deploy`() {

‎examples/basic/src/test/resources/camunda.cfg.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<beans xmlns="http://www.springframework.org/schema/beans"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
6+
7+
<bean id="processEngineConfiguration"
8+
class="org.camunda.community.process_test_coverage.engine.platform7.ProcessCoverageInMemProcessEngineConfiguration">
9+
<property name="history" value="full"/>
10+
</bean>
11+
</beans>

‎examples/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.holunda.testing</groupId>
88
<artifactId>camunda-bpm-jgiven-parent</artifactId>
9-
<version>0.3.0</version>
9+
<version>0.4.0</version>
1010
</parent>
1111

1212
<artifactId>camunda-bpm-jgiven-examples</artifactId>
@@ -15,6 +15,7 @@
1515
<properties>
1616
<spring-boot.version>2.7.5</spring-boot.version>
1717
<camunda-process-test-coverage.version>2.0.0</camunda-process-test-coverage.version>
18+
<camunda-platform-7-mockito.version>6.17.1</camunda-platform-7-mockito.version>
1819
</properties>
1920

2021
<modules>
@@ -56,6 +57,19 @@
5657
<version>${project.version}</version>
5758
<scope>test</scope>
5859
</dependency>
60+
<dependency>
61+
<groupId>org.camunda.community.mockito</groupId>
62+
<artifactId>camunda-platform-7-mockito</artifactId>
63+
<version>${camunda-platform-7-mockito.version}</version>
64+
<scope>test</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>com.tngtech.jgiven</groupId>
68+
<artifactId>jgiven-junit5</artifactId>
69+
<version>${jgiven.version}</version>
70+
</dependency>
71+
72+
5973
</dependencies>
6074
</dependencyManagement>
6175

‎extension/pom.xml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,23 @@
66
<parent>
77
<groupId>io.holunda.testing</groupId>
88
<artifactId>camunda-bpm-jgiven-parent</artifactId>
9-
<version>0.3.0</version>
9+
<version>0.4.0</version>
1010
</parent>
1111

1212
<artifactId>camunda-bpm-jgiven</artifactId>
1313
<packaging>jar</packaging>
1414

1515
<dependencies>
1616
<dependency>
17-
<groupId>com.tngtech.jgiven</groupId>
18-
<artifactId>jgiven-junit</artifactId>
19-
<version>${jgiven.version}</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>com.tngtech.jgiven</groupId>
23-
<artifactId>jgiven-junit5</artifactId>
24-
<version>${jgiven.version}</version>
25-
</dependency>
26-
<dependency>
27-
<groupId>com.tngtech.jgiven</groupId>
28-
<artifactId>jgiven-spring</artifactId>
29-
<version>${jgiven.version}</version>
17+
<groupId>io.toolisticon.testing</groupId>
18+
<artifactId>jgiven-kotlin</artifactId>
3019
</dependency>
20+
3121
<dependency>
3222
<groupId>com.tngtech.jgiven</groupId>
33-
<artifactId>jgiven-html5-report</artifactId>
23+
<artifactId>jgiven-core</artifactId>
3424
<version>${jgiven.version}</version>
3525
</dependency>
36-
<dependency>
37-
<groupId>io.toolisticon.testing</groupId>
38-
<artifactId>jgiven-kotlin</artifactId>
39-
</dependency>
4026

4127
<!-- This is a test library not a BOM, trying to avoid transitive dependencies -->
4228
<dependency>

‎pom.xml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>io.holunda.testing</groupId>
77
<artifactId>camunda-bpm-jgiven-parent</artifactId>
8-
<version>0.3.0</version>
8+
<version>0.4.0</version>
99
<packaging>pom</packaging>
1010

1111

@@ -45,25 +45,21 @@
4545
<scope>import</scope>
4646
<type>pom</type>
4747
</dependency>
48+
4849
<dependency>
4950
<groupId>com.tngtech.jgiven</groupId>
5051
<artifactId>jgiven-junit</artifactId>
5152
<version>${jgiven.version}</version>
5253
</dependency>
5354
<dependency>
5455
<groupId>com.tngtech.jgiven</groupId>
55-
<artifactId>jgiven-spring</artifactId>
56-
<version>${jgiven.version}</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.tngtech.jgiven</groupId>
60-
<artifactId>jgiven-spring-junit4</artifactId>
56+
<artifactId>jgiven-junit5</artifactId>
6157
<version>${jgiven.version}</version>
6258
</dependency>
6359
<dependency>
64-
<groupId>com.tngtech.jgiven</groupId>
65-
<artifactId>jgiven-html5-report</artifactId>
66-
<version>${jgiven.version}</version>
60+
<groupId>junit</groupId>
61+
<artifactId>junit</artifactId>
62+
<version>${junit.version}</version>
6763
</dependency>
6864
<dependency>
6965
<groupId>org.assertj</groupId>
@@ -80,11 +76,6 @@
8076
<artifactId>camunda-engine</artifactId>
8177
<version>${camunda.version}</version>
8278
</dependency>
83-
<dependency>
84-
<groupId>junit</groupId>
85-
<artifactId>junit</artifactId>
86-
<version>${junit.version}</version>
87-
</dependency>
8879
<dependency>
8980
<groupId>org.camunda.bpm</groupId>
9081
<artifactId>camunda-bpm-assert</artifactId>

0 commit comments

Comments
 (0)