Remove <> from ShouldHaveLineCount, ShouldHaveMessage, ShouldHaveMessageFindingMatchRegex, ShouldHaveMessageMatchingRegex, ShouldHaveMethods, ShouldHaveName, ShouldHaveNoCause, ShouldHaveNoFields, ShouldHaveNoNullFields, ShouldHaveNoParent, ShouldHaveNoSuperclass, ShouldHaveOnlyElementsOfType and ShouldHavePackage

See assertj#2091

Author: epeee

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

@@ -36,6 +36,6 @@ private ShouldHaveLineCount(Object actual, int actualSize, int expectedSize) {
     // format the sizes in a standard way, otherwise if we use (for ex) an Hexadecimal representation
     // it will format sizes in hexadecimal while we only want actual to be formatted in hexadecimal
     // Also don't indent actual first line since the remaining lines won't have any indentation
-    super(format("%nExpecting text:%n%s%nto have <%s> lines but had <%s>.", "%s", expectedSize, actualSize), actual);
+    super(format("%nExpecting text:%n%s%nto have %s lines but had %s.", "%s", expectedSize, actualSize), actual);
   }
 }

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

@@ -34,9 +34,9 @@ public static ErrorMessageFactory shouldHaveMessage(Throwable actual, String exp
   private ShouldHaveMessage(Throwable actual, String expectedMessage) {
     super("%n" +
           "Expecting message to be:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "but was:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "%n" +
           "Throwable that failed the check:%n" +
           "%n" + escapePercent(getStackTrace(actual)), // to avoid AssertJ default String formatting

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

@@ -30,9 +30,9 @@ public static ErrorMessageFactory shouldHaveMessageFindingMatchRegex(Throwable a
   private ShouldHaveMessageFindingMatchRegex(Throwable actual, CharSequence regex) {
     super("%n" +
           "Expecting message:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to be found for regex:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "but did not.%n" +
           "%n" +
           "Throwable that failed the check:%n" +

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

@@ -30,9 +30,9 @@ public static ErrorMessageFactory shouldHaveMessageMatchingRegex(Throwable actua
   private ShouldHaveMessageMatchingRegex(Throwable actual, CharSequence regex) {
     super("%n" +
           "Expecting message:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to match regex:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "but did not.%n" +
           "%n" +
           "Throwable that failed the check:%n" +

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

@@ -53,31 +53,31 @@ public static ErrorMessageFactory shouldNotHaveMethods(Class<?> actual, boolean
   private ShouldHaveMethods(Class<?> actual, Set<String> expected, Set<String> missing, boolean declared) {
     super("%n" +
           "Expecting%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to have " + (declared ? "declared " : "") + "methods:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "but could not find:%n" +
-          "  <%s>", actual, expected, missing);
+          "  %s", actual, expected, missing);
   }
 
   private ShouldHaveMethods(Class<?> actual, Set<String> expected, String modifier, Map<String, String> nonMatching,
                             boolean declared) {
     super("%n" +
           "Expecting%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to have " + (declared ? "declared " : "") + modifier + " " + "methods:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "but the following are not " + modifier + ":%n" +
-          "  <%s>", actual, expected, nonMatching);
+          "  %s", actual, expected, nonMatching);
   }
 
   private ShouldHaveMethods(Class<?> actual, String modifier, boolean declared,
                             Set<String> actualMethodsHavingModifier) {
     super("%n" +
           "Expecting%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "not to have any " + (declared ? "declared " : "")
           + (modifier != null && modifier.length() > 0 ? modifier + " " : "") + "methods but it has the following:%n" +
-          "  <%s>", actual, actualMethodsHavingModifier);
+          "  %s", actual, actualMethodsHavingModifier);
   }
 }

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

@@ -22,7 +22,7 @@
  */
 public class ShouldHaveName extends BasicErrorMessageFactory {
 
-  private static final String SHOULD_HAVE_NAME = "%nExpecting%n  <%s>%nto have name:%n  <%s>%nbut had:%n  <%s>";
+  private static final String SHOULD_HAVE_NAME = "%nExpecting%n  %s%nto have name:%n  %s%nbut had:%n  %s";
 
   public static ShouldHaveName shouldHaveName(File actual, String expectedName) {
     return new ShouldHaveName(actual, expectedName);
@@ -33,10 +33,10 @@ private ShouldHaveName(File actual, String expectedName) {
   }
 
   public static ShouldHaveName shouldHaveName(Path actual, String expectedName) {
-	return new ShouldHaveName(actual, expectedName);
+    return new ShouldHaveName(actual, expectedName);
   }
 
   private ShouldHaveName(Path actual, String expectedName) {
-	super(SHOULD_HAVE_NAME, actual, expectedName, actual.getFileName());
+    super(SHOULD_HAVE_NAME, actual, expectedName, actual.getFileName());
   }
 }

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

@@ -29,6 +29,6 @@ public static ErrorMessageFactory shouldHaveNoCause(Throwable actual) {
   }
 
   private ShouldHaveNoCause(Throwable actual) {
-    super("%nExpecting exception without cause, but cause was:<%s>", actual.getCause());
+    super("%nExpecting exception without cause, but cause was: %s", actual.getCause());
   }
 }

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

@@ -26,9 +26,9 @@ public static ErrorMessageFactory shouldHaveNoDeclaredFields(Class<?> actual, Se
 
   private ShouldHaveNoFields(Class<?> actual, Set<String> fields, boolean publik, boolean declared) {
     super("%nExpecting%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "not to have any " + fieldDescription(publik, declared) + " fields but it has:%n" +
-          "  <%s>", actual, fields);
+          "  %s", actual, fields);
   }
 
   private static String fieldDescription(boolean publik, boolean declared) {

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

@@ -22,10 +22,10 @@
  */
 public class ShouldHaveNoNullFields extends BasicErrorMessageFactory {
 
-  private static final String EXPECTED_MULTIPLE = "%nExpecting%n  <%s>%nto have a property or a field named <%s>.%n";
-  private static final String EXPECTED_SINGLE = "%nExpecting%n  <%s>%nnot to have any null property or field, but <%s> was null.%n";
+  private static final String EXPECTED_MULTIPLE = "%nExpecting%n  %s%nto have a property or a field named %s.%n";
+  private static final String EXPECTED_SINGLE = "%nExpecting%n  %s%nnot to have any null property or field, but %s was null.%n";
   private static final String COMPARISON = "Check was performed on all fields/properties";
-  private static final String EXCLUDING = COMPARISON + " except: <%s>";
+  private static final String EXCLUDING = COMPARISON + " except: %s";
   private static final String DOT = ".";
 
   public ShouldHaveNoNullFields(Object actual, List<String> rejectedFields, List<String> ignoredFields) {

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

@@ -25,10 +25,10 @@
 public class ShouldHaveNoParent extends BasicErrorMessageFactory {
 
   @VisibleForTesting
-  public static final String PATH_HAS_PARENT = "%nExpected actual path:%n  <%s>%n not to have a parent, but parent was:%n  <%s>";
+  public static final String PATH_HAS_PARENT = "%nExpected actual path:%n  %s%n not to have a parent, but parent was:%n  %s";
 
   @VisibleForTesting
-  public static final String FILE_HAS_PARENT = "%nExpecting file (or directory):%n  <%s>%nnot to have a parent, but parent was:%n  <%s>";
+  public static final String FILE_HAS_PARENT = "%nExpecting file (or directory):%n  %s%nnot to have a parent, but parent was:%n  %s";
 
   /**
    * Creates a new <code>{@link ShouldHaveNoParent}</code>.