Refactor assertion error message

fslev · Dec 2, 2020 · 5b13630 · 5b13630
1 parent ec1e6f1
commit 5b13630
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,9 @@
 # Changelog
 
-### 1.8-SNAPSHOT
+### 1.9-SNAPSHOT
+
+### 1.8
+Refactor assertion error message  
 
 ### 1.7
 Update doc  

diff --git a/src/main/java/io/jtest/utils/matcher/HttpResponseMatcher.java b/src/main/java/io/jtest/utils/matcher/HttpResponseMatcher.java
@@ -24,7 +24,7 @@ public HttpResponseMatcher(String message, Object expected, Object actual, Set<M
         this.expectedReason = this.expected.getReasonPhrase();
         this.expectedHeaders = this.expected.getHeaders();
         this.expectedEntity = this.expected.getEntity();
-        String defaultMessage = "\nEXPECTED:\n" + expected + "\nBUT GOT:\n" + actual + "\n";
+        String defaultMessage = "\nEXPECTED HTTP Response:\n" + expected + "\nBUT GOT HTTP Response:\n" + actual + "\n";
         this.message = this.message != null ? this.message + defaultMessage : defaultMessage;
     }
 

diff --git a/src/main/java/io/jtest/utils/matcher/StringMatcher.java b/src/main/java/io/jtest/utils/matcher/StringMatcher.java
@@ -28,7 +28,7 @@ public class StringMatcher extends AbstractObjectMatcher<Object> {
     public StringMatcher(String message, Object expected, Object actual, Set<MatchCondition> matchConditions) throws InvalidTypeException {
         super(message, expected, actual, matchConditions);
         String defaultMessage = "\nEXPECTED:\n" + expected + "\nBUT GOT:\n" + actual + "\n";
-        this.message = this.message != null ? this.message + defaultMessage : defaultMessage;
+        this.message = this.message != null ? defaultMessage + this.message : defaultMessage;
     }
 
     @Override