You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/09/19 03:29:23 UTC
svn commit: r1387424 [2/2] - in
/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3: ./
exception/ math/ mutable/ text/ time/
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java Wed Sep 19 01:29:22 2012
@@ -74,16 +74,16 @@ public class MutableLongTest {
final MutableLong mutNumB = new MutableLong(0);
final MutableLong mutNumC = new MutableLong(1);
- assertEquals(true, mutNumA.equals(mutNumA));
- assertEquals(true, mutNumA.equals(mutNumB));
- assertEquals(true, mutNumB.equals(mutNumA));
- assertEquals(true, mutNumB.equals(mutNumB));
- assertEquals(false, mutNumA.equals(mutNumC));
- assertEquals(false, mutNumB.equals(mutNumC));
- assertEquals(true, mutNumC.equals(mutNumC));
- assertEquals(false, mutNumA.equals(null));
- assertEquals(false, mutNumA.equals(Long.valueOf(0)));
- assertEquals(false, mutNumA.equals("0"));
+ assertTrue(mutNumA.equals(mutNumA));
+ assertTrue(mutNumA.equals(mutNumB));
+ assertTrue(mutNumB.equals(mutNumA));
+ assertTrue(mutNumB.equals(mutNumB));
+ assertFalse(mutNumA.equals(mutNumC));
+ assertFalse(mutNumB.equals(mutNumC));
+ assertTrue(mutNumC.equals(mutNumC));
+ assertFalse(mutNumA.equals(null));
+ assertFalse(mutNumA.equals(Long.valueOf(0)));
+ assertFalse(mutNumA.equals("0"));
}
@Test
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java Wed Sep 19 01:29:22 2012
@@ -57,19 +57,19 @@ public class MutableObjectTest {
final MutableObject<String> mutNumC = new MutableObject<String>("BETA");
final MutableObject<String> mutNumD = new MutableObject<String>(null);
- assertEquals(true, mutNumA.equals(mutNumA));
- assertEquals(true, mutNumA.equals(mutNumB));
- assertEquals(true, mutNumB.equals(mutNumA));
- assertEquals(true, mutNumB.equals(mutNumB));
- assertEquals(false, mutNumA.equals(mutNumC));
- assertEquals(false, mutNumB.equals(mutNumC));
- assertEquals(true, mutNumC.equals(mutNumC));
- assertEquals(false, mutNumA.equals(mutNumD));
- assertEquals(true, mutNumD.equals(mutNumD));
+ assertTrue(mutNumA.equals(mutNumA));
+ assertTrue(mutNumA.equals(mutNumB));
+ assertTrue(mutNumB.equals(mutNumA));
+ assertTrue(mutNumB.equals(mutNumB));
+ assertFalse(mutNumA.equals(mutNumC));
+ assertFalse(mutNumB.equals(mutNumC));
+ assertTrue(mutNumC.equals(mutNumC));
+ assertFalse(mutNumA.equals(mutNumD));
+ assertTrue(mutNumD.equals(mutNumD));
- assertEquals(false, mutNumA.equals(null));
- assertEquals(false, mutNumA.equals(new Object()));
- assertEquals(false, mutNumA.equals("0"));
+ assertFalse(mutNumA.equals(null));
+ assertFalse(mutNumA.equals(new Object()));
+ assertFalse(mutNumA.equals("0"));
}
@Test
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java Wed Sep 19 01:29:22 2012
@@ -74,16 +74,16 @@ public class MutableShortTest {
final MutableShort mutNumB = new MutableShort((short) 0);
final MutableShort mutNumC = new MutableShort((short) 1);
- assertEquals(true, mutNumA.equals(mutNumA));
- assertEquals(true, mutNumA.equals(mutNumB));
- assertEquals(true, mutNumB.equals(mutNumA));
- assertEquals(true, mutNumB.equals(mutNumB));
- assertEquals(false, mutNumA.equals(mutNumC));
- assertEquals(false, mutNumB.equals(mutNumC));
- assertEquals(true, mutNumC.equals(mutNumC));
- assertEquals(false, mutNumA.equals(null));
- assertEquals(false, mutNumA.equals(Short.valueOf((short) 0)));
- assertEquals(false, mutNumA.equals("0"));
+ assertTrue(mutNumA.equals(mutNumA));
+ assertTrue(mutNumA.equals(mutNumB));
+ assertTrue(mutNumB.equals(mutNumA));
+ assertTrue(mutNumB.equals(mutNumB));
+ assertFalse(mutNumA.equals(mutNumC));
+ assertFalse(mutNumB.equals(mutNumC));
+ assertTrue(mutNumC.equals(mutNumC));
+ assertFalse(mutNumA.equals(null));
+ assertFalse(mutNumA.equals(Short.valueOf((short) 0)));
+ assertFalse(mutNumA.equals("0"));
}
@Test
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java Wed Sep 19 01:29:22 2012
@@ -254,14 +254,14 @@ public class StrBuilderTest {
public void testEnsureCapacity() {
StrBuilder sb = new StrBuilder();
sb.ensureCapacity(2);
- assertEquals(true, sb.capacity() >= 2);
+ assertTrue(sb.capacity() >= 2);
sb.ensureCapacity(-1);
- assertEquals(true, sb.capacity() >= 0);
+ assertTrue(sb.capacity() >= 0);
sb.append("HelloWorld");
sb.ensureCapacity(40);
- assertEquals(true, sb.capacity() >= 40);
+ assertTrue(sb.capacity() >= 40);
}
@Test
@@ -288,13 +288,13 @@ public class StrBuilderTest {
@Test
public void testIsEmpty() {
StrBuilder sb = new StrBuilder();
- assertEquals(true, sb.isEmpty());
+ assertTrue(sb.isEmpty());
sb.append("Hello");
- assertEquals(false, sb.isEmpty());
+ assertFalse(sb.isEmpty());
sb.clear();
- assertEquals(true, sb.isEmpty());
+ assertTrue(sb.isEmpty());
}
@Test
@@ -303,7 +303,7 @@ public class StrBuilderTest {
sb.append("Hello");
sb.clear();
assertEquals(0, sb.length());
- assertEquals(true, sb.buffer.length >= 5);
+ assertTrue(sb.buffer.length >= 5);
}
//-----------------------------------------------------------------------
@@ -1217,35 +1217,35 @@ public class StrBuilderTest {
@Test
public void testContains_char() {
StrBuilder sb = new StrBuilder("abcdefghijklmnopqrstuvwxyz");
- assertEquals(true, sb.contains('a'));
- assertEquals(true, sb.contains('o'));
- assertEquals(true, sb.contains('z'));
- assertEquals(false, sb.contains('1'));
+ assertTrue(sb.contains('a'));
+ assertTrue(sb.contains('o'));
+ assertTrue(sb.contains('z'));
+ assertFalse(sb.contains('1'));
}
@Test
public void testContains_String() {
StrBuilder sb = new StrBuilder("abcdefghijklmnopqrstuvwxyz");
- assertEquals(true, sb.contains("a"));
- assertEquals(true, sb.contains("pq"));
- assertEquals(true, sb.contains("z"));
- assertEquals(false, sb.contains("zyx"));
- assertEquals(false, sb.contains((String) null));
+ assertTrue(sb.contains("a"));
+ assertTrue(sb.contains("pq"));
+ assertTrue(sb.contains("z"));
+ assertFalse(sb.contains("zyx"));
+ assertFalse(sb.contains((String) null));
}
@Test
public void testContains_StrMatcher() {
StrBuilder sb = new StrBuilder("abcdefghijklmnopqrstuvwxyz");
- assertEquals(true, sb.contains(StrMatcher.charMatcher('a')));
- assertEquals(true, sb.contains(StrMatcher.stringMatcher("pq")));
- assertEquals(true, sb.contains(StrMatcher.charMatcher('z')));
- assertEquals(false, sb.contains(StrMatcher.stringMatcher("zy")));
- assertEquals(false, sb.contains((StrMatcher) null));
+ assertTrue(sb.contains(StrMatcher.charMatcher('a')));
+ assertTrue(sb.contains(StrMatcher.stringMatcher("pq")));
+ assertTrue(sb.contains(StrMatcher.charMatcher('z')));
+ assertFalse(sb.contains(StrMatcher.stringMatcher("zy")));
+ assertFalse(sb.contains((StrMatcher) null));
sb = new StrBuilder();
- assertEquals(false, sb.contains(A_NUMBER_MATCHER));
+ assertFalse(sb.contains(A_NUMBER_MATCHER));
sb.append("B A1 C");
- assertEquals(true, sb.contains(A_NUMBER_MATCHER));
+ assertTrue(sb.contains(A_NUMBER_MATCHER));
}
// -----------------------------------------------------------------------
@@ -1615,17 +1615,17 @@ public class StrBuilderTest {
public void testAsReader() throws Exception {
StrBuilder sb = new StrBuilder("some text");
Reader reader = sb.asReader();
- assertEquals(true, reader.ready());
+ assertTrue(reader.ready());
char[] buf = new char[40];
assertEquals(9, reader.read(buf));
assertEquals("some text", new String(buf, 0, 9));
assertEquals(-1, reader.read());
- assertEquals(false, reader.ready());
+ assertFalse(reader.ready());
assertEquals(0, reader.skip(2));
assertEquals(0, reader.skip(-1));
- assertEquals(true, reader.markSupported());
+ assertTrue(reader.markSupported());
reader = sb.asReader();
assertEquals('s', reader.read());
reader.mark(-1);
@@ -1642,9 +1642,9 @@ public class StrBuilderTest {
assertEquals(2, reader.skip(2));
assertEquals(' ', reader.read());
- assertEquals(true, reader.ready());
+ assertTrue(reader.ready());
reader.close();
- assertEquals(true, reader.ready());
+ assertTrue(reader.ready());
reader = sb.asReader();
array = new char[3];
@@ -1722,23 +1722,23 @@ public class StrBuilderTest {
public void testEqualsIgnoreCase() {
StrBuilder sb1 = new StrBuilder();
StrBuilder sb2 = new StrBuilder();
- assertEquals(true, sb1.equalsIgnoreCase(sb1));
- assertEquals(true, sb1.equalsIgnoreCase(sb2));
- assertEquals(true, sb2.equalsIgnoreCase(sb2));
+ assertTrue(sb1.equalsIgnoreCase(sb1));
+ assertTrue(sb1.equalsIgnoreCase(sb2));
+ assertTrue(sb2.equalsIgnoreCase(sb2));
sb1.append("abc");
- assertEquals(false, sb1.equalsIgnoreCase(sb2));
+ assertFalse(sb1.equalsIgnoreCase(sb2));
sb2.append("ABC");
- assertEquals(true, sb1.equalsIgnoreCase(sb2));
+ assertTrue(sb1.equalsIgnoreCase(sb2));
sb2.clear().append("abc");
- assertEquals(true, sb1.equalsIgnoreCase(sb2));
- assertEquals(true, sb1.equalsIgnoreCase(sb1));
- assertEquals(true, sb2.equalsIgnoreCase(sb2));
+ assertTrue(sb1.equalsIgnoreCase(sb2));
+ assertTrue(sb1.equalsIgnoreCase(sb1));
+ assertTrue(sb2.equalsIgnoreCase(sb2));
sb2.clear().append("aBc");
- assertEquals(true, sb1.equalsIgnoreCase(sb2));
+ assertTrue(sb1.equalsIgnoreCase(sb2));
}
//-----------------------------------------------------------------------
@@ -1746,25 +1746,25 @@ public class StrBuilderTest {
public void testEquals() {
StrBuilder sb1 = new StrBuilder();
StrBuilder sb2 = new StrBuilder();
- assertEquals(true, sb1.equals(sb2));
- assertEquals(true, sb1.equals(sb1));
- assertEquals(true, sb2.equals(sb2));
- assertEquals(true, sb1.equals((Object) sb2));
+ assertTrue(sb1.equals(sb2));
+ assertTrue(sb1.equals(sb1));
+ assertTrue(sb2.equals(sb2));
+ assertTrue(sb1.equals((Object) sb2));
sb1.append("abc");
- assertEquals(false, sb1.equals(sb2));
- assertEquals(false, sb1.equals((Object) sb2));
+ assertFalse(sb1.equals(sb2));
+ assertFalse(sb1.equals((Object) sb2));
sb2.append("ABC");
- assertEquals(false, sb1.equals(sb2));
- assertEquals(false, sb1.equals((Object) sb2));
+ assertFalse(sb1.equals(sb2));
+ assertFalse(sb1.equals((Object) sb2));
sb2.clear().append("abc");
- assertEquals(true, sb1.equals(sb2));
- assertEquals(true, sb1.equals((Object) sb2));
+ assertTrue(sb1.equals(sb2));
+ assertTrue(sb1.equals((Object) sb2));
- assertEquals(false, sb1.equals(Integer.valueOf(1)));
- assertEquals(false, sb1.equals("abc"));
+ assertFalse(sb1.equals(Integer.valueOf(1)));
+ assertFalse(sb1.equals("abc"));
}
//-----------------------------------------------------------------------
@@ -1779,7 +1779,7 @@ public class StrBuilderTest {
sb.append("abc");
int hc2a = sb.hashCode();
int hc2b = sb.hashCode();
- assertEquals(true, hc2a != 0);
+ assertTrue(hc2a != 0);
assertEquals(hc2a, hc2b);
}
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java Wed Sep 19 01:29:22 2012
@@ -403,19 +403,19 @@ public class StrSubstitutorTest {
@Test
public void testGetSetPrefix() {
StrSubstitutor sub = new StrSubstitutor();
- assertEquals(true, sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
+ assertTrue(sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
sub.setVariablePrefix('<');
- assertEquals(true, sub.getVariablePrefixMatcher() instanceof StrMatcher.CharMatcher);
+ assertTrue(sub.getVariablePrefixMatcher() instanceof StrMatcher.CharMatcher);
sub.setVariablePrefix("<<");
- assertEquals(true, sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
+ assertTrue(sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
try {
sub.setVariablePrefix((String) null);
fail();
} catch (IllegalArgumentException ex) {
// expected
}
- assertEquals(true, sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
+ assertTrue(sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
StrMatcher matcher = StrMatcher.commaMatcher();
sub.setVariablePrefixMatcher(matcher);
@@ -435,19 +435,19 @@ public class StrSubstitutorTest {
@Test
public void testGetSetSuffix() {
StrSubstitutor sub = new StrSubstitutor();
- assertEquals(true, sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
+ assertTrue(sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
sub.setVariableSuffix('<');
- assertEquals(true, sub.getVariableSuffixMatcher() instanceof StrMatcher.CharMatcher);
+ assertTrue(sub.getVariableSuffixMatcher() instanceof StrMatcher.CharMatcher);
sub.setVariableSuffix("<<");
- assertEquals(true, sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
+ assertTrue(sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
try {
sub.setVariableSuffix((String) null);
fail();
} catch (IllegalArgumentException ex) {
// expected
}
- assertEquals(true, sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
+ assertTrue(sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
StrMatcher matcher = StrMatcher.commaMatcher();
sub.setVariableSuffixMatcher(matcher);
@@ -560,21 +560,21 @@ public class StrSubstitutorTest {
// replace in StringBuffer
buf = new StringBuffer(replaceTemplate);
- assertEquals(true, sub.replaceIn(buf));
+ assertTrue(sub.replaceIn(buf));
assertEquals(expectedResult, buf.toString());
if (substring) {
buf = new StringBuffer(replaceTemplate);
- assertEquals(true, sub.replaceIn(buf, 1, buf.length() - 2));
+ assertTrue(sub.replaceIn(buf, 1, buf.length() - 2));
assertEquals(expectedResult, buf.toString()); // expect full result as remainder is untouched
}
// replace in StrBuilder
bld = new StrBuilder(replaceTemplate);
- assertEquals(true, sub.replaceIn(bld));
+ assertTrue(sub.replaceIn(bld));
assertEquals(expectedResult, bld.toString());
if (substring) {
bld = new StrBuilder(replaceTemplate);
- assertEquals(true, sub.replaceIn(bld, 1, bld.length() - 2));
+ assertTrue(sub.replaceIn(bld, 1, bld.length() - 2));
assertEquals(expectedResult, bld.toString()); // expect full result as remainder is untouched
}
}
@@ -592,14 +592,14 @@ public class StrSubstitutorTest {
assertEquals(null, sub.replace((StrBuilder) null));
assertEquals(null, sub.replace((StrBuilder) null, 0, 100));
assertEquals(null, sub.replace((Object) null));
- assertEquals(false, sub.replaceIn((StringBuffer) null));
- assertEquals(false, sub.replaceIn((StringBuffer) null, 0, 100));
- assertEquals(false, sub.replaceIn((StrBuilder) null));
- assertEquals(false, sub.replaceIn((StrBuilder) null, 0, 100));
+ assertFalse(sub.replaceIn((StringBuffer) null));
+ assertFalse(sub.replaceIn((StringBuffer) null, 0, 100));
+ assertFalse(sub.replaceIn((StrBuilder) null));
+ assertFalse(sub.replaceIn((StrBuilder) null, 0, 100));
} else {
assertEquals(replaceTemplate, sub.replace(replaceTemplate));
StrBuilder bld = new StrBuilder(replaceTemplate);
- assertEquals(false, sub.replaceIn(bld));
+ assertFalse(sub.replaceIn(bld));
assertEquals(replaceTemplate, bld.toString());
}
}
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java Wed Sep 19 01:29:22 2012
@@ -234,7 +234,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -244,7 +244,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -254,7 +254,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b\u0001", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -264,7 +264,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("\"b\"", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -274,7 +274,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b'", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -284,7 +284,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -292,7 +292,7 @@ public class StrTokenizerTest {
String input = "a:b:c";
StrTokenizer tok = new StrTokenizer(input, ',');
assertEquals("a:b:c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -304,7 +304,7 @@ public class StrTokenizerTest {
assertEquals("", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -317,7 +317,7 @@ public class StrTokenizerTest {
assertEquals(null, tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -327,7 +327,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -339,7 +339,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -350,7 +350,7 @@ public class StrTokenizerTest {
tok.setEmptyTokenAsNull(true);
assertEquals("a", tok.next());
assertEquals("b'c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -363,7 +363,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b c", tok.next());
assertEquals("d", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -376,7 +376,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("bxc", tok.next());
assertEquals("d", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -386,7 +386,7 @@ public class StrTokenizerTest {
tok.setQuoteMatcher(StrMatcher.quoteMatcher());
assertEquals("a", tok.next());
assertEquals("b\"c:d", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -397,7 +397,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("There's a reason here", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -410,7 +410,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -423,7 +423,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -436,7 +436,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -450,7 +450,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("bc", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -464,7 +464,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("bc", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -477,7 +477,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals(" bc ", tok.next());
assertEquals(" ", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
@Test
@@ -491,7 +491,7 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("bIGNOREcd", tok.next());
assertEquals(null, tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -532,8 +532,8 @@ public class StrTokenizerTest {
void testEmpty(StrTokenizer tokenizer) {
this.checkClone(tokenizer);
- assertEquals(false, tokenizer.hasNext());
- assertEquals(false, tokenizer.hasPrevious());
+ assertFalse(tokenizer.hasNext());
+ assertFalse(tokenizer.hasPrevious());
assertEquals(null, tokenizer.nextToken());
assertEquals(0, tokenizer.size());
try {
@@ -625,13 +625,13 @@ public class StrTokenizerTest {
StrTokenizer tok = new StrTokenizer("a b");
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer("");
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer((String) null);
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -641,13 +641,13 @@ public class StrTokenizerTest {
assertEquals(1, tok.getDelimiterMatcher().isMatch(" ".toCharArray(), 0, 0, 1));
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer("", ' ');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer((String) null, ' ');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -658,13 +658,13 @@ public class StrTokenizerTest {
assertEquals(1, tok.getQuoteMatcher().isMatch("\"".toCharArray(), 0, 0, 1));
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer("", ' ', '"');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer((String) null, ' ', '"');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -673,13 +673,13 @@ public class StrTokenizerTest {
StrTokenizer tok = new StrTokenizer("a b".toCharArray());
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer(new char[0]);
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer((char[]) null);
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -689,13 +689,13 @@ public class StrTokenizerTest {
assertEquals(1, tok.getDelimiterMatcher().isMatch(" ".toCharArray(), 0, 0, 1));
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer(new char[0], ' ');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer((char[]) null, ' ');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -706,13 +706,13 @@ public class StrTokenizerTest {
assertEquals(1, tok.getQuoteMatcher().isMatch("\"".toCharArray(), 0, 0, 1));
assertEquals("a", tok.next());
assertEquals("b", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer(new char[0], ' ', '"');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok = new StrTokenizer((char[]) null, ' ', '"');
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -722,13 +722,13 @@ public class StrTokenizerTest {
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok.reset();
assertEquals("a", tok.next());
assertEquals("b", tok.next());
assertEquals("c", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -738,10 +738,10 @@ public class StrTokenizerTest {
tok.reset("d e");
assertEquals("d", tok.next());
assertEquals("e", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok.reset((String) null);
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -752,10 +752,10 @@ public class StrTokenizerTest {
char[] array = new char[] {'a', 'b', 'c'};
tok.reset(array);
assertEquals("abc", tok.next());
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
tok.reset((char[]) null);
- assertEquals(false, tok.hasNext());
+ assertFalse(tok.hasNext());
}
//-----------------------------------------------------------------------
@@ -799,12 +799,12 @@ public class StrTokenizerTest {
@Test
public void testIteration() {
StrTokenizer tkn = new StrTokenizer("a b c");
- assertEquals(false, tkn.hasPrevious());
+ assertFalse(tkn.hasPrevious());
try {
tkn.previous();
fail();
} catch (NoSuchElementException ex) {}
- assertEquals(true, tkn.hasNext());
+ assertTrue(tkn.hasNext());
assertEquals("a", tkn.next());
try {
@@ -819,23 +819,23 @@ public class StrTokenizerTest {
tkn.add("y");
fail();
} catch (UnsupportedOperationException ex) {}
- assertEquals(true, tkn.hasPrevious());
- assertEquals(true, tkn.hasNext());
+ assertTrue(tkn.hasPrevious());
+ assertTrue(tkn.hasNext());
assertEquals("b", tkn.next());
- assertEquals(true, tkn.hasPrevious());
- assertEquals(true, tkn.hasNext());
+ assertTrue(tkn.hasPrevious());
+ assertTrue(tkn.hasNext());
assertEquals("c", tkn.next());
- assertEquals(true, tkn.hasPrevious());
- assertEquals(false, tkn.hasNext());
+ assertTrue(tkn.hasPrevious());
+ assertFalse(tkn.hasNext());
try {
tkn.next();
fail();
} catch (NoSuchElementException ex) {}
- assertEquals(true, tkn.hasPrevious());
- assertEquals(false, tkn.hasNext());
+ assertTrue(tkn.hasPrevious());
+ assertFalse(tkn.hasNext());
}
//-----------------------------------------------------------------------
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java Wed Sep 19 01:29:22 2012
@@ -17,7 +17,9 @@
package org.apache.commons.lang3.text;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
@@ -37,9 +39,9 @@ public class WordUtilsTest {
assertNotNull(new WordUtils());
Constructor<?>[] cons = WordUtils.class.getDeclaredConstructors();
assertEquals(1, cons.length);
- assertEquals(true, Modifier.isPublic(cons[0].getModifiers()));
- assertEquals(true, Modifier.isPublic(WordUtils.class.getModifiers()));
- assertEquals(false, Modifier.isFinal(WordUtils.class.getModifiers()));
+ assertTrue(Modifier.isPublic(cons[0].getModifiers()));
+ assertTrue(Modifier.isPublic(WordUtils.class.getModifiers()));
+ assertFalse(Modifier.isFinal(WordUtils.class.getModifiers()));
}
//-----------------------------------------------------------------------
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java Wed Sep 19 01:29:22 2012
@@ -36,9 +36,9 @@ public class DateFormatUtilsTest {
assertNotNull(new DateFormatUtils());
Constructor<?>[] cons = DateFormatUtils.class.getDeclaredConstructors();
assertEquals(1, cons.length);
- assertEquals(true, Modifier.isPublic(cons[0].getModifiers()));
- assertEquals(true, Modifier.isPublic(DateFormatUtils.class.getModifiers()));
- assertEquals(false, Modifier.isFinal(DateFormatUtils.class.getModifiers()));
+ assertTrue(Modifier.isPublic(cons[0].getModifiers()));
+ assertTrue(Modifier.isPublic(DateFormatUtils.class.getModifiers()));
+ assertFalse(Modifier.isFinal(DateFormatUtils.class.getModifiers()));
}
//-----------------------------------------------------------------------
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java Wed Sep 19 01:29:22 2012
@@ -142,9 +142,9 @@ public class DateUtilsTest {
assertNotNull(new DateUtils());
Constructor<?>[] cons = DateUtils.class.getDeclaredConstructors();
assertEquals(1, cons.length);
- assertEquals(true, Modifier.isPublic(cons[0].getModifiers()));
- assertEquals(true, Modifier.isPublic(DateUtils.class.getModifiers()));
- assertEquals(false, Modifier.isFinal(DateUtils.class.getModifiers()));
+ assertTrue(Modifier.isPublic(cons[0].getModifiers()));
+ assertTrue(Modifier.isPublic(DateUtils.class.getModifiers()));
+ assertFalse(Modifier.isFinal(DateUtils.class.getModifiers()));
}
//-----------------------------------------------------------------------
@@ -152,13 +152,13 @@ public class DateUtilsTest {
public void testIsSameDay_Date() {
Date date1 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
Date date2 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
- assertEquals(true, DateUtils.isSameDay(date1, date2));
+ assertTrue(DateUtils.isSameDay(date1, date2));
date2 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
- assertEquals(false, DateUtils.isSameDay(date1, date2));
+ assertFalse(DateUtils.isSameDay(date1, date2));
date1 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
- assertEquals(true, DateUtils.isSameDay(date1, date2));
+ assertTrue(DateUtils.isSameDay(date1, date2));
date2 = new GregorianCalendar(2005, 6, 10, 13, 45).getTime();
- assertEquals(false, DateUtils.isSameDay(date1, date2));
+ assertFalse(DateUtils.isSameDay(date1, date2));
try {
DateUtils.isSameDay((Date) null, (Date) null);
fail();
@@ -170,13 +170,13 @@ public class DateUtilsTest {
public void testIsSameDay_Cal() {
GregorianCalendar cal1 = new GregorianCalendar(2004, 6, 9, 13, 45);
GregorianCalendar cal2 = new GregorianCalendar(2004, 6, 9, 13, 45);
- assertEquals(true, DateUtils.isSameDay(cal1, cal2));
+ assertTrue(DateUtils.isSameDay(cal1, cal2));
cal2.add(Calendar.DAY_OF_YEAR, 1);
- assertEquals(false, DateUtils.isSameDay(cal1, cal2));
+ assertFalse(DateUtils.isSameDay(cal1, cal2));
cal1.add(Calendar.DAY_OF_YEAR, 1);
- assertEquals(true, DateUtils.isSameDay(cal1, cal2));
+ assertTrue(DateUtils.isSameDay(cal1, cal2));
cal2.add(Calendar.YEAR, 1);
- assertEquals(false, DateUtils.isSameDay(cal1, cal2));
+ assertFalse(DateUtils.isSameDay(cal1, cal2));
try {
DateUtils.isSameDay((Calendar) null, (Calendar) null);
fail();
@@ -188,13 +188,13 @@ public class DateUtilsTest {
public void testIsSameInstant_Date() {
Date date1 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
Date date2 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
- assertEquals(true, DateUtils.isSameInstant(date1, date2));
+ assertTrue(DateUtils.isSameInstant(date1, date2));
date2 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
- assertEquals(false, DateUtils.isSameInstant(date1, date2));
+ assertFalse(DateUtils.isSameInstant(date1, date2));
date1 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
- assertEquals(true, DateUtils.isSameInstant(date1, date2));
+ assertTrue(DateUtils.isSameInstant(date1, date2));
date2 = new GregorianCalendar(2005, 6, 10, 13, 45).getTime();
- assertEquals(false, DateUtils.isSameInstant(date1, date2));
+ assertFalse(DateUtils.isSameInstant(date1, date2));
try {
DateUtils.isSameInstant((Date) null, (Date) null);
fail();
@@ -210,10 +210,10 @@ public class DateUtilsTest {
cal1.set(Calendar.MILLISECOND, 0);
cal2.set(2004, 6, 9, 13, 45, 0);
cal2.set(Calendar.MILLISECOND, 0);
- assertEquals(false, DateUtils.isSameInstant(cal1, cal2));
+ assertFalse(DateUtils.isSameInstant(cal1, cal2));
cal2.set(2004, 6, 9, 11, 45, 0);
- assertEquals(true, DateUtils.isSameInstant(cal1, cal2));
+ assertTrue(DateUtils.isSameInstant(cal1, cal2));
try {
DateUtils.isSameInstant((Calendar) null, (Calendar) null);
fail();
@@ -229,7 +229,7 @@ public class DateUtilsTest {
cal1.set(Calendar.MILLISECOND, 0);
cal2.set(2004, 6, 9, 13, 45, 0);
cal2.set(Calendar.MILLISECOND, 0);
- assertEquals(true, DateUtils.isSameLocalTime(cal1, cal2));
+ assertTrue(DateUtils.isSameLocalTime(cal1, cal2));
Calendar cal3 = Calendar.getInstance();
Calendar cal4 = Calendar.getInstance();
@@ -240,7 +240,7 @@ public class DateUtilsTest {
assertFalse("LANG-677", DateUtils.isSameLocalTime(cal3, cal4));
cal2.set(2004, 6, 9, 11, 45, 0);
- assertEquals(false, DateUtils.isSameLocalTime(cal1, cal2));
+ assertFalse(DateUtils.isSameLocalTime(cal1, cal2));
try {
DateUtils.isSameLocalTime((Calendar) null, (Calendar) null);
fail();
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java?rev=1387424&r1=1387423&r2=1387424&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java Wed Sep 19 01:29:22 2012
@@ -36,9 +36,9 @@ public class DurationFormatUtilsTest {
assertNotNull(new DurationFormatUtils());
Constructor<?>[] cons = DurationFormatUtils.class.getDeclaredConstructors();
assertEquals(1, cons.length);
- assertEquals(true, Modifier.isPublic(cons[0].getModifiers()));
- assertEquals(true, Modifier.isPublic(DurationFormatUtils.class.getModifiers()));
- assertEquals(false, Modifier.isFinal(DurationFormatUtils.class.getModifiers()));
+ assertTrue(Modifier.isPublic(cons[0].getModifiers()));
+ assertTrue(Modifier.isPublic(DurationFormatUtils.class.getModifiers()));
+ assertFalse(Modifier.isFinal(DurationFormatUtils.class.getModifiers()));
}
// -----------------------------------------------------------------------