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/01/10 02:00:11 UTC
git commit: only use core- and the needed test-classes for the
integration tests
Updated Branches:
refs/heads/master ddabd35cd -> 46b50c6cb
only use core- and the needed test-classes
for the integration 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/46b50c6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/46b50c6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/46b50c6c
Branch: refs/heads/master
Commit: 46b50c6cbec118c3b257ad15a209885e88e8a88a
Parents: ddabd35
Author: gpetracek <gp...@apache.org>
Authored: Tue Jan 10 01:55:47 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Tue Jan 10 01:55:47 2012 +0100
----------------------------------------------------------------------
.../core/api/provider/BeanManagerProviderTest.java | 2 +-
.../impl/activation/TestClassDeactivation.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/46b50c6c/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
index d90b777..3aafca8 100644
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
@@ -50,7 +50,7 @@ public class BeanManagerProviderTest
return ShrinkWrap.create(WebArchive.class)
.addAsLibraries(ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[] {"org.apache.deltaspike"},
+ new String[] {"org.apache.deltaspike.core"},
null))
.addClass(TestBean.class)
// Must add the categories to the archive
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/46b50c6c/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
index 2455d8d..632e9fc 100644
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
@@ -19,7 +19,9 @@
package org.apache.deltaspike.integration.core.impl.activation;
import org.apache.deltaspike.core.impl.util.ClassDeactivation;
+import org.apache.deltaspike.integration.FullProfileCategory;
import org.apache.deltaspike.integration.SeCategory;
+import org.apache.deltaspike.integration.WebProfileCategory;
import org.apache.deltaspike.integration.testutil.ShrinkWrapArchiveUtil;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
@@ -53,9 +55,12 @@ public class TestClassDeactivation
return ShrinkWrap.create(WebArchive.class)
.addAsLibraries(ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[]{"org.apache.deltaspike.integration.core.impl.activation"},
+ new String[]{"org.apache.deltaspike.core"},
null))
.addAsResource(new File(fileUrl.getFile()))
+ .addClasses(ActivatedClass.class, DeactivatedClass.class, TestClassDeactivator.class)
+ // Must add the categories to the archive
+ .addClasses(SeCategory.class, WebProfileCategory.class, FullProfileCategory.class)
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
}