Merge branch 'release/1.22.0'

holunda-io · Oct 8, 2024 · 62fc8cd · 62fc8cd
2 parents 8c5fd0c + 4a36865
commit 62fc8cd
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 22 deletions.
diff --git a/examples/basic-junit4/pom.xml b/examples/basic-junit4/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>1.21.1</version>
+    <version>1.22.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit4</artifactId>

diff --git a/...les/basic-junit4/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt b/...les/basic-junit4/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt
@@ -11,6 +11,9 @@ class ApprovalProcessBean(
   private val processEngine: ProcessEngine
 ) : Supplier<ProcessInstance> {
 
+  /**
+   * Main attributes.
+   */
   companion object {
     const val KEY = "approval"
     const val RESOURCE = "approval.bpmn"

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>1.21.1</version>
+    <version>1.22.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit5</artifactId>

diff --git a/...les/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt b/...les/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt
@@ -11,6 +11,9 @@ class ApprovalProcessBean(
   private val processEngine: ProcessEngine
 ) : Supplier<ProcessInstance> {
 
+  /**
+   * Main attributes.
+   */
   companion object {
     const val KEY = "approval"
     const val RESOURCE = "approval.bpmn"

diff --git a/...asic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/TestProcessEngine.kt b/...asic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/TestProcessEngine.kt
@@ -35,8 +35,6 @@ object TestProcessEngine {
       configuration.isJobExecutorActivate = false
       configuration.isDbMetricsReporterActivate = false
       configuration.expressionManager = MockExpressionManager()
-      configuration.isTelemetryReporterActivate = false
-      configuration.isInitializeTelemetry = false
     }
 
     /**

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>1.21.1</version>
+    <version>1.22.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples</artifactId>
@@ -15,7 +15,7 @@
   <properties>
     <spring-boot.version>3.3.4</spring-boot.version>
     <camunda-process-test-coverage.version>2.7.0</camunda-process-test-coverage.version>
-    <camunda-platform-7-mockito.version>7.21.0</camunda-platform-7-mockito.version>
+    <camunda-platform-7-mockito.version>7.22.0</camunda-platform-7-mockito.version>
     <junit.version>4.13.2</junit.version>
   </properties>
 

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-parent</artifactId>
-    <version>1.21.1</version>
+    <version>1.22.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven</artifactId>

diff --git a/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt b/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt
@@ -210,8 +210,8 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
    * @param activityId activities the execution is waiting at.
    * @return fluent stage.
    */
-  @As("process continues")
-  fun process_continues(vararg activityId: String) = job_is_executed(*activityId)
+  @As("process continues with activities $")
+  fun process_continues(@QuotedVarargs vararg activityId: String) = job_is_executed(*activityId)
 
 
   /**
@@ -504,7 +504,7 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
    * @param activityId id of the activity the job is waiting in.
    * @return fluent stage.
    */
-  fun job_is_executed(vararg activityId: String) = step {
+  fun job_is_executed(@QuotedVarargs vararg activityId: String) = step {
     require(activityId.isNotEmpty()) { "At least one activity id must be provided" }
     activityId.map {
       val job = job(it)
@@ -580,16 +580,6 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
     assertThat(externalTasks).isNotEmpty
   }
 
-
-  /**
-   * Completes external task.
-   *
-   * @param topicName name of the topic.
-   * @param workerName optional, defaults to `test-worker`
-   * @param variables variables to set on completion, optional, defaults to empty map.
-   * @param isAsyncAfter executes the async job after completion, optional, defaults to `false`.
-   * @return fluent stage.
-   */
   private fun externalTaskIsCompleted(
     topicName: String,
     workerName: String = "test-worker",

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.holunda.testing</groupId>
   <artifactId>camunda-bpm-jgiven-parent</artifactId>
-  <version>1.21.1</version>
+  <version>1.22.0</version>
   <packaging>pom</packaging>
 
 
@@ -15,7 +15,7 @@
 
 
   <properties>
-    <camunda.version>7.21.0</camunda.version>
+    <camunda.version>7.22.0</camunda.version>
     <jgiven.version>1.3.1</jgiven.version>
     <assertj.version>3.26.3</assertj.version>
     <jgiven-kotlin.version>1.3.1.0</jgiven-kotlin.version>