You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/10/07 13:02:04 UTC
[2/4] git commit: DELTASPIKE-274 fix remote container tests
DELTASPIKE-274 fix remote container 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/2999b9f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/2999b9f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/2999b9f3
Branch: refs/heads/master
Commit: 2999b9f3a88b78bd9acb43fee50ce20bd6583f0d
Parents: 66fcfd7
Author: Mark Struberg <st...@apache.org>
Authored: Sun Oct 7 12:52:41 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Oct 7 12:52:41 2012 +0200
----------------------------------------------------------------------
.../test/core/api/context/AbstractContextTest.java | 3 +-
.../apache/deltaspike/test/util/ArchiveUtils.java | 25 ++++++++++++++-
.../services/javax.enterprise.inject.spi.Extension | 2 +
3 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2999b9f3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/context/AbstractContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/context/AbstractContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/context/AbstractContextTest.java
index ea0c6d8..f8e464a 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/context/AbstractContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/context/AbstractContextTest.java
@@ -50,7 +50,8 @@ public class AbstractContextTest
{
JavaArchive testJar = ShrinkWrap
.create(JavaArchive.class, "abstractContextTest.jar")
- .addPackage(AbstractContextTest.class.getPackage())
+ .addClass(AbstractContextTest.class)
+ .addClass(DummyBean.class)
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsServiceProvider(Extension.class, DummyScopeExtension.class);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2999b9f3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
index 77c6a72..4a2c818 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
@@ -18,7 +18,16 @@
*/
package org.apache.deltaspike.test.util;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.core.api.context.DummyContext;
+import org.apache.deltaspike.test.core.api.context.DummyScopeExtension;
+import org.apache.deltaspike.test.core.api.context.DummyScoped;
import org.apache.deltaspike.test.utils.ShrinkWrapArchiveUtil;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -33,9 +42,23 @@ public class ArchiveUtils
public static JavaArchive[] getDeltaSpikeCoreArchive(String[] excludedPackagesOrFiles)
{
- return ShrinkWrapArchiveUtil.getArchives(null,
+ // we also need quite some internal Arquillian classes on the client side
+ // this JAR has NO beans.xml to prevent class scanning!
+ JavaArchive extensionsJar = ShrinkWrap
+ .create(JavaArchive.class, "testExtensions.jar")
+ .addClass(ArchiveUtils.class)
+ .addClass(DummyScopeExtension.class)
+ .addClass(DummyScoped.class)
+ .addClass(DummyContext.class)
+ .addPackage(WebProfileCategory.class.getPackage());
+
+ JavaArchive[] coreArchives = ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
new String[]{"org.apache.deltaspike.core", "org.apache.deltaspike.test.category"},
excludedPackagesOrFiles);
+
+ List<JavaArchive> archives = new ArrayList<JavaArchive>(Arrays.asList(coreArchives));
+ archives.add(extensionsJar);
+ return archives.toArray(new JavaArchive[archives.size()]);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2999b9f3/deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index bdceba7..1abc48a 100644
--- a/deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -18,6 +18,8 @@
# We need to register the Extension on the classpath
# as many Arquillian containers do not yet pickup
# Extensions from a ShrinkWrap archive.
+# This is just PITA and shall get removed once all the
+# used arquillian-containerx connectors implement this properly!
# registers the DummyScope for the AbstractContextTest
org.apache.deltaspike.test.core.api.context.DummyScopeExtension