Remove <> from ShouldNotBeIn, ShouldNotBeInstance, ShouldNotBeInstanceOfAny, ShouldNotBeOfClassIn and ShouldNotBeSame

epeee · epeee · commit 7bfdc9332f3a · 2021-01-16T13:56:44.000+01:00
See assertj#2091
diff --git a/src/main/java/org/assertj/core/error/ShouldNotBeIn.java b/src/main/java/org/assertj/core/error/ShouldNotBeIn.java
@@ -45,7 +45,7 @@ public static ErrorMessageFactory shouldNotBeIn(Object actual, Object values) {
   }
 
   private ShouldNotBeIn(Object actual, Object values, ComparisonStrategy comparisonStrategy) {
-    super("%nExpecting:%n <%s>%nnot to be in:%n <%s>%n%s", actual, values, comparisonStrategy);
+    super("%nExpecting:%n  %s%nnot to be in:%n  %s%n%s", actual, values, comparisonStrategy);
   }
 
 }
diff --git a/src/main/java/org/assertj/core/error/ShouldNotBeInstance.java b/src/main/java/org/assertj/core/error/ShouldNotBeInstance.java
@@ -33,10 +33,10 @@ public static ErrorMessageFactory shouldNotBeInstance(Object actual, Class<?> ty
   }
 
   private ShouldNotBeInstance(Object actual, Class<?> type) {
-    super("%nExpecting:%n <%s>%nnot to be an instance of:<%s>", actual, type);
+    super("%nExpecting:%n  %s%nnot to be an instance of: %s", actual, type);
   }
 
   private ShouldNotBeInstance(Throwable throwable, Class<?> type) {
-    super("%nExpecting:%n <%s>%nnot to be an instance of:<%s>", getStackTrace(throwable), type);
+    super("%nExpecting:%n  %s%nnot to be an instance of: %s", getStackTrace(throwable), type);
   }
 }
diff --git a/src/main/java/org/assertj/core/error/ShouldNotBeInstanceOfAny.java b/src/main/java/org/assertj/core/error/ShouldNotBeInstanceOfAny.java
@@ -34,10 +34,10 @@ public static ErrorMessageFactory shouldNotBeInstanceOfAny(Object actual, Class<
   }
 
   private ShouldNotBeInstanceOfAny(Object actual, Class<?>[] types) {
-    super("%nExpecting:%n <%s>%nnot to be an instance of any of these types:%n <%s>", actual, types);
+    super("%nExpecting:%n  %s%nnot to be an instance of any of these types:%n  %s", actual, types);
   }
 
   private ShouldNotBeInstanceOfAny(Throwable throwable, Class<?>[] types) {
-    super("%nExpecting:%n <%s>%nnot to be an instance of any of these types:%n <%s>", getStackTrace(throwable), types);
+    super("%nExpecting:%n  %s%nnot to be an instance of any of these types:%n  %s", getStackTrace(throwable), types);
   }
 }
diff --git a/src/main/java/org/assertj/core/error/ShouldNotBeOfClassIn.java b/src/main/java/org/assertj/core/error/ShouldNotBeOfClassIn.java
@@ -30,6 +30,6 @@ public static ErrorMessageFactory shouldNotBeOfClassIn(Object actual, Object typ
   }
 
   private ShouldNotBeOfClassIn(Object actual, Object types) {
-    super("%nExpecting:%n <%s>%nnot to be of any type in:%n <%s>%nbut was of type:<%s>", actual, types, actual.getClass());
+    super("%nExpecting:%n  %s%nnot to be of any type in:%n  %s%nbut was of type: %s", actual, types, actual.getClass());
   }
 }
diff --git a/src/main/java/org/assertj/core/error/ShouldNotBeSame.java b/src/main/java/org/assertj/core/error/ShouldNotBeSame.java
@@ -30,6 +30,6 @@ public static ErrorMessageFactory shouldNotBeSame(Object actual) {
   }
 
   private ShouldNotBeSame(Object actual) {
-    super("%nExpected not same:<%s>", actual);
+    super("%nExpected not same: %s", actual);
   }
 }
