Remove <> from ShouldNotEndWith, ShouldNotExist, ShouldNotHave, ShouldNotHaveAnyElementsOfTypes, ShouldNotHaveDuplicates, ShouldNotHaveSameClass, ShouldNotHaveSameHashCode and ShouldNotHaveThrown

See assertj#2091

Author: epeee

src/main/java/org/assertj/core/error/ShouldNotEndWith.java

@@ -48,6 +48,6 @@ public static ErrorMessageFactory shouldNotEndWith(Object actual, Object expecte
   }
 
   private ShouldNotEndWith(Object actual, Object expected, ComparisonStrategy comparisonStrategy) {
-    super("%nExpecting:%n  <%s>%nnot to end with:%n  <%s>%n%s", actual, expected, comparisonStrategy);
+    super("%nExpecting:%n  %s%nnot to end with:%n  %s%n%s", actual, expected, comparisonStrategy);
   }
 }

src/main/java/org/assertj/core/error/ShouldNotExist.java

@@ -27,9 +27,9 @@
 public class ShouldNotExist extends BasicErrorMessageFactory {
 
   @VisibleForTesting
-  public static final String PATH_SHOULD_NOT_EXIST = "%nExpecting path:%n  <%s>%nnot to exist";
+  public static final String PATH_SHOULD_NOT_EXIST = "%nExpecting path:%n  %s%nnot to exist";
   @VisibleForTesting
-  public static final String FILE_SHOULD_NOT_EXIST = "%nExpecting file:%n  <%s>%nnot to exist";
+  public static final String FILE_SHOULD_NOT_EXIST = "%nExpecting file:%n  %s%nnot to exist";
 
   /**
    * Creates a new <code>{@link ShouldNotExist}</code>.

src/main/java/org/assertj/core/error/ShouldNotHave.java

@@ -35,6 +35,6 @@ public static <T> ErrorMessageFactory shouldNotHave(T actual, Condition<? super
   }
 
   private ShouldNotHave(Object actual, Condition<?> condition) {
-    super("%nExpecting:%n <%s>%nnot to have:%n <%s>", actual, condition);
+    super("%nExpecting:%n  %s%nnot to have:%n  %s", actual, condition);
   }
 }

src/main/java/org/assertj/core/error/ShouldNotHaveAnyElementsOfTypes.java

@@ -21,11 +21,11 @@ private ShouldNotHaveAnyElementsOfTypes(Object actual, Class<?>[] unexpectedType
                                           Map<Class<?>, List<Object>> nonMatchingElementsByType) {
     super("%n" +
           "Expecting:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to not have any elements of the following types:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "but found:%n" +
-          "  <%s>",
+          "  %s",
           actual, unexpectedTypes, nonMatchingElementsByType);
   }
 

src/main/java/org/assertj/core/error/ShouldNotHaveDuplicates.java

@@ -46,7 +46,7 @@ public static ErrorMessageFactory shouldNotHaveDuplicates(Object actual, Object
   }
 
   private ShouldNotHaveDuplicates(Object actual, Object duplicates, ComparisonStrategy comparisonStrategy) {
-    super("%nFound duplicate(s):%n <%s>%nin:%n <%s>%n%s", duplicates, actual, comparisonStrategy);
+    super("%nFound duplicate(s):%n  %s%nin:%n  %s%n%s", duplicates, actual, comparisonStrategy);
   }
 
 }

src/main/java/org/assertj/core/error/ShouldNotHaveSameClass.java

@@ -30,6 +30,6 @@ public static ErrorMessageFactory shouldNotHaveSameClass(Object actual, Object o
   }
 
   private ShouldNotHaveSameClass(Object actual, Object other) {
-    super("%nExpecting:%n <%s>%nnot to have the same class as:%n <%s> (%s)", actual, other, actual.getClass());
+    super("%nExpecting:%n  %s%nnot to have the same class as:%n  %s (%s)", actual, other, actual.getClass());
   }
 }

src/main/java/org/assertj/core/error/ShouldNotHaveSameHashCode.java

@@ -20,11 +20,11 @@ public static ErrorMessageFactory shouldNotHaveSameHashCode(Object actual, Objec
 
   private ShouldNotHaveSameHashCode(Object actual, Object other) {
     super("%nExpecting%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "not to have the same hash code as:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "hash code is%n" +
-          "  <%s>",
+          "  %s",
           actual, other, actual.hashCode());
   }
 }

src/main/java/org/assertj/core/error/ShouldNotHaveThrown.java

@@ -21,6 +21,6 @@ public static ErrorMessageFactory shouldNotHaveThrown(Throwable throwable) {
   }
 
   private ShouldNotHaveThrown(Throwable throwable) {
-    super("%nExpecting code not to raise a throwable but caught%n  <%s>", getStackTrace(throwable));
+    super("%nExpecting code not to raise a throwable but caught%n  %s", getStackTrace(throwable));
   }
 }

src/test/java/org/assertj/core/api/throwable/NotThrownAssert_description_Test.java

@@ -58,7 +58,7 @@ void should_contain_provided_description_if_exception_is_thrown_by_lambda(Functi
     then(assertionError).hasMessageStartingWith(format("[test description] %n" +
                                                        "Expecting code not to raise a throwable but caught%n"
                                                        +
-                                                       "  <\"java.lang.IllegalArgumentException"));
+                                                       "  \"java.lang.IllegalArgumentException"));
   }
 
 }

src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java

@@ -41,9 +41,9 @@ void should_create_error_message() {
     // THEN
     then(message).isEqualTo(format("[Test] %n" +
                                    "Expecting:%n" +
-                                   "  <[\"Yoda\", \"Luke\"]>%n" +
+                                   "  [\"Yoda\", \"Luke\"]%n" +
                                    "not to end with:%n" +
-                                   "  <[\"Han\", \"Leia\"]>%n"));
+                                   "  [\"Han\", \"Leia\"]%n"));
   }
 
   @Test
@@ -56,9 +56,9 @@ void should_create_error_message_with_custom_comparison_strategy() {
     // THEN
     then(message).isEqualTo(format("[Test] %n" +
                                    "Expecting:%n" +
-                                   "  <[\"Yoda\", \"Luke\"]>%n" +
+                                   "  [\"Yoda\", \"Luke\"]%n" +
                                    "not to end with:%n" +
-                                   "  <[\"Han\", \"Leia\"]>%n" +
+                                   "  [\"Han\", \"Leia\"]%n" +
                                    "when comparing values using CaseInsensitiveStringComparator"));
   }
 }