[jboss-svn-commits] JBoss Common SVN: r3774 - in arquillian/trunk: impl-base/src/main/java/org/jboss/arquillian/impl/container and 2 other directories.

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

Author: aslak
Date: 2009-11-24 08:16:30 -0500 (Tue, 24 Nov 2009)
New Revision: 3774

Added:
   arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/TestEnrichers.java
Removed:
   arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/TestEnrichers.java
Modified:
   arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java
   arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestEnricher.java
Log:
ARQ-24 Moved TestEnrichers helper to spi.util

Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java	2009-11-24 13:03:10 UTC (rev 3773)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java	2009-11-24 13:16:30 UTC (rev 3774)
@@ -19,8 +19,8 @@
 import java.lang.reflect.Method;
 
 import org.jboss.arquillian.impl.container.Controlable;
-import org.jboss.arquillian.impl.container.TestEnrichers;
 import org.jboss.arquillian.spi.TestMethodExecutor;
+import org.jboss.arquillian.spi.util.TestEnrichers;
 import org.jboss.shrinkwrap.api.Archive;
 
 /**
@@ -46,7 +46,7 @@
    private Controlable containerController;
    private Deployer containerDeployer;
    
-   public DeployableTest(Controlable containerController, Deployer containerDeployer)
+   DeployableTest(Controlable containerController, Deployer containerDeployer)
    {
       this.containerController = containerController;
       this.containerDeployer = containerDeployer;
@@ -80,7 +80,7 @@
 
    public void run(TestMethodExecutor executor) throws Throwable 
    {
-      if(inContainer) 
+      if(DeployableTest.isInContainer()) 
       {
          injectClass(executor.getInstance());
          executor.invoke();
@@ -91,12 +91,12 @@
       }
    }
    
-   void injectClass(Object testCase) 
+   private void injectClass(Object testCase) 
    {
       TestEnrichers.enrich(testCase);
    }
    
-   void invokeMethod(Method testMethod, Class<?> testCase) 
+   private void invokeMethod(Method testMethod, Class<?> testCase) 
    {
    }
 

Deleted: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/TestEnrichers.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/TestEnrichers.java	2009-11-24 13:03:10 UTC (rev 3773)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/TestEnrichers.java	2009-11-24 13:16:30 UTC (rev 3774)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.arquillian.impl.container;
-
-import java.util.ServiceLoader;
-
-import org.jboss.arquillian.spi.TestEnricher;
-
-/**
- * TestEnrichers
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public class TestEnrichers
-{
-   private TestEnrichers() {}
-
-   public static void enrich(Object testCase) 
-   {
-      ServiceLoader<TestEnricher> serviceLoader = ServiceLoader.load(TestEnricher.class);
-      for(TestEnricher enricher : serviceLoader) 
-      {
-         enricher.enrich(testCase);
-      }
-   }
-}

Modified: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestEnricher.java
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestEnricher.java	2009-11-24 13:03:10 UTC (rev 3773)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/TestEnricher.java	2009-11-24 13:16:30 UTC (rev 3774)
@@ -24,5 +24,9 @@
  */
 public interface TestEnricher
 {
+   /**
+    * 
+    * @param testCase
+    */
    void enrich(Object testCase);
 }

Copied: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/TestEnrichers.java (from rev 3732, arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/TestEnrichers.java)
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/TestEnrichers.java	                        (rev 0)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/TestEnrichers.java	2009-11-24 13:16:30 UTC (rev 3774)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.spi.util;
+
+import org.jboss.arquillian.spi.TestEnricher;
+
+/**
+ * TestEnrichers
+ * 
+ * Helper for enriching TestCase instances based on multiple TestEnrichers.
+ * 
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class TestEnrichers
+{
+   private TestEnrichers() {}
+
+   /**  
+    * Enrich a object based on all found TestEnricher providers.
+    * 
+    * @param testCase The object that should be enriched.
+    */
+   public static void enrich(Object testCase) 
+   {
+      DefaultServiceLoader<TestEnricher> serviceLoader = DefaultServiceLoader.load(TestEnricher.class);
+      for(TestEnricher enricher : serviceLoader) 
+      {
+         enricher.enrich(testCase);
+      }
+   }
+}