Fixed test packaging issue and enabled all the config-annotations tests

ocpsoft · Sep 1, 2012 · cc0262a · cc0262a
1 parent ac0134a
commit cc0262a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/...ig-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java b/...ig-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java
@@ -8,7 +8,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ocpsoft.rewrite.annotation.RewriteAnnotationTest;
@@ -33,7 +32,6 @@ public static WebArchive getDeployment()
    }
 
    @Test
-   @Ignore
    public void testRequestAction() throws Exception
    {
       HttpAction<HttpGet> action = get("/action");

diff --git a/...-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterBindingTest.java b/...-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterBindingTest.java
@@ -8,7 +8,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ocpsoft.rewrite.annotation.RewriteAnnotationTest;
@@ -33,7 +32,6 @@ public static WebArchive getDeployment()
    }
 
    @Test
-   @Ignore
    public void testParameterBindingAnnotation() throws Exception
    {
       HttpAction<HttpGet> action = get("/param/christian/");

diff --git a/...-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterMatchesTest.java b/...-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterMatchesTest.java
@@ -8,7 +8,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ocpsoft.rewrite.annotation.RewriteAnnotationTest;
@@ -33,7 +32,6 @@ public static WebArchive getDeployment()
    }
 
    @Test
-   @Ignore
    public void testMatchesWithValidUrl() throws Exception
    {
       HttpAction<HttpGet> action = get("/param/abcd/");
@@ -42,7 +40,6 @@ public void testMatchesWithValidUrl() throws Exception
    }
 
    @Test
-   @Ignore
    public void testMatchesWithInvalidUrl() throws Exception
    {
       HttpAction<HttpGet> action = get("/param/abcde/");

diff --git a/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTest.java b/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTest.java
@@ -212,9 +212,14 @@ protected static JavaArchive getRewriteAnnotationsArchive()
 		{
          archive.addAsResource(new File("../config-annotations-api/target/classes/org"))
             .addAsResource(new File("../config-annotations-impl/target/classes/org"))
-            .addAsResource(new File("../config-annotations-impl/target/classes/META-INF"))
-            .addAsResource(new File("../config-annotations/target/classes/org"))
-            .addAsResource(new File("../config-annotations/target/classes/META-INF"));
+            .addAsResource(new File("../config-annotations-impl/target/classes/META-INF"));
+
+         // if 'config-annotations' is currently tested, don't add it here, because it will be added via getCurrentArchive()
+         if(!new File("target/classes").getAbsolutePath().contains("config-annotations")) {
+            archive.addAsResource(new File("../config-annotations/target/classes/org"))
+               .addAsResource(new File("../config-annotations/target/classes/META-INF"));
+         }
+
       }
 
       return archive.addAsResource(new StringAsset("placeholder"), "README");