Remove <> from ShouldBeEqualByComparingOnlyGivenFields, ShouldBeEqualToIgnoringFields, ShouldBeEqualWithinOffset, ShouldBeEqualWithinPercentage, ShouldBeEqualWithTimePrecision, ShouldBeEven, ShouldBeExactlyInstanceOf, ShouldBeExecutable, ShouldBeFile, ShouldBeFinite, ShouldBeGreater, ShouldBeGreaterOrEqual, ShouldBeIn and ShouldBeInfinite.

Author: joel-costigliola

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

@@ -17,7 +17,7 @@
 /**
  * Creates an <code>{@link AssertionError}</code> indicating that an assertion that verifies that two objects are
  * lenient equal by accepting fields failed.
- * 
+ *
  * @author Nicolas François
  * @author Joel Costigliola
  */
@@ -35,26 +35,35 @@ public class ShouldBeEqualByComparingOnlyGivenFields extends BasicErrorMessageFa
    * @return the created {@code ErrorMessageFactory}.
    */
   public static ErrorMessageFactory shouldBeEqualComparingOnlyGivenFields(Object actual, List<String> rejectedFields,
-                                                                          List<Object> rejectedValues, List<Object> expectedValues,
+                                                                          List<Object> rejectedValues,
+                                                                          List<Object> expectedValues,
                                                                           List<String> acceptedFields) {
     if (rejectedFields.size() == 1) {
-      return new ShouldBeEqualByComparingOnlyGivenFields(actual, rejectedFields.get(0), rejectedValues.get(0), expectedValues.get(0),
-          acceptedFields);
+      return new ShouldBeEqualByComparingOnlyGivenFields(actual, rejectedFields.get(0), rejectedValues.get(0),
+                                                         expectedValues.get(0),
+                                                         acceptedFields);
     }
     return new ShouldBeEqualByComparingOnlyGivenFields(actual, rejectedFields, rejectedValues, expectedValues,
                                                        acceptedFields);
   }
 
   private ShouldBeEqualByComparingOnlyGivenFields(Object actual, List<String> rejectedFields, List<Object> rejectedValues,
                                                   List<Object> expectedValue, List<String> acceptedFields) {
-    super("%nExpecting values:%n  <%s>%nin fields:%n  <%s>%nbut were:%n  <%s>%nin <%s>.%nComparison was performed on fields:%n  <%s>",
-        expectedValue, rejectedFields, rejectedValues, actual, acceptedFields);
+    super("%nExpecting values:%n"
+          + "  %s%n"
+          + "in fields:%n"
+          + "  %s%n"
+          + "but were:%n"
+          + "  %s%n"
+          + "in %s.%n"
+          + "Comparison was performed on fields:%n  %s",
+          expectedValue, rejectedFields, rejectedValues, actual, acceptedFields);
   }
 
   private ShouldBeEqualByComparingOnlyGivenFields(Object actual, String rejectedField, Object rejectedValue, Object expectedValue,
-                                                   List<String> acceptedFields) {
-    super("%nExpecting value <%s> in field <%s> but was <%s> in <%s>", expectedValue, rejectedField, rejectedValue, actual,
-        acceptedFields);
+                                                  List<String> acceptedFields) {
+    super("%nExpecting value %s in field %s but was %s in %s", expectedValue, rejectedField, rejectedValue, actual,
+          acceptedFields);
   }
 
 }

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

