Skip to content

Commit aaf2163

Browse files
committed
Cleanup
1 parent a240666 commit aaf2163

1 file changed

Lines changed: 10 additions & 19 deletions

File tree

‎assertj-core/src/main/java/org/assertj/core/api/AbstractCharSequenceAssert.java‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
package org.assertj.core.api;
1414

15-
import static java.lang.Character.isWhitespace;
1615
import static org.assertj.core.api.Assertions.contentOf;
1716
import static org.assertj.core.error.ShouldBeASCII.shouldBeASCII;
1817
import static org.assertj.core.error.ShouldBeAlphabetic.shouldBeAlphabetic;
@@ -205,10 +204,6 @@ private void assertNotBlank(CharSequence actual) {
205204
if (isBlank(actual)) throw assertionError(shouldNotBeBlank(actual));
206205
}
207206

208-
private static boolean isBlank(CharSequence actual) {
209-
return isNullOrEmpty(actual) || strictlyContainsWhitespaces(actual);
210-
}
211-
212207
/**
213208
* Verifies that the actual {@code CharSequence} contains one or more whitespace characters (according to
214209
* {@link Character#isWhitespace(char)}).
@@ -334,10 +329,6 @@ private void assertDoesNotContainOnlyWhitespaces(CharSequence actual) {
334329
if (containsOnlyWhitespaces(actual)) throw assertionError(shouldNotContainOnlyWhitespaces(actual));
335330
}
336331

337-
private static boolean containsOnlyWhitespaces(CharSequence actual) {
338-
return !isNullOrEmpty(actual) && strictlyContainsWhitespaces(actual);
339-
}
340-
341332
/**
342333
* Verifies that the actual {@code CharSequence} is blank, i.e. consists of one or more whitespace characters
343334
* (according to {@link Character#isWhitespace(char)}).
@@ -365,7 +356,7 @@ public SELF isJavaBlank() {
365356
}
366357

367358
private void assertJavaBlank(CharSequence actual) {
368-
if (!isJavaBlank(actual)) throw assertionError(shouldBeBlank(actual));
359+
if (!containsOnlyWhitespaces(actual)) throw assertionError(shouldBeBlank(actual));
369360
}
370361

371362
/**
@@ -396,15 +387,7 @@ public SELF isNotJavaBlank() {
396387
}
397388

398389
private void assertNotJavaBlank(CharSequence actual) {
399-
if (isJavaBlank(actual)) throw assertionError(shouldNotBeBlank(actual));
400-
}
401-
402-
private static boolean isJavaBlank(CharSequence actual) {
403-
if (isNullOrEmpty(actual)) return false;
404-
for (int i = 0; i < actual.length(); i++) {
405-
if (!isWhitespace(actual.charAt(i))) return false;
406-
}
407-
return true;
390+
if (containsOnlyWhitespaces(actual)) throw assertionError(shouldNotBeBlank(actual));
408391
}
409392

410393
/**
@@ -2152,6 +2135,14 @@ public SELF isVisible() {
21522135
return myself;
21532136
}
21542137

2138+
private static boolean isBlank(CharSequence actual) {
2139+
return isNullOrEmpty(actual) || strictlyContainsWhitespaces(actual);
2140+
}
2141+
2142+
private static boolean containsOnlyWhitespaces(CharSequence actual) {
2143+
return !isNullOrEmpty(actual) && strictlyContainsWhitespaces(actual);
2144+
}
2145+
21552146
private static boolean isNullOrEmpty(CharSequence actual) {
21562147
return actual == null || actual.length() == 0;
21572148
}

0 commit comments

Comments
 (0)