Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java Wed Sep 19 01:08:04 2012 @@ -18,6 +18,7 @@ package org.apache.commons.lang3; import static org.apache.commons.lang3.JavaVersion.JAVA_1_4; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -68,9 +69,9 @@ public class LocaleUtilsTest { assertNotNull(new LocaleUtils()); Constructor<?>[] cons = LocaleUtils.class.getDeclaredConstructors(); assertEquals(1, cons.length); - assertEquals(true, Modifier.isPublic(cons[0].getModifiers())); - assertEquals(true, Modifier.isPublic(LocaleUtils.class.getModifiers())); - assertEquals(false, Modifier.isFinal(LocaleUtils.class.getModifiers())); + assertTrue(Modifier.isPublic(cons[0].getModifiers())); + assertTrue(Modifier.isPublic(LocaleUtils.class.getModifiers())); + assertFalse(Modifier.isFinal(LocaleUtils.class.getModifiers())); } //-----------------------------------------------------------------------
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java Wed Sep 19 01:08:04 2012 @@ -457,7 +457,7 @@ public class ObjectUtilsTest { // bytecode to see if the literals were folded into the // class, or if the bytecode kept the method call. - assertEquals("CONST(boolean)", true, ObjectUtils.CONST(true)); + assertTrue("CONST(boolean)", ObjectUtils.CONST(true)); assertEquals("CONST(byte)", (byte) 3, ObjectUtils.CONST((byte) 3)); assertEquals("CONST(char)", (char) 3, ObjectUtils.CONST((char) 3)); assertEquals("CONST(short)", (short) 3, ObjectUtils.CONST((short) 3)); @@ -487,7 +487,7 @@ public class ObjectUtilsTest { double MAGIC_DOUBLE = ObjectUtils.CONST(1.0); String MAGIC_STRING = ObjectUtils.CONST("abc"); - assertEquals(true, MAGIC_FLAG); + assertTrue(MAGIC_FLAG); assertEquals(127, MAGIC_BYTE1); assertEquals(127, MAGIC_BYTE2); assertEquals('a', MAGIC_CHAR); Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java Wed Sep 19 01:08:04 2012 @@ -17,6 +17,7 @@ package org.apache.commons.lang3; 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 static org.junit.Assert.fail; @@ -40,9 +41,9 @@ public class RandomStringUtilsTest { assertNotNull(new RandomStringUtils()); Constructor<?>[] cons = RandomStringUtils.class.getDeclaredConstructors(); assertEquals(1, cons.length); - assertEquals(true, Modifier.isPublic(cons[0].getModifiers())); - assertEquals(true, Modifier.isPublic(RandomStringUtils.class.getModifiers())); - assertEquals(false, Modifier.isFinal(RandomStringUtils.class.getModifiers())); + assertTrue(Modifier.isPublic(cons[0].getModifiers())); + assertTrue(Modifier.isPublic(RandomStringUtils.class.getModifiers())); + assertFalse(Modifier.isFinal(RandomStringUtils.class.getModifiers())); } //----------------------------------------------------------------------- @@ -68,7 +69,7 @@ public class RandomStringUtilsTest { r1 = RandomStringUtils.randomAlphabetic(50); assertEquals("randomAlphabetic(50)", 50, r1.length()); for(int i = 0; i < r1.length(); i++) { - assertEquals("r1 contains alphabetic", true, Character.isLetter(r1.charAt(i)) && !Character.isDigit(r1.charAt(i))); + assertTrue("r1 contains alphabetic", Character.isLetter(r1.charAt(i)) && !Character.isDigit(r1.charAt(i))); } r2 = RandomStringUtils.randomAlphabetic(50); assertTrue("!r1.equals(r2)", !r1.equals(r2)); @@ -76,7 +77,7 @@ public class RandomStringUtilsTest { r1 = RandomStringUtils.randomAlphanumeric(50); assertEquals("randomAlphanumeric(50)", 50, r1.length()); for(int i = 0; i < r1.length(); i++) { - assertEquals("r1 contains alphanumeric", true, Character.isLetterOrDigit(r1.charAt(i))); + assertTrue("r1 contains alphanumeric", Character.isLetterOrDigit(r1.charAt(i))); } r2 = RandomStringUtils.randomAlphabetic(50); assertTrue("!r1.equals(r2)", !r1.equals(r2)); @@ -84,7 +85,7 @@ public class RandomStringUtilsTest { r1 = RandomStringUtils.randomNumeric(50); assertEquals("randomNumeric(50)", 50, r1.length()); for(int i = 0; i < r1.length(); i++) { - assertEquals("r1 contains numeric", true, Character.isDigit(r1.charAt(i)) && !Character.isLetter(r1.charAt(i))); + assertTrue("r1 contains numeric", Character.isDigit(r1.charAt(i)) && !Character.isLetter(r1.charAt(i))); } r2 = RandomStringUtils.randomNumeric(50); assertTrue("!r1.equals(r2)", !r1.equals(r2)); Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java Wed Sep 19 01:08:04 2012 @@ -17,6 +17,7 @@ package org.apache.commons.lang3; 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.assertSame; @@ -69,9 +70,9 @@ public class SerializationUtilsTest { assertNotNull(new SerializationUtils()); Constructor<?>[] cons = SerializationUtils.class.getDeclaredConstructors(); assertEquals(1, cons.length); - assertEquals(true, Modifier.isPublic(cons[0].getModifiers())); - assertEquals(true, Modifier.isPublic(SerializationUtils.class.getModifiers())); - assertEquals(false, Modifier.isFinal(SerializationUtils.class.getModifiers())); + assertTrue(Modifier.isPublic(cons[0].getModifiers())); + assertTrue(Modifier.isPublic(SerializationUtils.class.getModifiers())); + assertFalse(Modifier.isFinal(SerializationUtils.class.getModifiers())); } @Test Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java Wed Sep 19 01:08:04 2012 @@ -17,7 +17,9 @@ package org.apache.commons.lang3.event; 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 static org.junit.Assert.fail; import java.beans.PropertyChangeEvent; @@ -48,9 +50,9 @@ public class EventUtilsTest assertNotNull(new EventUtils()); Constructor<?>[] cons = EventUtils.class.getDeclaredConstructors(); assertEquals(1, cons.length); - assertEquals(true, Modifier.isPublic(cons[0].getModifiers())); - assertEquals(true, Modifier.isPublic(EventUtils.class.getModifiers())); - assertEquals(false, Modifier.isFinal(EventUtils.class.getModifiers())); + assertTrue(Modifier.isPublic(cons[0].getModifiers())); + assertTrue(Modifier.isPublic(EventUtils.class.getModifiers())); + assertFalse(Modifier.isFinal(EventUtils.class.getModifiers())); } @Test Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java Wed Sep 19 01:08:04 2012 @@ -31,6 +31,7 @@ import org.junit.Test; */ public class ContextedRuntimeExceptionTest extends AbstractExceptionContextTest<ContextedRuntimeException> { + @Override @Before public void setUp() throws Exception { exceptionContext = new ContextedRuntimeException(new Exception(TEST_MESSAGE)); Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java Wed Sep 19 01:08:04 2012 @@ -25,6 +25,7 @@ import org.junit.Test; */ public class DefaultExceptionContextTest extends AbstractExceptionContextTest<DefaultExceptionContext> { + @Override @Before public void setUp() throws Exception { exceptionContext = new DefaultExceptionContext(); Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java?rev=1387423&r1=1387422&r2=1387423&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java Wed Sep 19 01:08:04 2012 @@ -49,13 +49,13 @@ public class MutableBooleanTest { // ---------------------------------------------------------------- @Test public void testConstructors() { - assertEquals(false, new MutableBoolean().booleanValue()); + assertFalse(new MutableBoolean().booleanValue()); - assertEquals(true, new MutableBoolean(true).booleanValue()); - assertEquals(false, new MutableBoolean(false).booleanValue()); + assertTrue(new MutableBoolean(true).booleanValue()); + assertFalse(new MutableBoolean(false).booleanValue()); - assertEquals(true, new MutableBoolean(Boolean.TRUE).booleanValue()); - assertEquals(false, new MutableBoolean(Boolean.FALSE).booleanValue()); + assertTrue(new MutableBoolean(Boolean.TRUE).booleanValue()); + assertFalse(new MutableBoolean(Boolean.FALSE).booleanValue()); try { new MutableBoolean(null); @@ -70,40 +70,40 @@ public class MutableBooleanTest { final MutableBoolean mutBoolB = new MutableBoolean(false); final MutableBoolean mutBoolC = new MutableBoolean(true); - assertEquals(true, mutBoolA.equals(mutBoolA)); - assertEquals(true, mutBoolA.equals(mutBoolB)); - assertEquals(true, mutBoolB.equals(mutBoolA)); - assertEquals(true, mutBoolB.equals(mutBoolB)); - assertEquals(false, mutBoolA.equals(mutBoolC)); - assertEquals(false, mutBoolB.equals(mutBoolC)); - assertEquals(true, mutBoolC.equals(mutBoolC)); - assertEquals(false, mutBoolA.equals(null)); - assertEquals(false, mutBoolA.equals(Boolean.FALSE)); - assertEquals(false, mutBoolA.equals("false")); + assertTrue(mutBoolA.equals(mutBoolA)); + assertTrue(mutBoolA.equals(mutBoolB)); + assertTrue(mutBoolB.equals(mutBoolA)); + assertTrue(mutBoolB.equals(mutBoolB)); + assertFalse(mutBoolA.equals(mutBoolC)); + assertFalse(mutBoolB.equals(mutBoolC)); + assertTrue(mutBoolC.equals(mutBoolC)); + assertFalse(mutBoolA.equals(null)); + assertFalse(mutBoolA.equals(Boolean.FALSE)); + assertFalse(mutBoolA.equals("false")); } @Test public void testGetSet() { - assertEquals(false, new MutableBoolean().booleanValue()); + assertFalse(new MutableBoolean().booleanValue()); assertEquals(Boolean.FALSE, new MutableBoolean().getValue()); final MutableBoolean mutBool = new MutableBoolean(false); assertEquals(Boolean.FALSE, mutBool.toBoolean()); - assertEquals(false, mutBool.booleanValue()); - assertEquals(true, mutBool.isFalse()); - assertEquals(false, mutBool.isTrue()); + assertFalse(mutBool.booleanValue()); + assertTrue(mutBool.isFalse()); + assertFalse(mutBool.isTrue()); mutBool.setValue(Boolean.TRUE); assertEquals(Boolean.TRUE, mutBool.toBoolean()); - assertEquals(true, mutBool.booleanValue()); - assertEquals(false, mutBool.isFalse()); - assertEquals(true, mutBool.isTrue()); + assertTrue(mutBool.booleanValue()); + assertFalse(mutBool.isFalse()); + assertTrue(mutBool.isTrue()); mutBool.setValue(false); - assertEquals(false, mutBool.booleanValue()); + assertFalse(mutBool.booleanValue()); mutBool.setValue(true); - assertEquals(true, mutBool.booleanValue()); + assertTrue(mutBool.booleanValue()); try { mutBool.setValue(null); @@ -118,11 +118,11 @@ public class MutableBooleanTest { final MutableBoolean mutBoolB = new MutableBoolean(false); final MutableBoolean mutBoolC = new MutableBoolean(true); - assertEquals(true, mutBoolA.hashCode() == mutBoolA.hashCode()); - assertEquals(true, mutBoolA.hashCode() == mutBoolB.hashCode()); - assertEquals(false, mutBoolA.hashCode() == mutBoolC.hashCode()); - assertEquals(true, mutBoolA.hashCode() == Boolean.FALSE.hashCode()); - assertEquals(true, mutBoolC.hashCode() == Boolean.TRUE.hashCode()); + assertEquals(mutBoolA.hashCode(), mutBoolA.hashCode()); + assertEquals(mutBoolA.hashCode(), mutBoolB.hashCode()); + assertFalse(mutBoolA.hashCode() == mutBoolC.hashCode()); + assertEquals(mutBoolA.hashCode(), Boolean.FALSE.hashCode()); + assertEquals(mutBoolC.hashCode(), Boolean.TRUE.hashCode()); } @Test
