diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java index fca2f08db..e028c83ef 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java +++ b/config-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 action = get("/action"); diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterBindingTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterBindingTest.java index cfd21913a..d3f76cfc6 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterBindingTest.java +++ b/config-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 action = get("/param/christian/"); diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterMatchesTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterMatchesTest.java index 191dd5c8f..5585b9f1d 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/param/ParameterMatchesTest.java +++ b/config-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 action = get("/param/abcd/"); @@ -42,7 +40,6 @@ public void testMatchesWithValidUrl() throws Exception } @Test - @Ignore public void testMatchesWithInvalidUrl() throws Exception { HttpAction 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 index 5ba7d2a6e..61d25cdbe 100644 --- 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");