[jboss-svn-commits] JBoss Common SVN: r4554 - in arquillian/trunk: spi/src/main/java/org/jboss/arquillian/spi and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2010-06-25 03:22:54 -0400 (Fri, 25 Jun 2010)
New Revision: 4554

Modified:
   arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGenerator.java
   arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestClass.java
Log:
Remove TestClass.findDeploymentMethod()

Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGenerator.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGenerator.java	2010-06-25 07:22:13 UTC (rev 4553)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGenerator.java	2010-06-25 07:22:54 UTC (rev 4554)
@@ -38,7 +38,7 @@
    {
       Validate.notNull(testCase, "TestCase must be specified");
       
-      Method deploymentMethod = testCase.findDeploymentMethod();
+      Method deploymentMethod = findDeploymentMethod(testCase);
       if(deploymentMethod == null) 
       {
          throw new IllegalArgumentException("No method annotated with " + Deployment.class.getName() + " found");
@@ -79,4 +79,17 @@
          throw new RuntimeException("Could not get Deployment", e);
       }
    }
+
+   private Method findDeploymentMethod(TestClass testClass) 
+   {
+      Method[] methods = testClass.getJavaClass().getMethods();
+      for(Method method: methods)
+      {
+         if(method.isAnnotationPresent(Deployment.class)) 
+         {
+            return method;
+         }
+      }
+      return null;
+   }
 }

Modified: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestClass.java
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestClass.java	2010-06-25 07:22:13 UTC (rev 4553)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestClass.java	2010-06-25 07:22:54 UTC (rev 4554)
@@ -17,11 +17,8 @@
 package org.jboss.arquillian.spi;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 
-import org.jboss.arquillian.api.Deployment;
 
-
 /**
  * Wraps a class to be run, providing method validation and annotation searching.
  * 
@@ -59,17 +56,4 @@
    {
       return testClass.getAnnotation(annotation);
    }
-   
-   public Method findDeploymentMethod() 
-   {
-      Method[] methods = testClass.getMethods();
-      for(Method method: methods)
-      {
-         if(method.isAnnotationPresent(Deployment.class)) 
-         {
-            return method;
-         }
-      }
-      return null;
-   }
 }