diff --git a/src/test/java/org/assertj/core/api/offsettime/OffsetTimeAssert_isNotIn_Test.java b/src/test/java/org/assertj/core/api/offsettime/OffsetTimeAssert_isNotIn_Test.java
@@ -46,9 +46,9 @@ void test_isNotIn_assertion_error_message() {
                                                                                                                        "03:03:03Z"))
                                                    .withMessage(format("%n" +
                                                                        "Expecting:%n" +
-                                                                       " <03:00:05Z>%n" +
+                                                                       "  03:00:05Z%n" +
                                                                        "not to be in:%n" +
-                                                                       " <[03:00:05Z, 03:03:03Z]>%n"));
+                                                                       "  [03:00:05Z, 03:03:03Z]%n"));
   }
 
   @Test
diff --git a/src/test/java/org/assertj/core/api/zoneddatetime/ZonedDateTimeAssert_isNotIn_errors_Test.java b/src/test/java/org/assertj/core/api/zoneddatetime/ZonedDateTimeAssert_isNotIn_errors_Test.java
@@ -43,9 +43,9 @@ void test_isNotIn_assertion() {
   void test_isNotIn_assertion_error_message() {
     assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> assertThat(ZonedDateTime.of(2000, 1, 5, 3, 0, 5, 0,
                                                                                                  UTC)).isNotIn(ZonedDateTime.of(2000, 1, 5, 3, 0, 5, 0, UTC).toString(), ZonedDateTime.of(2012, 1, 1, 3, 3, 3, 0, UTC).toString()))
-                                                   .withMessage(format("%nExpecting:%n <2000-01-05T03:00:05Z (java.time.ZonedDateTime)>%nnot to be in:%n"
+                                                   .withMessage(format("%nExpecting:%n  2000-01-05T03:00:05Z (java.time.ZonedDateTime)%nnot to be in:%n"
                                                                        +
-                                                                       " <[2000-01-05T03:00:05Z (java.time.ZonedDateTime),%n    2012-01-01T03:03:03Z (java.time.ZonedDateTime)]>%n"));
+                                                                       "  [2000-01-05T03:00:05Z (java.time.ZonedDateTime),%n    2012-01-01T03:03:03Z (java.time.ZonedDateTime)]%n"));
   }
 
   @Test
diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java
@@ -42,9 +42,9 @@ void should_create_error_message() {
     // THEN
     then(message).isEqualTo(format("[Test] %n"
                                    + "Expecting:%n"
-                                   + " <\"Luke\">%n"
+                                   + "  \"Luke\"%n"
                                    + "not to be in:%n"
-                                   + " <[\"Luke\", \"Leia\"]>%n"));
+                                   + "  [\"Luke\", \"Leia\"]%n"));
   }
 
   @Test
@@ -57,9 +57,9 @@ void should_create_error_message_with_custom_comparison_strategy() {
     // THEN
     then(message).isEqualTo(format("[Test] %n"
                                    + "Expecting:%n"
-                                   + " <\"Luke\">%n"
+                                   + "  \"Luke\"%n"
                                    + "not to be in:%n"
-                                   + " <[\"Luke\", \"Leia\"]>%n"
+                                   + "  [\"Luke\", \"Leia\"]%n"
                                    + "when comparing values using CaseInsensitiveStringComparator"));
   }
 }
diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeInstanceOfAny_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeInstanceOfAny_create_Test.java
@@ -38,9 +38,9 @@ void should_create_error_message() {
     // THEN
     then(message).isEqualTo(format("[Test] %n" +
                                    "Expecting:%n" +
-                                   " <\"Yoda\">%n" +
+                                   "  \"Yoda\"%n" +
                                    "not to be an instance of any of these types:%n" +
-                                   " <[java.lang.String, java.lang.Object]>"));
+                                   "  [java.lang.String, java.lang.Object]"));
   }
 
   @Test
