diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java index c28b6e1d7..ad63f1b8b 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java @@ -27,8 +27,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Arrays; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -82,9 +82,8 @@ public class ExecStreamRedirectorTest { if (dirListingOutput != null) { // Compare the directory listing that was redirected to these files. // All files should have the same content. - assertTrue("Redirected output in file " + redirectedOutputFile + - " doesn't match content in other redirected output file(s)", - Arrays.equals(dirListingOutput, redirectedOutput)); + assertArrayEquals("Redirected output in file " + redirectedOutputFile + + " doesn't match content in other redirected output file(s)", dirListingOutput, redirectedOutput); } dirListingOutput = redirectedOutput; } diff --git a/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java b/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java index 8e13b0bb3..9dc961311 100644 --- a/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java @@ -22,6 +22,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; @@ -107,10 +108,10 @@ public class DeweyDecimalTest { @Test public void equals() { DeweyDecimal dd = new DeweyDecimal("1.2.3"); - assertFalse(dd.equals("other")); - assertFalse(dd.equals(null)); - assertTrue(dd.equals(new DeweyDecimal("1.2.3"))); - assertTrue(dd.equals(new DeweyDecimal("1.2.3.0"))); + assertNotEquals("other", dd); + assertNotNull(dd); + assertEquals(dd, new DeweyDecimal("1.2.3")); + assertEquals(dd, new DeweyDecimal("1.2.3.0")); } @Test diff --git a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java index d5448a6ac..555916cac 100644 --- a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java @@ -448,8 +448,7 @@ public class FileUtilsTest { .getParent()); tmp2 = getFileUtils().createTempFile("pre", ".suf", parent, false); - assertTrue("files are different", !tmp1.getAbsolutePath().equals( - tmp2.getAbsolutePath())); + assertNotEquals("files are different", tmp1.getAbsolutePath(), tmp2.getAbsolutePath()); } @Test diff --git a/src/tests/junit/org/example/junit/MultilineAsserts.java b/src/tests/junit/org/example/junit/MultilineAsserts.java index 62b555c46..75e307f3a 100644 --- a/src/tests/junit/org/example/junit/MultilineAsserts.java +++ b/src/tests/junit/org/example/junit/MultilineAsserts.java @@ -21,13 +21,13 @@ import junit.framework.TestCase; public class MultilineAsserts extends TestCase { public void testFoo() { - assertTrue("testFoo \nmessed up", false); + fail("testFoo \nmessed up"); } public void testBar() { assertTrue("testBar \ndidn't work", true); } public void testFee() { - assertTrue("testFee \ncrashed", false); + fail("testFee \ncrashed"); } public void testFie() { assertTrue("testFie \nbroke", true);