Merge pull request #19 from dm-drogeriemarkt/3.5.1-snapshot

fix error message

README.md

@@ -49,6 +49,7 @@ logCapture.assertLoggedInOrder(
   * [Cucumber example](#cucumber-example)
     * [Cucumber feature file](#cucumber-feature-file)
 * [Changes](#changes)
+  * [3.6.2](#362)
   * [3.6.1](#361)
   * [3.6.0](#360)
   * [3.5.0](#350)
@@ -73,7 +74,7 @@ Add log-capture as a test dependency to your project. If you use Maven, add this
 <dependency>
     <groupId>de.dm.infrastructure</groupId>
     <artifactId>log-capture</artifactId>
-    <version>3.6.1</version>
+    <version>3.6.2</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -309,6 +310,10 @@ And with MDC logging context
 
 ## Changes
 
+### 3.6.2
+
+* Fixed an assertion message concerning captured Exceptions.
+
 ### 3.6.1
 
 * Fixed a misleading and wrong assertion message. The assertion itself was correct, but the message always said all matchers did not match when only a subset did not match.

pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
     </developers>
 
     <properties>
-        <project.version>3.5.0-SNAPSHOT</project.version>
+        <project.version>3.6.2-SNAPSHOT</project.version>
 
         <java.version>1.8</java.version>
         <lombok.version>1.18.22</lombok.version>

src/main/java/de/dm/infrastructure/logcapture/ExpectedException.java

@@ -62,7 +62,7 @@ private static String loggedExceptionToString(Optional<LoggedEvent.LoggedExcepti
 
         LoggedEvent.LoggedException loggedException = optionalException.get();
 
-        return format("message: \"%s\", message: %s%s",
+        return format("message: \"%s\", type: %s%s",
                 loggedException.getMessage(),
                 loggedException.getType(),
                 loggedException.getCause().isPresent() ? format(", cause: (%s)", loggedExceptionToString(loggedException.getCause())) : ""

src/test/java/com/example/app/ReadableApiTest.java

@@ -155,7 +155,7 @@ void expectedExceptionFails() {
 
             assertThat(assertionError).hasMessage("Expected log message has occurred, but never with the expected Exception: Level: WARN, Regex: \"oh no!\"" +
                     lineSeparator() + "  expected exception: message (regex): \"a message never used\" type: java.lang.RuntimeException" +
-                    lineSeparator() + "  actual exception: message: \"this is illegal\", message: java.lang.IllegalArgumentException, cause: (message: \"never be null!\", message: java.lang.NullPointerException)" +
+                    lineSeparator() + "  actual exception: message: \"this is illegal\", type: java.lang.IllegalArgumentException, cause: (message: \"never be null!\", type: java.lang.NullPointerException)" +
                     lineSeparator());
 
             AssertionError withoutExceptionAssertionError = assertThrows(AssertionError.class,
@@ -695,7 +695,7 @@ void combinedLogExpectationsOnlyOutputMismatch() {
 
         assertThat(assertionError).hasMessage("Expected log message has occurred, but never with the expected Exception: Level: ERROR, Regex: \"some error\"" +
                 lineSeparator() + "  expected exception: message (regex): \"an exception that was not logged\"" +
-                lineSeparator() + "  actual exception: message: \"an exception that was logged\", message: java.lang.RuntimeException" +
+                lineSeparator() + "  actual exception: message: \"an exception that was logged\", type: java.lang.RuntimeException" +
                 lineSeparator());
     }
 }