@@ -52,8 +52,8 @@ void should_create_error_message_with_stack_trace_for_throwable() {
     String message = shouldNotBeInstanceOfAny(throwable, types).create();
     // THEN
     then(message).isEqualTo(format("%nExpecting:%n" +
-                                   " <\"" + getStackTrace(throwable) + "\">%n" +
+                                   "  \"" + getStackTrace(throwable) + "\"%n" +
                                    "not to be an instance of any of these types:%n" +
-                                   " <[java.lang.NullPointerException, java.lang.IllegalArgumentException]>"));
+                                   "  [java.lang.NullPointerException, java.lang.IllegalArgumentException]"));
   }
 }
diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeInstance_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeInstance_create_Test.java
@@ -37,8 +37,8 @@ void should_create_error_message() {
     // THEN
     then(message).isEqualTo(format("[Test] %n" +
                                    "Expecting:%n" +
-                                   " <\"Yoda\">%n" +
-                                   "not to be an instance of:<java.lang.String>"));
+                                   "  \"Yoda\"%n" +
+                                   "not to be an instance of: java.lang.String"));
   }
 
   @Test
@@ -49,7 +49,7 @@ void should_create_error_message_with_stack_trace_for_throwable() {
     String message = shouldNotBeInstance(throwable, IllegalArgumentException.class).create();
     // THEN
     then(message).isEqualTo(format("%nExpecting:%n" +
-                                   " <\"" + getStackTrace(throwable) + "\">%n" +
-                                   "not to be an instance of:<java.lang.IllegalArgumentException>"));
+                                   "  \"" + getStackTrace(throwable) + "\"%n" +
+                                   "not to be an instance of: java.lang.IllegalArgumentException"));
   }
 }
diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeOfClassIn_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeOfClassIn_Test.java
@@ -35,6 +35,6 @@ void should_create_error_message() {
     // WHEN
     String message = factory.create(new TestDescription("Test"), new StandardRepresentation());
     // THEN
-    then(message).isEqualTo(format("[Test] %nExpecting:%n <\"Yoda\">%nnot to be of any type in:%n <[java.lang.Long, java.lang.String]>%nbut was of type:<java.lang.String>"));
+    then(message).isEqualTo(format("[Test] %nExpecting:%n  \"Yoda\"%nnot to be of any type in:%n  [java.lang.Long, java.lang.String]%nbut was of type: java.lang.String"));
   }
 }
diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeSame_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeSame_create_Test.java
@@ -35,6 +35,6 @@ void should_create_error_message() {
     // WHEN
     String message = factory.create(new TestDescription("Test"), new StandardRepresentation());
     // THEN
-    then(message).isEqualTo(format("[Test] %nExpected not same:<\"Yoda\">"));
+    then(message).isEqualTo(format("[Test] %nExpected not same: \"Yoda\""));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static ErrorMessageFactory shouldNotBeIn(Object actual, Object values) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private ShouldNotBeIn(Object actual, Object values, ComparisonStrategy comparisonStrategy) {`
`48`		`- super("%nExpecting:%n <%s>%nnot to be in:%n <%s>%n%s", actual, values, comparisonStrategy);`
	`48`	`+ super("%nExpecting:%n %s%nnot to be in:%n %s%n%s", actual, values, comparisonStrategy);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ public static ErrorMessageFactory shouldNotBeInstance(Object actual, Class<?> ty`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`private ShouldNotBeInstance(Object actual, Class<?> type) {`
`36`		`- super("%nExpecting:%n <%s>%nnot to be an instance of:<%s>", actual, type);`
	`36`	`+ super("%nExpecting:%n %s%nnot to be an instance of: %s", actual, type);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private ShouldNotBeInstance(Throwable throwable, Class<?> type) {`
`40`		`- super("%nExpecting:%n <%s>%nnot to be an instance of:<%s>", getStackTrace(throwable), type);`
	`40`	`+ super("%nExpecting:%n %s%nnot to be an instance of: %s", getStackTrace(throwable), type);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ public static ErrorMessageFactory shouldNotBeInstanceOfAny(Object actual, Class<`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private ShouldNotBeInstanceOfAny(Object actual, Class<?>[] types) {`
`37`		`- super("%nExpecting:%n <%s>%nnot to be an instance of any of these types:%n <%s>", actual, types);`
	`37`	`+ super("%nExpecting:%n %s%nnot to be an instance of any of these types:%n %s", actual, types);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private ShouldNotBeInstanceOfAny(Throwable throwable, Class<?>[] types) {`
`41`		`- super("%nExpecting:%n <%s>%nnot to be an instance of any of these types:%n <%s>", getStackTrace(throwable), types);`
	`41`	`+ super("%nExpecting:%n %s%nnot to be an instance of any of these types:%n %s", getStackTrace(throwable), types);`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public static ErrorMessageFactory shouldNotBeOfClassIn(Object actual, Object typ`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`private ShouldNotBeOfClassIn(Object actual, Object types) {`
`33`		`- super("%nExpecting:%n <%s>%nnot to be of any type in:%n <%s>%nbut was of type:<%s>", actual, types, actual.getClass());`
	`33`	`+ super("%nExpecting:%n %s%nnot to be of any type in:%n %s%nbut was of type: %s", actual, types, actual.getClass());`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ void test_isNotIn_assertion() {`
`43`	`43`	`void test_isNotIn_assertion_error_message() {`
`44`	`44`	`assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> assertThat(ZonedDateTime.of(2000, 1, 5, 3, 0, 5, 0,`
`45`	`45`	`UTC)).isNotIn(ZonedDateTime.of(2000, 1, 5, 3, 0, 5, 0, UTC).toString(), ZonedDateTime.of(2012, 1, 1, 3, 3, 3, 0, UTC).toString()))`
`46`		`- .withMessage(format("%nExpecting:%n <2000-01-05T03:00:05Z (java.time.ZonedDateTime)>%nnot to be in:%n"`
	`46`	`+ .withMessage(format("%nExpecting:%n 2000-01-05T03:00:05Z (java.time.ZonedDateTime)%nnot to be in:%n"`
`47`	`47`	`+`
`48`		`- " <[2000-01-05T03:00:05Z (java.time.ZonedDateTime),%n 2012-01-01T03:03:03Z (java.time.ZonedDateTime)]>%n"));`
	`48`	`+ " [2000-01-05T03:00:05Z (java.time.ZonedDateTime),%n 2012-01-01T03:03:03Z (java.time.ZonedDateTime)]%n"));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ void should_create_error_message() {`
`37`	`37`	`// THEN`
`38`	`38`	`then(message).isEqualTo(format("[Test] %n" +`
`39`	`39`	`"Expecting:%n" +`
`40`		`- " <\"Yoda\">%n" +`
`41`		`- "not to be an instance of:<java.lang.String>"));`
	`40`	`+ " \"Yoda\"%n" +`
	`41`	`+ "not to be an instance of: java.lang.String"));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Test`
`@@ -49,7 +49,7 @@ void should_create_error_message_with_stack_trace_for_throwable() {`
`49`	`49`	`String message = shouldNotBeInstance(throwable, IllegalArgumentException.class).create();`
`50`	`50`	`// THEN`
`51`	`51`	`then(message).isEqualTo(format("%nExpecting:%n" +`
`52`		`- " <\"" + getStackTrace(throwable) + "\">%n" +`
`53`		`- "not to be an instance of:<java.lang.IllegalArgumentException>"));`
	`52`	`+ " \"" + getStackTrace(throwable) + "\"%n" +`
	`53`	`+ "not to be an instance of: java.lang.IllegalArgumentException"));`
`54`	`54`	`}`
`55`	`55`	`}`