From: Erich G. <eg...@us...> - 2002-06-25 08:08:22
|
Update of /cvsroot/junit/junit/junit/tests/framework In directory usw-pr-cvs1:/tmp/cvs-serv30646/junit/tests/framework Modified Files: AssertTest.java Log Message: moved the the comparison failure tests to the AssertTests Index: AssertTest.java =================================================================== RCS file: /cvsroot/junit/junit/junit/tests/framework/AssertTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- AssertTest.java 25 Jun 2002 07:18:18 -0000 1.3 +++ AssertTest.java 25 Jun 2002 08:08:18 -0000 1.4 @@ -76,7 +76,7 @@ assertEquals("a", "a"); } - public void testAssertStringNotEqualsNull() { + public void testAssertNullNotEqualsString() { try { assertEquals(null, "foo"); } catch (ComparisonFailure e) { @@ -85,6 +85,15 @@ fail(); } + public void testAssertStringNotEqualsNull() { + try { + assertEquals("foo", null); + } catch (ComparisonFailure e) { + return; + } + fail(); + } + public void testAssertNullNotEqualsNull() { try { assertEquals(null, new Object()); @@ -164,4 +173,50 @@ } fail(); } + + public void testComparisonErrorMessage() { + ComparisonFailure failure= new ComparisonFailure("a", "b", "c"); + assertEquals("a: expected:<b> but was:<c>", failure.getMessage()); + } + + public void testComparisonErrorStartSame() { + ComparisonFailure failure= new ComparisonFailure(null, "ba", "bc"); + assertEquals("expected:<...a> but was:<...c>", failure.getMessage()); + } + + public void testComparisonErrorEndSame() { + ComparisonFailure failure= new ComparisonFailure(null, "ab", "cb"); + assertEquals("expected:<a...> but was:<c...>", failure.getMessage()); + } + + public void testComparisonErrorSame() { + ComparisonFailure failure= new ComparisonFailure(null, "ab", "ab"); + assertEquals("expected:<ab> but was:<ab>", failure.getMessage()); + } + + public void testComparisonErrorStartAndEndSame() { + ComparisonFailure failure= new ComparisonFailure(null, "abc", "adc"); + assertEquals("expected:<...b...> but was:<...d...>", failure.getMessage()); + } + + public void testComparisonErrorStartSameComplete() { + ComparisonFailure failure= new ComparisonFailure(null, "ab", "abc"); + assertEquals("expected:<...> but was:<...c>", failure.getMessage()); + } + + public void testComparisonErrorEndSameComplete() { + ComparisonFailure failure= new ComparisonFailure(null, "bc", "abc"); + assertEquals("expected:<...> but was:<a...>", failure.getMessage()); + } + + public void testComparisonErrorOverlapingMatches() { + ComparisonFailure failure= new ComparisonFailure(null, "abc", "abbc"); + assertEquals("expected:<......> but was:<...b...>", failure.getMessage()); + } + + public void testComparisonErrorOverlapingMatches2() { + ComparisonFailure failure= new ComparisonFailure(null, "abcdde", "abcde"); + assertEquals("expected:<...d...> but was:<......>", failure.getMessage()); + } + } |