Merge branch 'release/0.2.1'

holixon · Jul 20, 2022 · fe9b87f · fe9b87f
2 parents 2919ae3 + 22ceeb5
commit fe9b87f
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 23 deletions.
diff --git a/examples/bankaccount-jgiven-junit4/pom.xml b/examples/bankaccount-jgiven-junit4/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>examples</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.examples</groupId>

diff --git a/examples/bankaccount-jgiven-junit5/pom.xml b/examples/bankaccount-jgiven-junit5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>examples</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.examples</groupId>

diff --git a/examples/bankaccount-jgiven-junit5/src/test/kotlin/BankAccountAggregateJgivenKotlinTest.kt b/examples/bankaccount-jgiven-junit5/src/test/kotlin/BankAccountAggregateJgivenKotlinTest.kt
@@ -11,7 +11,7 @@ import io.toolisticon.testing.jgiven.AND
 import io.toolisticon.testing.jgiven.GIVEN
 import io.toolisticon.testing.jgiven.THEN
 import io.toolisticon.testing.jgiven.WHEN
-import org.axonframework.test.aggregate.AggregateTestFixture
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 
@@ -45,12 +45,26 @@ class BankAccountAggregateJgivenKotlinTest : AggregateFixtureScenarioTest<BankAc
           .build()
       )
       .AND
+      .expectEvents(
+        AccountCreatedEvent.builder()
+          .accountId("1")
+          .customerId("1")
+          .initialBalance(100)
+          .maximalBalance(DEFAULT_MAXIMAL_BALANCE)
+          .build()
+      )
+      .AND
       .expectState(
         BankAccountAggregate.builder()
           .accountId("1")
           .currentBalance(100)
           .maximalBalance(DEFAULT_MAXIMAL_BALANCE)
           .build()
       )
+      .AND
+      .expectState("assert correct balance") {
+        assertEquals(100, it.currentBalance)
+      }
+
   }
 }
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>axon-testing_</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <artifactId>examples</artifactId>

diff --git a/extension/jgiven/core/pom.xml b/extension/jgiven/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-jgiven</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>

diff --git a/extension/jgiven/core/src/main/kotlin/aggregate/AggregateFixtureThen.kt b/extension/jgiven/core/src/main/kotlin/aggregate/AggregateFixtureThen.kt
@@ -1,8 +1,12 @@
 @file:Suppress("unused")
+
 package io.holixon.axon.testing.jgiven.aggregate
 
 import com.tngtech.jgiven.Stage
-import com.tngtech.jgiven.annotation.*
+import com.tngtech.jgiven.annotation.As
+import com.tngtech.jgiven.annotation.ExpectedScenarioState
+import com.tngtech.jgiven.annotation.Hidden
+import com.tngtech.jgiven.annotation.Quoted
 import io.holixon.axon.testing.jgiven.AxonJGivenStage
 import org.axonframework.commandhandling.CommandResultMessage
 import org.axonframework.deadline.DeadlineMessage
@@ -12,6 +16,7 @@ import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert
 import java.time.Duration
 import java.time.Instant
+import java.util.function.Consumer
 
 /**
  * Then stage for aggregate fixture.
@@ -81,6 +86,12 @@ class AggregateFixtureThen<T> : Stage<AggregateFixtureThen<T>>() {
     }
   }
 
+
+  @As("expect state: $")
+  fun expectState(@Quoted message: String = "by validator", @Hidden validator: Consumer<T>) = execute {
+    resultValidator.expectState(validator)
+  }
+
   /**
    * Expects an exception with provided message to be thrown.
    * @param exceptionMessage message to expect.

diff --git a/extension/jgiven/core/src/test/kotlin/io/holixon/axon/testing/jgiven/aggregate/.gitkeep b/extension/jgiven/core/src/test/kotlin/io/holixon/axon/testing/jgiven/aggregate/.gitkeep
diff --git a/extension/jgiven/junit/pom.xml b/extension/jgiven/junit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-jgiven</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>

diff --git a/extension/jgiven/junit5/pom.xml b/extension/jgiven/junit5/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-jgiven</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>

diff --git a/extension/jgiven/pom.xml b/extension/jgiven/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <artifactId>extension-jgiven</artifactId>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>axon-testing_</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <artifactId>extension</artifactId>

diff --git a/extension/upcaster-test-core/pom.xml b/extension/upcaster-test-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>

diff --git a/lib/fixtures/bankaccount/pom.xml b/lib/fixtures/bankaccount/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>fixtures</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.lib</groupId>

diff --git a/lib/fixtures/giftcard/pom.xml b/lib/fixtures/giftcard/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>fixtures</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.lib</groupId>

diff --git a/lib/fixtures/pom.xml b/lib/fixtures/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>lib</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <artifactId>fixtures</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>axon-testing_</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
 
   <artifactId>lib</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>io.holixon.axon.testing._</groupId>
   <artifactId>axon-testing_</artifactId>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -22,9 +22,9 @@
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <kotlin.version>1.6.21</kotlin.version>
+    <kotlin.version>1.7.10</kotlin.version>
 
-    <axon-bom.version>4.5.13</axon-bom.version>
+    <axon-bom.version>4.5.16</axon-bom.version>
 
     <jackson.version>2.13.3</jackson.version>
     <junit.version>4.13.2</junit.version>
@@ -184,14 +184,14 @@
         <!-- Install -->
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0</version>
         </plugin>
 
         <!-- Assembly -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.1</version>
           <configuration>
             <descriptorSourceDirectory>assembly</descriptorSourceDirectory>
             <archiverConfig>
@@ -268,7 +268,7 @@
         <plugin>
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.6.21</version>
+          <version>1.7.10</version>
           <configuration>
             <!-- Conditional on maven property set per-project -->
             <skip>${dokka.skip}</skip>
@@ -321,7 +321,7 @@
         <!-- Enforcer -->
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <id>enforce-java</id>
@@ -392,7 +392,7 @@
         <!-- Deploy -->
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>3.0.0</version>
           <configuration>
             <skip>true</skip>
           </configuration>