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 2015/10/07 23:08:22 UTC
[2/3] deltaspike git commit: DELTASPIKE-996 exclude testInjectConfig
in case of the wls-test-profile
DELTASPIKE-996 exclude testInjectConfig in case of the wls-test-profile
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/78f62457
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/78f62457
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/78f62457
Branch: refs/heads/master
Commit: 78f6245797794c12eca26f7a840805f882a3b32b
Parents: bb5b646
Author: gpetracek <gp...@apache.org>
Authored: Wed Oct 7 23:01:08 2015 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Wed Oct 7 23:07:10 2015 +0200
----------------------------------------------------------------------
.../config/propertyconfigsource/BaseTestConfigProperty.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/78f62457/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 18377b4..50c4e19 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,11 +20,14 @@ 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";
@@ -34,6 +37,9 @@ 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());