[Pojomatic-commits] SF.net SVN: pojomatic:[216] trunk/PojomaticAll/PojomaticTestUtils/src/test/ java/org/pojomatic

[<chr...@us...>]

Revision: 216
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=216&view=rev
Author:   chriswhansen
Date:     2010-04-18 15:51:10 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
Improve code coverage for PojomaticAssert.

Modified Paths:
--------------
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -3,10 +3,15 @@
 import org.pojomatic.test.AssertTest;
 
 public class PojomaticAssertTest extends AssertTest {
+  @Override
+  protected void performAssertEquals(Object expected, Object actual) {
+    PojomaticAssert.assertEqualsWithDiff(expected, actual);
+  }
 
   @Override
   protected void performAssertEquals(Object expected, Object actual, String message) {
     PojomaticAssert.assertEqualsWithDiff(expected, actual, message);
   }
 
+
 }

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -11,12 +11,22 @@
  */
 public abstract class AssertTest {
 
+
   /**
    * Only the unit under test should throw {@link AssertionError}, so no assertions are allowed
-   * within the implementation of this method.
+   * to be thrown from within the implementation of this method.
    *
    * @param expected the expected object
    * @param actual the actual object
+   */
+  protected abstract void performAssertEquals(Object expected, Object actual);
+
+  /**
+   * Only the unit under test should throw {@link AssertionError}, so no assertions are allowed
+   * to be thrown from within the implementation of this method.
+   *
+   * @param expected the expected object
+   * @param actual the actual object
    * @param message the messaage to include with the assertion
    */
   protected abstract void performAssertEquals(Object expected, Object actual, String message);
@@ -34,15 +44,25 @@
 
   @Test
   public final void assertEqualsWhenEqual() {
-    performAssertEquals(new Container(3), new Container(3), "message");  
+    performAssertEquals(new Container(3), new Container(3), "message");
   }
 
   @Test
+  public final void assertEqualsWhenEqualNoMessage() {
+    performAssertEquals(new Container(3), new Container(3));
+  }
+
+  @Test
   public final void assertEqualsBothNull() {
     performAssertEquals(null, null, null);
   }
 
   @Test
+  public final void assertEqualsBothNullNoMessage() {
+    performAssertEquals(null, null);
+  }
+
+  @Test
   public final void assertEqualsNullExpected() {
     performAssertEquals(
       null, new Container(null), null,
@@ -50,6 +70,13 @@
   }
 
   @Test
+  public final void assertEqualsNullExpectedNoMessage() {
+    performAssertEquals(
+      null, new Container(null), null,
+      "expected is null, but actual is Container{test: {null}}");
+  }
+
+  @Test
   public final void assertEqualsNullActual() {
     performAssertEquals(
       new Container(null), null, null, "actual is null, but expected is Container{test: {null}}");
@@ -71,6 +98,17 @@
 
   @Test
   public final void assertEqualsNoMessage() {
+    try {
+      performAssertEquals(new Container("foo"), new Container("bar"));
+    }
+    catch (AssertionError e) {
+      assertEquals("differences between expected and actual:[test: {foo} versus {bar}]" +
+          " (expected:<Container{test: {foo}}> but was:<Container{test: {bar}}>)", e.getMessage());
+    }
+  }
+
+  @Test
+  public final void assertEqualsNullMessage() {
     performAssertEquals(
       new Container("foo"), new Container("bar"), null,
       "differences between expected and actual:[test: {foo} versus {bar}]" +
@@ -78,7 +116,7 @@
   }
 
   @Test
-  public final void assertEqualsMessag2() {
+  public final void assertEqualsMessage2() {
     String first = "foo";
     String second = "bar";
     performAssertEquals(

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -7,6 +7,11 @@
 public class AssertUtilsTest extends AssertTest {
 
   @Override
+  protected void performAssertEquals(Object first, Object second) {
+    AssertUtils.assertEquals(null, first, second);
+  }
+
+  @Override
   protected void performAssertEquals(Object first, Object second, String message) {
     AssertUtils.assertEquals(message, first, second);
   }

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -5,9 +5,16 @@
 public class PojomaticAssertTest extends AssertTest {
 
   @Override
+  protected void performAssertEquals(Object expected, Object actual) {
+    //in TestNG, the arguments are included in any failure message in reverse order
+    PojomaticAssert.assertEqualsWithDiff(actual, expected);
+  }
+
+  @Override
   protected void performAssertEquals(Object expected, Object actual, String message) {
     //in TestNG, the arguments are included in any failure message in reverse order
     PojomaticAssert.assertEqualsWithDiff(actual, expected, message);
   }
 
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.