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/01 21:41:37 UTC
[3/3] git commit: test cleanup
test cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/4f7d702e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/4f7d702e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/4f7d702e
Branch: refs/heads/master
Commit: 4f7d702eb32a43a35cf3ade16a06f3ef6a375b08
Parents: ba9240b
Author: Mark Struberg <st...@apache.org>
Authored: Mon Oct 1 20:05:46 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Oct 1 20:05:46 2012 +0200
----------------------------------------------------------------------
.../test/core/api/context/AbstractContextTest.java | 6 +++---
.../apache/deltaspike/test/util/ArchiveUtils.java | 13 +------------
2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4f7d702e/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 4f3b422..ea0c6d8 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
@@ -51,14 +51,14 @@ public class AbstractContextTest
JavaArchive testJar = ShrinkWrap
.create(JavaArchive.class, "abstractContextTest.jar")
.addPackage(AbstractContextTest.class.getPackage())
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsServiceProvider(Extension.class, DummyScopeExtension.class);
return ShrinkWrap
.create(WebArchive.class, "abstractContextTest.war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
.addAsLibraries(testJar)
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
- .addAsServiceProvider(Extension.class, DummyScopeExtension.class);
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4f7d702e/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
index f97dcef..90392c3 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
@@ -32,19 +32,9 @@ public class ArchiveUtils
public static JavaArchive[] getDeltaSpikeCoreAndSecurityArchive()
{
- //X TODO remove this workaround - lightguard.jp We don't need the work around, we have to have the META-INF/beans.xml for all containers
- //boolean isOwbAvailable = ClassUtils.tryToLoadClassForName("org.apache.webbeans.spi.ContainerLifecycle") != null;
-
String[] excludedFiles;
- //if (isOwbAvailable)
- //{
- excludedFiles = new String[]{"META-INF.apache-deltaspike.properties"};
- //}
- //else
- //{
- // excludedFiles = new String[]{"META-INF.apache-deltaspike.properties", "META-INF.beans.xml"};
- //}
+ excludedFiles = new String[]{"META-INF.apache-deltaspike.properties"};
return ShrinkWrapArchiveUtil.getArchives(null,
@@ -54,7 +44,6 @@ public class ArchiveUtils
public static Asset getBeansXml()
{
- @SuppressWarnings("UnnecessaryLocalVariable")
Asset beansXml = new StringAsset(
"<beans>" +
"<interceptors>" +