Polishing

Author: sbrannen

spring-core/src/test/java/org/springframework/util/StringUtilsTests.java

@@ -29,6 +29,7 @@
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rick Evans
+ * @author Sam Brannen
  */
 class StringUtilsTests {
 
@@ -272,29 +273,29 @@ void deleteAny() {
 		String inString = "Able was I ere I saw Elba";
 
 		String res = StringUtils.deleteAny(inString, "I");
-		assertThat(res.equals("Able was  ere  saw Elba")).as("Result has no Is [" + res + "]").isTrue();
+		assertThat(res).as("Result has no 'I'").isEqualTo("Able was  ere  saw Elba");
 
 		res = StringUtils.deleteAny(inString, "AeEba!");
-		assertThat(res.equals("l ws I r I sw l")).as("Result has no Is [" + res + "]").isTrue();
+		assertThat(res).as("Result has no 'AeEba!'").isEqualTo("l ws I r I sw l");
 
-		String mismatch = StringUtils.deleteAny(inString, "#@$#$^");
-		assertThat(mismatch.equals(inString)).as("Result is unchanged").isTrue();
+		res = StringUtils.deleteAny(inString, "#@$#$^");
+		assertThat(res).as("Result is unchanged").isEqualTo(inString);
+	}
 
+	@Test
+	void deleteAnyWhitespace() {
 		String whitespace = "This is\n\n\n    \t   a messagy string with whitespace\n";
-		assertThat(whitespace.contains("\n")).as("Has CR").isTrue();
-		assertThat(whitespace.contains("\t")).as("Has tab").isTrue();
-		assertThat(whitespace.contains(" ")).as("Has  sp").isTrue();
+		assertThat(whitespace).as("Has CR").contains("\n");
+		assertThat(whitespace).as("Has tab").contains("\t");
+		assertThat(whitespace).as("Has space").contains(" ");
+
 		String cleaned = StringUtils.deleteAny(whitespace, "\n\t ");
-		boolean condition2 = !cleaned.contains("\n");
-		assertThat(condition2).as("Has no CR").isTrue();
-		boolean condition1 = !cleaned.contains("\t");
-		assertThat(condition1).as("Has no tab").isTrue();
-		boolean condition = !cleaned.contains(" ");
-		assertThat(condition).as("Has no sp").isTrue();
-		assertThat(cleaned.length() > 10).as("Still has chars").isTrue();
+		assertThat(cleaned).as("Has no CR").doesNotContain("\n");
+		assertThat(cleaned).as("Has no tab").doesNotContain("\t");
+		assertThat(cleaned).as("Has no space").doesNotContain(" ");
+		assertThat(cleaned.length()).as("Still has chars").isGreaterThan(10);
 	}
 
-
 	@Test
 	void quote() {
 		assertThat(StringUtils.quote("myString")).isEqualTo("'myString'");