[jboss-cvs] JBossAS SVN: r77753 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98.

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

Author: emuckenhuber
Date: 2008-09-01 09:48:37 -0400 (Mon, 01 Sep 2008)
New Revision: 77753

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java
Log:
[JBMETA-98] update testcase not depend on a specific ordering

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java	2008-09-01 13:29:35 UTC (rev 77752)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java	2008-09-01 13:48:37 UTC (rev 77753)
@@ -32,6 +32,8 @@
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
+import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
 import org.jboss.metadata.ejb.spec.RemoveMethodMetaData;
 import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
 import org.jboss.test.metadata.common.PackageScanner;
@@ -88,42 +90,71 @@
       assertNotNull(removeMethods);
       assertEquals(5, removeMethods.size());
 
-      RemoveMethodMetaData removeMethod = removeMethods.get(0);
+      NamedMethodMetaData namedMethod = createNamedMethodMD("remove", "boolean");
+      RemoveMethodMetaData removeMethod = getRemoveMethod(removeMethods, namedMethod);
       assertNotNull(removeMethod);
       assertEquals("remove", removeMethod.getBeanMethod().getMethodName());
       assertNotNull(removeMethod.getBeanMethod().getMethodParams());
       assertEquals(1, removeMethod.getBeanMethod().getMethodParams().size());
       assertFalse(removeMethod.isRetainIfException());
 
-      removeMethod = removeMethods.get(1);
+      namedMethod = createNamedMethodMD("remove", new String[]{"boolean", "boolean"});
+      removeMethod = getRemoveMethod(removeMethods, namedMethod);
       assertNotNull(removeMethod);
       assertEquals("remove", removeMethod.getBeanMethod().getMethodName());
       assertNotNull(removeMethod.getBeanMethod().getMethodParams());
       assertEquals(2, removeMethod.getBeanMethod().getMethodParams().size());
       assertTrue(removeMethod.isRetainIfException());
       
-      removeMethod = removeMethods.get(2);
+      namedMethod = createNamedMethodMD("retain", "boolean");
+      removeMethod = getRemoveMethod(removeMethods, namedMethod);
       assertNotNull(removeMethod);
       assertEquals("retain", removeMethod.getBeanMethod().getMethodName());
       assertNotNull(removeMethod.getBeanMethod().getMethodParams());
       assertEquals("boolean", removeMethod.getBeanMethod().getMethodParams().get(0));
       assertFalse(removeMethod.isRetainIfException());
       
-      removeMethod = removeMethods.get(3);
+      namedMethod = createNamedMethodMD("retain", null);
+      removeMethod = getRemoveMethod(removeMethods, namedMethod);
       assertNotNull(removeMethod);
       assertEquals("retain", removeMethod.getBeanMethod().getMethodName());
       assertNull(removeMethod.getBeanMethod().getMethodParams());
       assertTrue(removeMethod.isRetainIfException());
 
-      removeMethod = removeMethods.get(4);
+      namedMethod = createNamedMethodMD("remove", null);
+      removeMethod = getRemoveMethod(removeMethods, namedMethod);
       assertNotNull(removeMethod);
       assertEquals("remove", removeMethod.getBeanMethod().getMethodName());
       assertTrue(removeMethod.getBeanMethod().getMethodParams().isEmpty());
       assertFalse(removeMethod.isRetainIfException());
       
    }
+   
+   private RemoveMethodMetaData getRemoveMethod(RemoveMethodsMetaData methods, NamedMethodMetaData namedMethod)
+   {
+      for(RemoveMethodMetaData method : methods)
+      {
+         if(namedMethod.equals(method.getBeanMethod()))
+            return method;
+      }
+      return null;
+   }
 
-
-   
+   private NamedMethodMetaData createNamedMethodMD(String methodName, String... params)
+   {
+      if(methodName == null)
+         throw new IllegalArgumentException("null methodName");
+      
+      NamedMethodMetaData namedMethod = new NamedMethodMetaData();
+      namedMethod.setMethodName(methodName);
+      if(params != null)
+      {
+         MethodParametersMetaData methodParams = new MethodParametersMetaData();
+         for(String param : params)
+            methodParams.add(param);
+         namedMethod.setMethodParams(methodParams);
+      }
+      return namedMethod;
+   }
 }