@@ -17,16 +17,16 @@
 /**
  * Creates an <code>{@link AssertionError}</code> indicating that an assertion that verifies that two objects are lenient equal by
  * ignoring fields failed.
- * 
+ *
  * @author Nicolas François
  * @author Joel Costigliola
  */
 public class ShouldBeEqualToIgnoringFields extends BasicErrorMessageFactory {
 
-  private static final String EXPECTED_MULTIPLE = "%nExpecting values:%n  <%s>%nin fields:%n  <%s>%nbut were:%n  <%s>%nin <%s>.%n";
-  private static final String EXPECTED_SINGLE = "%nExpecting value <%s> in field <%s> but was <%s> in <%s>.%n";
+  private static final String EXPECTED_MULTIPLE = "%nExpecting values:%n  %s%nin fields:%n  %s%nbut were:%n  %s%nin %s.%n";
+  private static final String EXPECTED_SINGLE = "%nExpecting value %s in field %s but was %s in %s.%n";
   private static final String COMPARISON = "Comparison was performed on all fields";
-  private static final String EXCLUDING = " but <%s>";
+  private static final String EXCLUDING = " but %s";
 
   /**
    * Creates a new <code>{@link ShouldBeEqualToIgnoringFields}</code>.

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

@@ -55,8 +55,11 @@ private static String buildErrorMessageTemplate(final TimeUnit precision) {
       fields = ", day, hour, minute";
       lastField = "second";
     }
-    return "%nExpecting:%n  <%s>%nto have same year, month" + fields + " and " + lastField + " as:%n  <%s>%nbut had " +
-             "not.";
+    return "%nExpecting:%n" +
+           "  %s%n" +
+           "to have same year, month" + fields + " and " + lastField + " as:%n" +
+           "  %s%n" +
+           "but had not.";
   }
 
 }

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

@@ -40,11 +40,11 @@ private <T extends Number> ShouldBeEqualWithinOffset(Number actual, Number expec
                                                        Number difference) {
     super("%n" +
           "Expecting:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to be close to:%n" +
-          "  <%s>%n" +
-          "by less than <%s> but difference was <%s>.%n" +
-          "(a difference of exactly <%s> being considered " + validOrNot(offset) + ")",
+          "  %s%n" +
+          "by less than %s but difference was %s.%n" +
+          "(a difference of exactly %s being considered " + validOrNot(offset) + ")",
           actual, expected, offset.value, difference, offset.value);
   }
 

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

@@ -40,11 +40,11 @@ public static <T extends Number> ErrorMessageFactory shouldBeEqualWithinPercenta
   }
 
   private ShouldBeEqualWithinPercentage(Number actual, Number expected, Percentage percentage,
-                                                           double expectedPercentage) {
+                                        double expectedPercentage) {
     super("%nExpecting:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "to be close to:%n" +
-          "  <%s>%n" +
+          "  %s%n" +
           "by less than %s but difference was %s%%.%n" +
           "(a difference of exactly %s being considered valid)",
           actual, expected, percentage, expectedPercentage, percentage);

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

@@ -29,6 +29,6 @@ public static ErrorMessageFactory shouldBeEven(Number actual) {
   }
 
   private ShouldBeEven(Number actual) {
-    super("%nExpecting <%s> to be even", actual);
+    super("%nExpecting %s to be even", actual);
   }
 }

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

@@ -34,7 +34,7 @@ public static ErrorMessageFactory shouldBeExactlyInstance(Object actual, Class<?
   }
 
   private ShouldBeExactlyInstanceOf(Object actual, Class<?> type) {
-    super("%nExpecting:%n <%s>%nto be exactly an instance of:%n <%s>%nbut was an instance of:%n <%s>", actual, type,
+    super("%nExpecting:%n  %s%nto be exactly an instance of:%n  %s%nbut was an instance of:%n  %s", actual, type,
           actual.getClass());
   }
 

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

@@ -18,33 +18,33 @@
 /**
  * Creates an error message indicating that an assertion that verifies that a <code>{@link File}</code> is executable
  * failed.
- * 
+ *
  * @author Olivier Demeijer
- * 
+ *
  */
 public class ShouldBeExecutable extends BasicErrorMessageFactory {
-  static final String SHOULD_BE_EXECUTABLE = "%nExpecting:%n  <%s>%nto be executable.";
+  private static final String SHOULD_BE_EXECUTABLE = "%nExpecting:%n  %s%nto be executable.";
 
   private ShouldBeExecutable(File actual) {
-	super(SHOULD_BE_EXECUTABLE, actual);
+    super(SHOULD_BE_EXECUTABLE, actual);
   }
 
   private ShouldBeExecutable(Path actual) {
-	super(SHOULD_BE_EXECUTABLE, actual);
+    super(SHOULD_BE_EXECUTABLE, actual);
   }
 
   /**
    * Creates a new <code>{@link ShouldBeExecutable}</code>.
-   * 
+   *
    * @param actual the actual value in the failed assertion.
    * @return the created {@code ErrorMessageFactory}.
    */
   public static ErrorMessageFactory shouldBeExecutable(File actual) {
-	return new ShouldBeExecutable(actual);
+    return new ShouldBeExecutable(actual);
   }
 
   public static ErrorMessageFactory shouldBeExecutable(Path actual) {
-	return new ShouldBeExecutable(actual);
+    return new ShouldBeExecutable(actual);
   }
 
 }

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

@@ -17,7 +17,7 @@
 /**
  * Creates an error message indicating that an assertion that verifies that a <code>{@link File}</code> is an existing file
  * failed.
- * 
+ *
  * @author Yvonne Wang
  */
 public class ShouldBeFile extends BasicErrorMessageFactory {
@@ -32,6 +32,6 @@ public static ErrorMessageFactory shouldBeFile(File actual) {
   }
 
   private ShouldBeFile(File actual) {
-    super("%nExpecting:%n <%s>%nto be a file", actual);
+    super("%nExpecting:%n %s%nto be a file", actual);
   }
 }

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

@@ -19,6 +19,6 @@ public static ErrorMessageFactory shouldBeFinite(Number actual) {
   }
 
   private ShouldBeFinite(Number actual) {
-    super("%nExpecting <%s> to be finite", actual);
+    super("%nExpecting %s to be finite", actual);
   }
 }