You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2017/10/15 08:35:00 UTC
[text] use assertNull where possible
Repository: commons-text
Updated Branches:
refs/heads/master dabd0846d -> 17e5ee725
use assertNull where possible
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/17e5ee72
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/17e5ee72
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/17e5ee72
Branch: refs/heads/master
Commit: 17e5ee725a0e1478abf870ae9536fb69d085059b
Parents: dabd084
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Sun Oct 15 10:34:51 2017 +0200
Committer: Pascal Schumacher <pa...@gmx.net>
Committed: Sun Oct 15 10:34:51 2017 +0200
----------------------------------------------------------------------
.../commons/text/AlphabetConverterTest.java | 2 +-
.../org/apache/commons/text/CaseUtilsTest.java | 3 +-
.../org/apache/commons/text/StrBuilderTest.java | 10 ++---
.../org/apache/commons/text/StrLookupTest.java | 35 +++++++--------
.../apache/commons/text/StrSubstitutorTest.java | 18 ++++----
.../apache/commons/text/StrTokenizerTest.java | 34 +++++++--------
.../commons/text/StringEscapeUtilsTest.java | 12 ++---
.../org/apache/commons/text/WordUtilsTest.java | 46 ++++++++++----------
8 files changed, 81 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
index 4aefad7..bd55a9d 100644
--- a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
+++ b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
@@ -183,7 +183,7 @@ public class AlphabetConverterTest {
Assert.assertEquals(ac, reconstructedAlphabetConverter);
Assert.assertEquals(ac.hashCode(), reconstructedAlphabetConverter.hashCode());
Assert.assertEquals(ac.toString(), reconstructedAlphabetConverter.toString());
- Assert.assertEquals(null, ac.encode(null)); // test null conversions
+ Assert.assertNull(ac.encode(null)); // test null conversions
Assert.assertEquals("", ac.encode("")); // test empty conversion
// test all the trial strings
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/CaseUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/CaseUtilsTest.java b/src/test/java/org/apache/commons/text/CaseUtilsTest.java
index e95f44c..e012eb1 100644
--- a/src/test/java/org/apache/commons/text/CaseUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/CaseUtilsTest.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Modifier;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -45,7 +46,7 @@ public class CaseUtilsTest {
//------------------------------------------------------------------------
@Test
public void testToCamelCase() throws Exception {
- assertEquals(null, CaseUtils.toCamelCase(null, false,null));
+ assertNull(CaseUtils.toCamelCase(null, false,null));
assertEquals("", CaseUtils.toCamelCase("", true, null));
assertEquals(" ", CaseUtils.toCamelCase(" ", false, null));
assertEquals("aBC@def", CaseUtils.toCamelCase("a b c @def", false, null));
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/StrBuilderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/StrBuilderTest.java b/src/test/java/org/apache/commons/text/StrBuilderTest.java
index e8970a8..6118dcf 100644
--- a/src/test/java/org/apache/commons/text/StrBuilderTest.java
+++ b/src/test/java/org/apache/commons/text/StrBuilderTest.java
@@ -176,7 +176,7 @@ public class StrBuilderTest {
@Test
public void testGetSetNewLineText() {
final StrBuilder sb = new StrBuilder();
- assertEquals(null, sb.getNewLineText());
+ assertNull(sb.getNewLineText());
sb.setNewLineText("#");
assertEquals("#", sb.getNewLineText());
@@ -185,26 +185,26 @@ public class StrBuilderTest {
assertEquals("", sb.getNewLineText());
sb.setNewLineText((String) null);
- assertEquals(null, sb.getNewLineText());
+ assertNull(sb.getNewLineText());
}
//-----------------------------------------------------------------------
@Test
public void testGetSetNullText() {
final StrBuilder sb = new StrBuilder();
- assertEquals(null, sb.getNullText());
+ assertNull(sb.getNullText());
sb.setNullText("null");
assertEquals("null", sb.getNullText());
sb.setNullText("");
- assertEquals(null, sb.getNullText());
+ assertNull(sb.getNullText());
sb.setNullText("NULL");
assertEquals("NULL", sb.getNullText());
sb.setNullText((String) null);
- assertEquals(null, sb.getNullText());
+ assertNull(sb.getNullText());
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/StrLookupTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/StrLookupTest.java b/src/test/java/org/apache/commons/text/StrLookupTest.java
index 4ac1e88..f9be403 100644
--- a/src/test/java/org/apache/commons/text/StrLookupTest.java
+++ b/src/test/java/org/apache/commons/text/StrLookupTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.text;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.util.HashMap;
@@ -34,16 +35,16 @@ public class StrLookupTest {
//-----------------------------------------------------------------------
@Test
public void testNoneLookup() {
- assertEquals(null, StrLookup.noneLookup().lookup(null));
- assertEquals(null, StrLookup.noneLookup().lookup(""));
- assertEquals(null, StrLookup.noneLookup().lookup("any"));
+ assertNull(StrLookup.noneLookup().lookup(null));
+ assertNull(StrLookup.noneLookup().lookup(""));
+ assertNull(StrLookup.noneLookup().lookup("any"));
}
@Test
public void testSystemProperiesLookup() {
assertEquals(System.getProperty("os.name"), StrLookup.systemPropertiesLookup().lookup("os.name"));
- assertEquals(null, StrLookup.systemPropertiesLookup().lookup(""));
- assertEquals(null, StrLookup.systemPropertiesLookup().lookup("other"));
+ assertNull(StrLookup.systemPropertiesLookup().lookup(""));
+ assertNull(StrLookup.systemPropertiesLookup().lookup("other"));
try {
StrLookup.systemPropertiesLookup().lookup(null);
fail();
@@ -100,9 +101,9 @@ public class StrLookupTest {
map.put("number", Integer.valueOf(2));
assertEquals("value", StrLookup.mapLookup(map).lookup("key"));
assertEquals("2", StrLookup.mapLookup(map).lookup("number"));
- assertEquals(null, StrLookup.mapLookup(map).lookup(null));
- assertEquals(null, StrLookup.mapLookup(map).lookup(""));
- assertEquals(null, StrLookup.mapLookup(map).lookup("other"));
+ assertNull(StrLookup.mapLookup(map).lookup(null));
+ assertNull(StrLookup.mapLookup(map).lookup(""));
+ assertNull(StrLookup.mapLookup(map).lookup("other"));
}
@Test
@@ -110,25 +111,25 @@ public class StrLookupTest {
final ResourceBundle map = ResourceBundle.getBundle("testResourceBundleLookup");
assertEquals("value", StrLookup.resourceBundleLookup(map).lookup("key"));
assertEquals("2", StrLookup.resourceBundleLookup(map).lookup("number"));
- assertEquals(null, StrLookup.resourceBundleLookup(map).lookup(null));
- assertEquals(null, StrLookup.resourceBundleLookup(map).lookup(""));
- assertEquals(null, StrLookup.resourceBundleLookup(map).lookup("other"));
+ assertNull(StrLookup.resourceBundleLookup(map).lookup(null));
+ assertNull(StrLookup.resourceBundleLookup(map).lookup(""));
+ assertNull(StrLookup.resourceBundleLookup(map).lookup("other"));
}
@Test
public void testResourceBundleLookup_nullMap() {
final ResourceBundle resourceBundle = null;
- assertEquals(null, StrLookup.resourceBundleLookup(resourceBundle).lookup(null));
- assertEquals(null, StrLookup.resourceBundleLookup(resourceBundle).lookup(""));
- assertEquals(null, StrLookup.resourceBundleLookup(resourceBundle).lookup("any"));
+ assertNull(StrLookup.resourceBundleLookup(resourceBundle).lookup(null));
+ assertNull(StrLookup.resourceBundleLookup(resourceBundle).lookup(""));
+ assertNull(StrLookup.resourceBundleLookup(resourceBundle).lookup("any"));
}
@Test
public void testMapLookup_nullMap() {
final Map<String, ?> map = null;
- assertEquals(null, StrLookup.mapLookup(map).lookup(null));
- assertEquals(null, StrLookup.mapLookup(map).lookup(""));
- assertEquals(null, StrLookup.mapLookup(map).lookup("any"));
+ assertNull(StrLookup.mapLookup(map).lookup(null));
+ assertNull(StrLookup.mapLookup(map).lookup(""));
+ assertNull(StrLookup.mapLookup(map).lookup("any"));
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
index 33063ae..5f8b330 100644
--- a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
+++ b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
@@ -735,15 +735,15 @@ public class StrSubstitutorTest {
final StrSubstitutor sub = new StrSubstitutor(values);
if (replaceTemplate == null) {
- assertEquals(null, sub.replace((String) null));
- assertEquals(null, sub.replace((String) null, 0, 100));
- assertEquals(null, sub.replace((char[]) null));
- assertEquals(null, sub.replace((char[]) null, 0, 100));
- assertEquals(null, sub.replace((StringBuffer) null));
- assertEquals(null, sub.replace((StringBuffer) null, 0, 100));
- assertEquals(null, sub.replace((StrBuilder) null));
- assertEquals(null, sub.replace((StrBuilder) null, 0, 100));
- assertEquals(null, sub.replace((Object) null));
+ assertNull(sub.replace((String) null));
+ assertNull(sub.replace((String) null, 0, 100));
+ assertNull(sub.replace((char[]) null));
+ assertNull(sub.replace((char[]) null, 0, 100));
+ assertNull(sub.replace((StringBuffer) null));
+ assertNull(sub.replace((StringBuffer) null, 0, 100));
+ assertNull(sub.replace((StrBuilder) null));
+ assertNull(sub.replace((StrBuilder) null, 0, 100));
+ assertNull(sub.replace((Object) null));
assertFalse(sub.replaceIn((StringBuffer) null));
assertFalse(sub.replaceIn((StringBuffer) null, 0, 100));
assertFalse(sub.replaceIn((StrBuilder) null));
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/StrTokenizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/StrTokenizerTest.java b/src/test/java/org/apache/commons/text/StrTokenizerTest.java
index e75603c..44d2524 100644
--- a/src/test/java/org/apache/commons/text/StrTokenizerTest.java
+++ b/src/test/java/org/apache/commons/text/StrTokenizerTest.java
@@ -348,7 +348,7 @@ public class StrTokenizerTest {
tok.setIgnoreEmptyTokens(false);
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
assertFalse(tok.hasNext());
@@ -372,7 +372,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -443,7 +443,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -456,7 +456,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -469,7 +469,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -483,7 +483,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("bc", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -497,7 +497,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("bc", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -524,7 +524,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("bIGNOREcd", tok.next());
- assertEquals(null, tok.next());
+ assertNull(tok.next());
assertFalse(tok.hasNext());
}
@@ -568,7 +568,7 @@ public class StrTokenizerTest {
this.checkClone(tokenizer);
assertFalse(tokenizer.hasNext());
assertFalse(tokenizer.hasPrevious());
- assertEquals(null, tokenizer.nextToken());
+ assertNull(tokenizer.nextToken());
assertEquals(0, tokenizer.size());
try {
tokenizer.next();
@@ -586,7 +586,7 @@ public class StrTokenizerTest {
assertEquals(input, tok.getContent());
tok = new StrTokenizer();
- assertEquals(null, tok.getContent());
+ assertNull(tok.getContent());
}
//-----------------------------------------------------------------------
@@ -627,14 +627,14 @@ public class StrTokenizerTest {
public void testCloneNull() {
final StrTokenizer tokenizer = new StrTokenizer((char[]) null);
// Start sanity check
- assertEquals(null, tokenizer.nextToken());
+ assertNull(tokenizer.nextToken());
tokenizer.reset();
- assertEquals(null, tokenizer.nextToken());
+ assertNull(tokenizer.nextToken());
// End sanity check
final StrTokenizer clonedTokenizer = (StrTokenizer) tokenizer.clone();
tokenizer.reset();
- assertEquals(null, tokenizer.nextToken());
- assertEquals(null, clonedTokenizer.nextToken());
+ assertNull(tokenizer.nextToken());
+ assertNull(clonedTokenizer.nextToken());
}
@Test
@@ -809,14 +809,14 @@ public class StrTokenizerTest {
this.checkClone(tokenizer);
assertEquals(-1, tokenizer.previousIndex());
assertEquals(0, tokenizer.nextIndex());
- assertEquals(null, tokenizer.previousToken());
+ assertNull(tokenizer.previousToken());
assertEquals("A", tokenizer.nextToken());
assertEquals(1, tokenizer.nextIndex());
assertEquals("b", tokenizer.nextToken());
assertEquals(2, tokenizer.nextIndex());
assertEquals("c", tokenizer.nextToken());
assertEquals(3, tokenizer.nextIndex());
- assertEquals(null, tokenizer.nextToken());
+ assertNull(tokenizer.nextToken());
assertEquals(3, tokenizer.nextIndex());
assertEquals("c", tokenizer.previousToken());
assertEquals(2, tokenizer.nextIndex());
@@ -824,7 +824,7 @@ public class StrTokenizerTest {
assertEquals(1, tokenizer.nextIndex());
assertEquals("A", tokenizer.previousToken());
assertEquals(0, tokenizer.nextIndex());
- assertEquals(null, tokenizer.previousToken());
+ assertNull(tokenizer.previousToken());
assertEquals(0, tokenizer.nextIndex());
assertEquals(-1, tokenizer.previousIndex());
assertEquals(3, tokenizer.size());
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index 08b2eea..7236b03 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -60,7 +60,7 @@ public class StringEscapeUtilsTest {
@Test
public void testEscapeJava() throws IOException {
- assertEquals(null, StringEscapeUtils.escapeJava(null));
+ assertNull(StringEscapeUtils.escapeJava(null));
try {
StringEscapeUtils.ESCAPE_JAVA.translate(null, null);
fail();
@@ -129,7 +129,7 @@ public class StringEscapeUtilsTest {
@Test
public void testUnescapeJava() throws IOException {
- assertEquals(null, StringEscapeUtils.unescapeJava(null));
+ assertNull(StringEscapeUtils.unescapeJava(null));
try {
StringEscapeUtils.UNESCAPE_JAVA.translate(null, null);
fail();
@@ -185,7 +185,7 @@ public class StringEscapeUtilsTest {
@Test
public void testEscapeEcmaScript() {
- assertEquals(null, StringEscapeUtils.escapeEcmaScript(null));
+ assertNull(StringEscapeUtils.escapeEcmaScript(null));
try {
StringEscapeUtils.ESCAPE_ECMASCRIPT.translate(null, null);
fail();
@@ -413,7 +413,7 @@ public class StringEscapeUtilsTest {
assertEquals("\"foo\"\"bar\"", StringEscapeUtils.escapeCsv("foo\"bar"));
assertEquals("foo\uD84C\uDFB4bar", StringEscapeUtils.escapeCsv("foo\uD84C\uDFB4bar"));
assertEquals("", StringEscapeUtils.escapeCsv(""));
- assertEquals(null, StringEscapeUtils.escapeCsv(null));
+ assertNull(StringEscapeUtils.escapeCsv(null));
}
@Test
@@ -447,7 +447,7 @@ public class StringEscapeUtilsTest {
assertEquals("foo\"bar", StringEscapeUtils.unescapeCsv("\"foo\"\"bar\""));
assertEquals("foo\uD84C\uDFB4bar", StringEscapeUtils.unescapeCsv("foo\uD84C\uDFB4bar"));
assertEquals("", StringEscapeUtils.unescapeCsv(""));
- assertEquals(null, StringEscapeUtils.unescapeCsv(null));
+ assertNull(StringEscapeUtils.unescapeCsv(null));
assertEquals("\"foo.bar\"", StringEscapeUtils.unescapeCsv("\"foo.bar\""));
}
@@ -546,7 +546,7 @@ public class StringEscapeUtilsTest {
@Test
public void testEscapeJson() {
- assertEquals(null, StringEscapeUtils.escapeJson(null));
+ assertNull(StringEscapeUtils.escapeJson(null));
try {
StringEscapeUtils.ESCAPE_JSON.translate(null, null);
fail();
http://git-wip-us.apache.org/repos/asf/commons-text/blob/17e5ee72/src/test/java/org/apache/commons/text/WordUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/WordUtilsTest.java b/src/test/java/org/apache/commons/text/WordUtilsTest.java
index 7a9cb59..955d094 100644
--- a/src/test/java/org/apache/commons/text/WordUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/WordUtilsTest.java
@@ -43,8 +43,8 @@ public class WordUtilsTest {
//-----------------------------------------------------------------------
@Test
public void testWrap_StringInt() {
- assertEquals(null, WordUtils.wrap(null, 20));
- assertEquals(null, WordUtils.wrap(null, -1));
+ assertNull(WordUtils.wrap(null, 20));
+ assertNull(WordUtils.wrap(null, -1));
assertEquals("", WordUtils.wrap("", 20));
assertEquals("", WordUtils.wrap("", -1));
@@ -77,12 +77,12 @@ public class WordUtilsTest {
@Test
public void testWrap_StringIntStringBoolean() {
- assertEquals(null, WordUtils.wrap(null, 20, "\n", false));
- assertEquals(null, WordUtils.wrap(null, 20, "\n", true));
- assertEquals(null, WordUtils.wrap(null, 20, null, true));
- assertEquals(null, WordUtils.wrap(null, 20, null, false));
- assertEquals(null, WordUtils.wrap(null, -1, null, true));
- assertEquals(null, WordUtils.wrap(null, -1, null, false));
+ assertNull(WordUtils.wrap(null, 20, "\n", false));
+ assertNull(WordUtils.wrap(null, 20, "\n", true));
+ assertNull(WordUtils.wrap(null, 20, null, true));
+ assertNull(WordUtils.wrap(null, 20, null, false));
+ assertNull(WordUtils.wrap(null, -1, null, true));
+ assertNull(WordUtils.wrap(null, -1, null, false));
assertEquals("", WordUtils.wrap("", 20, "\n", false));
assertEquals("", WordUtils.wrap("", 20, "\n", true));
@@ -181,7 +181,7 @@ public class WordUtilsTest {
//-----------------------------------------------------------------------
@Test
public void testCapitalize_String() {
- assertEquals(null, WordUtils.capitalize(null));
+ assertNull(WordUtils.capitalize(null));
assertEquals("", WordUtils.capitalize(""));
assertEquals(" ", WordUtils.capitalize(" "));
@@ -195,7 +195,7 @@ public class WordUtilsTest {
@Test
public void testCapitalizeWithDelimiters_String() {
- assertEquals(null, WordUtils.capitalize(null, null));
+ assertNull(WordUtils.capitalize(null, null));
assertEquals("", WordUtils.capitalize("", new char[0]));
assertEquals(" ", WordUtils.capitalize(" ", new char[0]));
@@ -213,7 +213,7 @@ public class WordUtilsTest {
@Test
public void testCapitalizeFully_String() {
- assertEquals(null, WordUtils.capitalizeFully(null));
+ assertNull(WordUtils.capitalizeFully(null));
assertEquals("", WordUtils.capitalizeFully(""));
assertEquals(" ", WordUtils.capitalizeFully(" "));
@@ -238,7 +238,7 @@ public class WordUtilsTest {
@Test
public void testCapitalizeFullyWithDelimiters_String() {
- assertEquals(null, WordUtils.capitalizeFully(null, null));
+ assertNull(WordUtils.capitalizeFully(null, null));
assertEquals("", WordUtils.capitalizeFully("", new char[0]));
assertEquals(" ", WordUtils.capitalizeFully(" ", new char[0]));
@@ -278,7 +278,7 @@ public class WordUtilsTest {
@Test
public void testUncapitalize_String() {
- assertEquals(null, WordUtils.uncapitalize(null));
+ assertNull(WordUtils.uncapitalize(null));
assertEquals("", WordUtils.uncapitalize(""));
assertEquals(" ", WordUtils.uncapitalize(" "));
@@ -292,7 +292,7 @@ public class WordUtilsTest {
@Test
public void testUncapitalizeWithDelimiters_String() {
- assertEquals(null, WordUtils.uncapitalize(null, null));
+ assertNull(WordUtils.uncapitalize(null, null));
assertEquals("", WordUtils.uncapitalize("", new char[0]));
assertEquals(" ", WordUtils.uncapitalize(" ", new char[0]));
@@ -311,7 +311,7 @@ public class WordUtilsTest {
//-----------------------------------------------------------------------
@Test
public void testInitials_String() {
- assertEquals(null, WordUtils.initials(null));
+ assertNull(WordUtils.initials(null));
assertEquals("", WordUtils.initials(""));
assertEquals("", WordUtils.initials(" "));
@@ -328,7 +328,7 @@ public class WordUtilsTest {
@Test
public void testInitials_String_charArray() {
char[] array = null;
- assertEquals(null, WordUtils.initials(null, array));
+ assertNull(WordUtils.initials(null, array));
assertEquals("", WordUtils.initials("", array));
assertEquals("", WordUtils.initials(" ", array));
assertEquals("I", WordUtils.initials("I", array));
@@ -342,7 +342,7 @@ public class WordUtilsTest {
assertEquals("iah1", WordUtils.initials("i am here 123", array));
array = new char[0];
- assertEquals(null, WordUtils.initials(null, array));
+ assertNull(WordUtils.initials(null, array));
assertEquals("", WordUtils.initials("", array));
assertEquals("", WordUtils.initials(" ", array));
assertEquals("", WordUtils.initials("I", array));
@@ -356,7 +356,7 @@ public class WordUtilsTest {
assertEquals("", WordUtils.initials("i am here 123", array));
array = " ".toCharArray();
- assertEquals(null, WordUtils.initials(null, array));
+ assertNull(WordUtils.initials(null, array));
assertEquals("", WordUtils.initials("", array));
assertEquals("", WordUtils.initials(" ", array));
assertEquals("I", WordUtils.initials("I", array));
@@ -370,7 +370,7 @@ public class WordUtilsTest {
assertEquals("iah1", WordUtils.initials("i am here 123", array));
array = " .".toCharArray();
- assertEquals(null, WordUtils.initials(null, array));
+ assertNull(WordUtils.initials(null, array));
assertEquals("", WordUtils.initials("", array));
assertEquals("", WordUtils.initials(" ", array));
assertEquals("I", WordUtils.initials("I", array));
@@ -383,7 +383,7 @@ public class WordUtilsTest {
assertEquals("iah1", WordUtils.initials("i am here 123", array));
array = " .'".toCharArray();
- assertEquals(null, WordUtils.initials(null, array));
+ assertNull(WordUtils.initials(null, array));
assertEquals("", WordUtils.initials("", array));
assertEquals("", WordUtils.initials(" ", array));
assertEquals("I", WordUtils.initials("I", array));
@@ -396,7 +396,7 @@ public class WordUtilsTest {
assertEquals("iah1", WordUtils.initials("i am here 123", array));
array = "SIJo1".toCharArray();
- assertEquals(null, WordUtils.initials(null, array));
+ assertNull(WordUtils.initials(null, array));
assertEquals("", WordUtils.initials("", array));
assertEquals(" ", WordUtils.initials(" ", array));
assertEquals("", WordUtils.initials("I", array));
@@ -429,7 +429,7 @@ public class WordUtilsTest {
// -----------------------------------------------------------------------
@Test
public void testSwapCase_String() {
- assertEquals(null, WordUtils.swapCase(null));
+ assertNull(WordUtils.swapCase(null));
assertEquals("", WordUtils.swapCase(""));
assertEquals(" ", WordUtils.swapCase(" "));
@@ -448,7 +448,7 @@ public class WordUtilsTest {
// -----------------------------------------------------------------------
@Test
public void testAbbreviateForNullAndEmptyString() {
- assertEquals(null, (WordUtils.abbreviate(null, 1,-1,"")));
+ assertNull((WordUtils.abbreviate(null, 1,-1,"")));
assertEquals(StringUtils.EMPTY, WordUtils.abbreviate("", 1,-1,""));
assertEquals("", WordUtils.abbreviate("0123456790", 0,0,""));
assertEquals("", WordUtils.abbreviate(" 0123456790", 0,-1,""));