deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject deltaspike git commit: DELTASPIKE-996 exclude testInjectConfig in case of the wls-test-profiles
Date Sun, 11 Oct 2015 11:58:36 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master c7555daae -> 138c8b328


DELTASPIKE-996 exclude testInjectConfig in case of the wls-test-profiles


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/138c8b32
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/138c8b32
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/138c8b32

Branch: refs/heads/master
Commit: 138c8b328abb8350f2a865c59c7ba81dc3832fab
Parents: c7555da
Author: gpetracek <gpetracek@apache.org>
Authored: Sun Oct 11 13:57:12 2015 +0200
Committer: gpetracek <gpetracek@apache.org>
Committed: Sun Oct 11 13:57:12 2015 +0200

----------------------------------------------------------------------
 .../propertyconfigsource/BaseTestConfigProperty.java    |  7 -------
 deltaspike/parent/code/pom.xml                          | 12 ++++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/138c8b32/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
index 50c4e19..61ababe 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
@@ -20,15 +20,11 @@ package org.apache.deltaspike.test.core.api.config.propertyconfigsource;
 
 import javax.inject.Inject;
 
-import org.apache.deltaspike.test.utils.CdiContainerUnderTest;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 
 public class BaseTestConfigProperty
 {
-    private static final String CONTAINER_WLS12 = "wls-12.*";
-
     protected final static String CONFIG_FILE_NAME = "myconfig.properties";
 
     @Inject
@@ -37,9 +33,6 @@ public class BaseTestConfigProperty
     @Test
     public void testInjectConfig()
     {
-        //needed until DELTASPIKE-996 is resolved across containers
-        Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WLS12));
-
         Assert.assertEquals("psAwareStringValue", myBean.getStringConfig());
         Assert.assertEquals("DEFAULT", myBean.getStringConfigWithDefault());
         Assert.assertEquals("stringValue", myBean.getStringConfigWithoutProjectStage());

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/138c8b32/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 18b9cd8..f48f692 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -1109,6 +1109,12 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven.surefire.plugin.version}</version>
                         <configuration>
+                            <!-- until DELTASPIKE-996 is resolved -->
+                            <excludes>
+                                <exclude>**/BaseTestConfigProperty.java</exclude>
+                                <exclude>**/ConfigPropertyWARTest.java</exclude>
+                                <exclude>**/ConfigPropertyEARTest.java</exclude>
+                            </excludes>
                             <systemProperties>
                                 <arquillian.launch>wls-remote-12c</arquillian.launch>
                                 <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
@@ -1165,6 +1171,12 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven.surefire.plugin.version}</version>
                         <configuration>
+                            <!-- until DELTASPIKE-996 is resolved -->
+                            <excludes>
+                                <exclude>**/BaseTestConfigProperty.java</exclude>
+                                <exclude>**/ConfigPropertyWARTest.java</exclude>
+                                <exclude>**/ConfigPropertyEARTest.java</exclude>
+                            </excludes>
                             <systemProperties>
                                 <arquillian.launch>wls-managed-12c</arquillian.launch>
                                 <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>


Mime
View raw message