You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/03/20 02:02:14 UTC
[2/2] git commit: DELTASPIKE-125 refactored tests
DELTASPIKE-125 refactored tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/9372b2ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/9372b2ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/9372b2ce
Branch: refs/heads/master
Commit: 9372b2ce851bd87e37ba2fbdeb602eb584ddfffc
Parents: 7f880cd
Author: gpetracek <gp...@apache.org>
Authored: Tue Mar 20 01:51:00 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Tue Mar 20 01:51:00 2012 +0100
----------------------------------------------------------------------
.../api/alternative/local/BdaAlternativeTest.java | 11 ++++++++---
.../test/core/impl/util/JndiUtilsTest.java | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/9372b2ce/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
index 2ffba19..05edfc8 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
@@ -26,6 +26,7 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -60,13 +61,17 @@ public class BdaAlternativeTest
}
}.setTestMode();
+ JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "securedAnnotationTest.jar")
+ .addPackage("org.apache.deltaspike.test.category")
+ .addPackage("org.apache.deltaspike.test.core.api.alternative.local")
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
return ShrinkWrap.create(WebArchive.class, "bdaAlternative.war")
.addAsLibraries(ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[]{"org.apache.deltaspike.core",
- "org.apache.deltaspike.test.category",
- "org.apache.deltaspike.test.core.api.alternative"},
+ new String[]{"org.apache.deltaspike.core"},
new String[]{"META-INF.config"}))
+ .addAsLibraries(testJar)
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsManifestResource(EmptyAsset.INSTANCE, "GlobalAlternativeTest.INFO");
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/9372b2ce/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
index df5441c..deb9a73 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
@@ -58,7 +58,7 @@ public class JndiUtilsTest
return ShrinkWrap.create(WebArchive.class, "jndiUtils.war")
.addAsLibraries(ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[] { "org.apache.deltaspike" },
+ new String[] { "org.apache.deltaspike.core" },
null))
.addAsLibraries(testJar)
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");