You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by rd...@apache.org on 2012/02/24 11:53:07 UTC
git commit: DELTASPIKE-94: Most of tests changed (not
BeanManagerProviderTest due to a problem)
Updated Branches:
refs/heads/master 959494676 -> b07a52c9e
DELTASPIKE-94: Most of tests changed (not BeanManagerProviderTest due to a problem)
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/b07a52c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/b07a52c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/b07a52c9
Branch: refs/heads/master
Commit: b07a52c9ebcf8b5c23a6cbccad44ba85f5f670f7
Parents: 9594946
Author: Rudy De Busscher <rd...@gmail.com>
Authored: Fri Feb 24 11:51:58 2012 +0100
Committer: Rudy De Busscher <rd...@gmail.com>
Committed: Fri Feb 24 11:51:58 2012 +0100
----------------------------------------------------------------------
.../api/alternative/local/BdaAlternativeTest.java | 2 +-
.../test/core/api/exclude/ExcludeTest.java | 6 +++---
.../test/core/api/provider/BeanProviderTest.java | 2 +-
.../test/core/impl/util/JndiUtilsTest.java | 10 +++++-----
.../core/api/exclude/ExcludeIntegrationTest.java | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b07a52c9/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 42296a5..4156a4c 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
@@ -58,7 +58,7 @@ public class BdaAlternativeTest
"org.apache.deltaspike.test.category",
"org.apache.deltaspike.test.core.api.alternative"},
new String[]{"META-INF.config"}))
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsManifestResource(EmptyAsset.INSTANCE, "GlobalAlternativeTest.INFO");
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b07a52c9/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
index 444ff51..595e78c 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
@@ -19,8 +19,6 @@
package org.apache.deltaspike.test.core.api.exclude;
-import javax.enterprise.inject.spi.Extension;
-
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.impl.exclude.ExcludeExtension;
import org.apache.deltaspike.core.util.ProjectStageProducer;
@@ -34,6 +32,8 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.enterprise.inject.spi.Extension;
+
/**
* Tests for {@link org.apache.deltaspike.core.api.exclude.Exclude}
*/
@@ -56,7 +56,7 @@ public class ExcludeTest
"org.apache.deltaspike.test.category",
"org.apache.deltaspike.test.core.api.exclude"},
null))
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsServiceProvider(Extension.class, ExcludeExtension.class);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b07a52c9/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
index d5d26ef..9850d4e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
@@ -48,7 +48,7 @@ public class BeanProviderTest
"org.apache.deltaspike.test.category",
"org.apache.deltaspike.test.core.api.provider"},
null))
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b07a52c9/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 e0cf6bb..df24987 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
@@ -18,10 +18,6 @@
*/
package org.apache.deltaspike.test.core.impl.util;
-import static org.junit.Assert.assertNotNull;
-
-import javax.enterprise.inject.spi.BeanManager;
-
import org.apache.deltaspike.core.impl.util.JndiUtils;
import org.apache.deltaspike.test.category.WebProfileCategory;
import org.apache.deltaspike.test.core.api.temptestutil.ShrinkWrapArchiveUtil;
@@ -34,6 +30,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import javax.enterprise.inject.spi.BeanManager;
+
+import static org.junit.Assert.assertNotNull;
+
@RunWith(Arquillian.class)
@Category(WebProfileCategory.class)
public class JndiUtilsTest
@@ -47,7 +47,7 @@ public class JndiUtilsTest
"META-INF/beans.xml",
new String[] { "org.apache.deltaspike" },
null))
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b07a52c9/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
index 0739ee7..06c147e 100644
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
@@ -77,7 +77,7 @@ public class ExcludeIntegrationTest
"META-INF/apache-deltaspike.properties")
.addAsResource(FileUtils.getFileForURL(testExtensionsFileUrl.toString()),
"META-INF/services/javax.enterprise.inject.spi.Extension")
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
}
/**