deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [2/2] deltaspike git commit: DELTASPIKE-823 deactivate tests for tomee
Date Sat, 14 Feb 2015 11:06:46 GMT
DELTASPIKE-823 deactivate tests for tomee

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

Branch: refs/heads/master
Commit: bf7fe608511c07a5e231b631f1decb18d2c2d47e
Parents: 20dde8f
Author: Thomas Andraschko <tandraschko@apache.org>
Authored: Sat Feb 14 12:06:35 2015 +0100
Committer: Thomas Andraschko <tandraschko@apache.org>
Committed: Sat Feb 14 12:06:35 2015 +0100

----------------------------------------------------------------------
 .../core/api/partialbean/uc005/ScopedPartialBeanTest.java     | 7 +++++--
 .../test/core/api/partialbean/uc008/PartialBeanTest.java      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bf7fe608/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc005/ScopedPartialBeanTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc005/ScopedPartialBeanTest.java
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc005/ScopedPartialBeanTest.java
index 6f61984..a80179c 100644
--- a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc005/ScopedPartialBeanTest.java
+++ b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc005/ScopedPartialBeanTest.java
@@ -37,11 +37,13 @@ import org.junit.runner.RunWith;
 public class ScopedPartialBeanTest
 {
     private static final String CONTAINER_OWB_1_2_x_BEFORE_1_2_8 = "owb-1\\.2\\.[0-7]";
+    private static final String CONTAINER_TOMEE_1_7_x = "tomee-1\\.7\\..*";
 
     @Deployment
     public static WebArchive war()
     {
-        if (CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8))
+        if (CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8)
+                || CdiContainerUnderTest.is(CONTAINER_TOMEE_1_7_x))
         {
             return ShrinkWrap.create(WebArchive.class, "empty.war");
         }
@@ -66,7 +68,8 @@ public class ScopedPartialBeanTest
     public void testPartialBeanWithApplicationScope() throws Exception
     {
         // this test is known to not work under OWB 1.2.0 till 1.2.7 - see OWB #1036
-        Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8));
+        Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8)
+                && !CdiContainerUnderTest.is(CONTAINER_TOMEE_1_7_x));
 
         String result = BeanProvider.getContextualReference(ApplicationScopedPartialBean.class).willFail();
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bf7fe608/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/PartialBeanTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/PartialBeanTest.java
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/PartialBeanTest.java
index d96791f..7a606af 100644
--- a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/PartialBeanTest.java
+++ b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/PartialBeanTest.java
@@ -36,11 +36,13 @@ import org.junit.runner.RunWith;
 public class PartialBeanTest
 {
     private static final String CONTAINER_OWB_1_2_x_BEFORE_1_2_8 = "owb-1\\.2\\.[0-7]";
+    private static final String CONTAINER_TOMEE_1_7_x = "tomee-1\\.7\\..*";
     
     @Deployment
     public static WebArchive war()
     {
-        if (CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8))
+        if (CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8)
+                || CdiContainerUnderTest.is(CONTAINER_TOMEE_1_7_x))
         {
             return ShrinkWrap.create(WebArchive.class, "empty.war");
         }
@@ -65,7 +67,8 @@ public class PartialBeanTest
     public void testPartialBeanWithApplicationScope() throws Exception
     {
         // this test is known to not work under OWB 1.2.0 till 1.2.7 - see OWB #1036
-        Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8));
+        Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_2_x_BEFORE_1_2_8)
+                && !CdiContainerUnderTest.is(CONTAINER_TOMEE_1_7_x));
         
         PartialBean bean = BeanProvider.getContextualReference(PartialBean.class);
         bean.test(this);            


Mime
View raw message