CVS: junit/src/org/junit/tests IgnoreClassTest.java, NONE, 1.1 AssertionTest.java, 1.3, 1.4 AllTests.java, 1.5, 1.6 CustomMethodRunnerTest.java, 1.1, NONE MixInTest.java, 1.1, NONE
David Saff <[email protected]>
| Newsgroups | gmane.comp.java.junit.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/junit/junit/src/org/junit/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11688/src/org/junit/tests
Modified Files:
AssertionTest.java AllTests.java
Added Files:
IgnoreClassTest.java
Removed Files:
CustomMethodRunnerTest.java MixInTest.java
Log Message:
Can @Ignore classes
assertArrayEquals added
--- NEW FILE: IgnoreClassTest.java ---
package org.junit.tests;
import static org.junit.Assert.*;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
public class IgnoreClassTest {
@Ignore public static class IgnoreMe {
@Test public void iFail() {
fail();
}
@Test public void iFailToo() {
fail();
}
}
@Test public void ignoreClass() {
Result result= JUnitCore.runClasses(IgnoreMe.class);
assertEquals(0, result.getFailureCount());
assertEquals(1, result.getIgnoreCount());
}
}
Index: AssertionTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/AssertionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AssertionTest.java 6 Dec 2006 01:22:48 -0000 1.3
+++ AssertionTest.java 24 Jan 2007 16:32:59 -0000 1.4
@@ -1,6 +1,7 @@
package org.junit.tests;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
@@ -25,16 +26,16 @@
}
@Test(expected= AssertionError.class) public void arraysNotEqual() {
- assertEquals(new Object[] {new Object()}, new Object[] {new Object()});
+ assertArrayEquals((new Object[] {new Object()}), (new Object[] {new Object()}));
}
@Test(expected= AssertionError.class) public void arraysNotEqualWithMessage() {
- assertEquals("not equal", new Object[] {new Object()}, new Object[] {new Object()});
+ assertArrayEquals("not equal", (new Object[] {new Object()}), (new Object[] {new Object()}));
}
@Test public void arraysExpectedNullMessage() {
try {
- assertEquals("not equal", null, new Object[] {new Object()});
+ assertArrayEquals("not equal", null, (new Object[] {new Object()}));
} catch (AssertionError exception) {
assertEquals("not equal: expected array was null", exception.getMessage());
}
@@ -42,7 +43,7 @@
@Test public void arraysActualNullMessage() {
try {
- assertEquals("not equal", new Object[] {new Object()}, null);
+ assertArrayEquals("not equal", (new Object[] {new Object()}), null);
} catch (AssertionError exception) {
assertEquals("not equal: actual array was null", exception.getMessage());
}
@@ -50,19 +51,19 @@
@Test public void arraysDifferentLengthMessage() {
try {
- assertEquals("not equal", new Object[0] , new Object[1]);
+ assertArrayEquals("not equal", (new Object[0]), (new Object[1]));
} catch (AssertionError exception) {
assertEquals("not equal: array lengths differed, expected.length=0 actual.length=1", exception.getMessage());
}
}
@Test(expected=ArrayComparisonFailure.class) public void arraysElementsDiffer() {
- assertEquals("not equal", new Object[] {"this is a very long string in the middle of an array"} , new Object[] {"this is another very long string in the middle of an array"});
+ assertArrayEquals("not equal", (new Object[] {"this is a very long string in the middle of an array"}), (new Object[] {"this is another very long string in the middle of an array"}));
}
@Test public void arraysDifferAtElement0nullMessage() {
try {
- assertEquals(new Object[] { true }, new Object[] { false });
+ assertArrayEquals((new Object[] { true }), (new Object[] { false }));
} catch (AssertionError exception) {
assertEquals("arrays first differed at element [0]; expected:<true> but was:<false>", exception
.getMessage());
@@ -71,8 +72,8 @@
@Test public void arraysDifferAtElement1nullMessage() {
try {
- assertEquals(new Object[] { true, true }, new Object[] { true,
- false });
+ assertArrayEquals((new Object[] { true, true }), (new Object[] { true,
+ false }));
} catch (AssertionError exception) {
assertEquals("arrays first differed at element [1]; expected:<true> but was:<false>", exception
.getMessage());
@@ -81,7 +82,7 @@
@Test public void arraysDifferAtElement0withMessage() {
try {
- assertEquals("message", new Object[] { true }, new Object[] { false });
+ assertArrayEquals("message", (new Object[] { true }), (new Object[] { false }));
} catch (AssertionError exception) {
assertEquals("message: arrays first differed at element [0]; expected:<true> but was:<false>", exception
.getMessage());
@@ -90,7 +91,7 @@
@Test public void arraysDifferAtElement1withMessage() {
try {
- assertEquals("message", new Object[] {true, true}, new Object[] {true, false});
+ assertArrayEquals("message", (new Object[] {true, true}), (new Object[] {true, false}));
fail();
} catch (AssertionError exception) {
assertEquals("message: arrays first differed at element [1]; expected:<true> but was:<false>", exception.getMessage());
@@ -98,16 +99,43 @@
}
@Test public void multiDimensionalArraysAreEqual() {
- assertEquals(new Object[][]{{true, true}, {false, false}}, new Object[][]{{true, true}, {false, false}});
+ assertArrayEquals((new Object[][]{{true, true}, {false, false}}), (new Object[][]{{true, true}, {false, false}}));
+ }
+
+ @Test
+ public void multiDimensionalIntArraysAreEqual() {
+ int[][] int1= { { 1, 2, 3 }, { 4, 5, 6 } };
+ int[][] int2= { { 1, 2, 3 }, { 4, 5, 6 } };
+ assertArrayEquals(int1, int2);
+ }
+
+ @Test
+ public void oneDimensionalPrimitiveArraysAreEqual() {
+ assertArrayEquals(new byte[] {1}, new byte[] {1});
+ assertArrayEquals(new char[] {1}, new char[] {1});
+ assertArrayEquals(new short[] {1}, new short[] {1});
+ assertArrayEquals(new int[] {1}, new int[] {1});
+ assertArrayEquals(new long[] {1}, new long[] {1});
+ }
+
+ @Test
+ public void arraysContainingIntsAreEqualToArraysContainingLongs() {
+ Object[] int1= { 1, 2, 3 };
+ Object[] int2= { 1L, 2L, 3L };
+ assertArrayEquals(int1, int2);
+ }
+
+ @Test public void intsEqualLongs() {
+ assertEquals(1, 1L);
}
@Test public void multiDimensionalArraysDeclaredAsOneDimensionalAreEqual() {
- assertEquals(new Object[]{new Object[] {true, true}, new Object[] {false, false}}, new Object[]{new Object[] {true, true}, new Object[] {false, false}});
+ assertArrayEquals((new Object[]{new Object[] {true, true}, new Object[] {false, false}}), (new Object[]{new Object[] {true, true}, new Object[] {false, false}}));
}
@Test public void multiDimensionalArraysAreNotEqual() {
try {
- assertEquals("message", new Object[][]{{true, true}, {false, false}}, new Object[][]{{true, true}, {true, false}});
+ assertArrayEquals("message", (new Object[][]{{true, true}, {false, false}}), (new Object[][]{{true, true}, {true, false}}));
fail();
} catch (AssertionError exception) {
assertEquals("message: arrays first differed at element [1][0]; expected:<false> but was:<true>", exception.getMessage());
@@ -116,7 +144,7 @@
@Test public void multiDimensionalArraysAreNotEqualNoMessage() {
try {
- assertEquals(new Object[][]{{true, true}, {false, false}}, new Object[][]{{true, true}, {true, false}});
+ assertArrayEquals((new Object[][]{{true, true}, {false, false}}), (new Object[][]{{true, true}, {true, false}}));
fail();
} catch (AssertionError exception) {
assertEquals("arrays first differed at element [1][0]; expected:<false> but was:<true>", exception.getMessage());
@@ -135,14 +163,14 @@
Object element= new Object();
Object[] objects1= new Object[] {element};
Object[] objects2= new Object[] {element};
- assertEquals(objects1, objects2);
+ assertArrayEquals(objects1, objects2);
}
@Test public void arraysEqualWithMessage() {
Object element= new Object();
Object[] objects1= new Object[] {element};
Object[] objects2= new Object[] {element};
- assertEquals("equal", objects1, objects2);
+ assertArrayEquals("equal", objects1, objects2);
}
@Test public void equals() {
Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AllTests.java 27 Dec 2006 22:27:22 -0000 1.5
+++ AllTests.java 24 Jan 2007 16:32:59 -0000 1.6
@@ -8,10 +8,9 @@
@RunWith(Suite.class)
@SuiteClasses({
- CustomMethodRunnerTest.class,
ListenerTest.class,
FailedConstructionTest.class,
- MixInTest.class,
+ // TODO: What did CVS do with this? CustomRunnerTest.class,
TestDescriptionTest.class,
SuiteDescriptionTest.class,
AllTestsTest.class,
@@ -41,7 +40,8 @@
JUnitCoreTest.class,
InaccessibleBaseClassTest.class,
SuiteMethodTest.class,
- TestClassMethodsRunnerTest.class
+ TestClassMethodsRunnerTest.class,
+ IgnoreClassTest.class,
})
public class AllTests {
// public static class Compatibility {
--- CustomMethodRunnerTest.java DELETED ---
--- MixInTest.java DELETED ---
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV