[jboss-svn-commits] JBoss Portal SVN: r5438 - in trunk/wsrp/src/main/org/jboss/portal/test/wsrp: . v1/producer

[jboss-svn-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-10-13 12:28:41 -0400 (Fri, 13 Oct 2006)
New Revision: 5438

Modified:
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
Log:
- Added assertEquals method that takes a Decorator object to allow for comparison of arrays of object 
that don't implement equals. This will probably move to ExtendedAssert at some point.
- Minor clean-ups.

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java	2006-10-13 16:16:06 UTC (rev 5437)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java	2006-10-13 16:28:41 UTC (rev 5438)
@@ -7,7 +7,7 @@
 package org.jboss.portal.test.wsrp;
 
 import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
 import org.jboss.portal.test.framework.TestRuntimeContext;
 import org.jboss.portal.test.framework.deployment.Deployer;
 import org.jboss.portal.test.framework.server.Node;
@@ -83,7 +83,7 @@
       runtimeContext.stop();
    }
 
-   public void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage)
+   public static void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage)
    {
       if (isOrderRelevant)
       {
@@ -98,14 +98,19 @@
 
          if (!equals)
          {
-            if (expected == null || tested == null || expected.getClass() != tested.getClass())
+            if (expected == null || tested == null)
             {
-               fail(failMessage + " Different classes or not both null.");
+               fail(failMessage + " Not both null.");
             }
 
+            if (expected.getClass().getComponentType() != tested.getClass().getComponentType())
+            {
+               fail(failMessage + " Different classes.");
+            }
+
             if (expected.length != tested.length)
             {
-               fail(failMessage + " Different sizes");
+               fail(failMessage + " Different sizes (tested: " + tested.length + ", expected: " + expected.length + ").");
             }
 
             List expectedList = Arrays.asList(expected);
@@ -118,8 +123,69 @@
       }
    }
 
-   public void assertString1ContainsString2(String string1, String string2)
+   public static void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage, Decorator decorator)
    {
+      Object[] decoratedExpected = null, decoratedTested = null;
+      if (decorator != null)
+      {
+         decoratedExpected = decorate(expected, decorator);
+         decoratedTested = decorate(tested, decorator);
+      }
+
+      assertEquals(decoratedExpected, decoratedTested, isOrderRelevant, failMessage);
+   }
+
+   private static Object[] decorate(Object[] toBeDecorated, Decorator decorator)
+   {
+      if (toBeDecorated != null)
+      {
+         DecoratedObject[] decorated = new DecoratedObject[toBeDecorated.length];
+         for (int i = 0; i < decorated.length; i++)
+         {
+            decorated[i] = new DecoratedObject(toBeDecorated[i], decorator);
+         }
+         return decorated;
+      }
+      return null;
+
+   }
+
+   public static interface Decorator
+   {
+      void decorate(Object decorated);
+   }
+
+   public static class DecoratedObject
+   {
+      private Decorator decorator;
+      private Object decorated;
+
+      public Object getDecorated()
+      {
+         return decorated;
+      }
+
+      public DecoratedObject(Object decorated, Decorator decorator)
+      {
+         this.decorator = decorator;
+         this.decorated = decorated;
+      }
+
+      public boolean equals(Object obj)
+      {
+         decorator.decorate(decorated);
+         return decorator.equals(obj);
+      }
+
+      public String toString()
+      {
+         decorator.decorate(decorated);
+         return decorator.toString();
+      }
+   }
+
+   public static void assertString1ContainsString2(String string1, String string2)
+   {
       assertTrue("<" + string1 + "> does not contain <" + string2 + ">", string1.indexOf(string2) >= 0);
    }
 

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java	2006-10-13 16:16:06 UTC (rev 5437)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java	2006-10-13 16:28:41 UTC (rev 5438)
@@ -103,25 +103,6 @@
          new String[]{"en"}, null), markupType);
    }
 
-   public void assertEquals(MarkupType expected, MarkupType tested)
-   {
-      String message = "Expected: <" + expected + ">, got: <" + tested + ">. Failed on: ";
-
-      if (expected != tested)
-      {
-         if (expected == null || tested == null)
-         {
-            fail(message + "Different classes or not both null.");
-         }
-
-
-         assertEquals(expected.getExtensions(), tested.getExtensions(), false, message + "Extensions");
-         assertEquals(expected.getLocales(), tested.getLocales(), false, message + "Locales");
-         assertEquals(expected.getModes(), tested.getModes(), false, message + "Modes");
-         assertEquals(expected.getWindowStates(), tested.getWindowStates(), false, message + "Window states");
-      }
-   }
-
    protected ServiceDescription checkServiceDescriptionWithOnlyBasicPortlet(GetServiceDescription gs)
       throws Exception
    {
@@ -187,7 +168,9 @@
       return gs;
    }
 
-   protected void assertEquals(PropertyDescription expected, PropertyDescription tested)
+   /** === asserts === * */
+
+   protected static void assertEquals(MarkupType expected, MarkupType tested)
    {
       String message = "Expected: <" + expected + ">, got: <" + tested + ">. Failed on: ";
 
@@ -198,7 +181,26 @@
             fail(message + "Different classes or not both null.");
          }
 
+
          assertEquals(expected.getExtensions(), tested.getExtensions(), false, message + "Extensions");
+         assertEquals(expected.getLocales(), tested.getLocales(), false, message + "Locales");
+         assertEquals(expected.getModes(), tested.getModes(), false, message + "Modes");
+         assertEquals(expected.getWindowStates(), tested.getWindowStates(), false, message + "Window states");
+      }
+   }
+
+   protected static void assertEquals(PropertyDescription expected, PropertyDescription tested)
+   {
+      String message = "Expected: <" + expected + ">, got: <" + tested + ">. Failed on: ";
+
+      if (expected != tested)
+      {
+         if (expected == null || tested == null)
+         {
+            fail(message + "Different classes or not both null.");
+         }
+
+         assertEquals(expected.getExtensions(), tested.getExtensions(), false, message + "Extensions");
          assertEquals(message + "Hint", expected.getHint(), tested.getHint());
          assertEquals(message + "Label", expected.getLabel(), tested.getLabel());
          assertEquals(message + "Name", expected.getName(), tested.getName());
@@ -206,7 +208,7 @@
       }
    }
 
-   protected void assertEquals(String message, LocalizedString expected, LocalizedString tested)
+   protected static void assertEquals(String message, LocalizedString expected, LocalizedString tested)
    {
       if (expected != tested)
       {