deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rafab...@apache.org
Subject git commit: DELTASPIKE-370 - Conditional tests based on CDI Impl version range
Date Tue, 03 Jun 2014 16:00:53 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 8ddc8d4e0 -> 5b2d19379


DELTASPIKE-370 - Conditional tests based on CDI Impl version range


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

Branch: refs/heads/master
Commit: 5b2d1937995f605e3570d982e02f4c37b63788e2
Parents: 8ddc8d4
Author: Rafael Benevides <rafabene@gmail.com>
Authored: Mon Jun 2 17:30:56 2014 -0300
Committer: Rafael Benevides <rafabene@gmail.com>
Committed: Tue Jun 3 12:51:21 2014 -0300

----------------------------------------------------------------------
 deltaspike/cdictrl/impl-weld/pom.xml            |   6 +
 deltaspike/cdictrl/tck/pom.xml                  |   8 ++
 .../cdise/tck/ContainerCtrlTckTest.java         |  24 +++-
 .../tck/control/LockedCDIImplementation.java    |  47 ++++++++
 .../tck/control/LockedContainerVersions.java    |  31 +++++
 .../cdise/tck/control/LockedVersionRange.java   |  44 +++++++
 .../cdise/tck/control/VersionControlRule.java   | 115 +++++++++++++++++++
 deltaspike/parent/pom.xml                       |   1 +
 deltaspike/test-utils/pom.xml                   |   6 +
 .../test/utils/CdiContainerUnderTest.java       |  52 +++++++--
 .../test/utils/CdiImplementation.java           |  20 ++--
 11 files changed, 329 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/impl-weld/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/pom.xml b/deltaspike/cdictrl/impl-weld/pom.xml
index 255e140..cc69d5a 100644
--- a/deltaspike/cdictrl/impl-weld/pom.xml
+++ b/deltaspike/cdictrl/impl-weld/pom.xml
@@ -57,6 +57,12 @@
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.test</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/tck/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/pom.xml b/deltaspike/cdictrl/tck/pom.xml
index fcc55b2..6ab91c0 100644
--- a/deltaspike/cdictrl/tck/pom.xml
+++ b/deltaspike/cdictrl/tck/pom.xml
@@ -82,6 +82,14 @@
             <artifactId>deltaspike-cdictrl-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.test</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
index fc1e101..e719210 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
@@ -19,24 +19,34 @@
 package org.apache.deltaspike.cdise.tck;
 
 
+import java.util.Set;
+
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
 import org.apache.deltaspike.cdise.api.CdiContainer;
 import org.apache.deltaspike.cdise.api.CdiContainerLoader;
 import org.apache.deltaspike.cdise.tck.beans.Car;
 import org.apache.deltaspike.cdise.tck.beans.CarRepair;
 import org.apache.deltaspike.cdise.tck.beans.TestUser;
+import org.apache.deltaspike.cdise.tck.control.LockedCDIImplementation;
+import org.apache.deltaspike.cdise.tck.control.LockedVersionRange;
+import org.apache.deltaspike.cdise.tck.control.VersionControlRule;
+import org.apache.deltaspike.test.utils.CdiImplementation;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import java.util.Set;
-
 /**
  * TCK test for the {@link org.apache.deltaspike.cdise.api.CdiContainer}
  */
 public class ContainerCtrlTckTest
 {
+
+    @Rule
+    public VersionControlRule versionControlRule = new VersionControlRule();
+
     @Test
     public void testContainerBoot()
     {
@@ -158,6 +168,10 @@ public class ContainerCtrlTckTest
     }
 
     @Test
+    @LockedCDIImplementation(versions = {
+            @LockedVersionRange(implementation = CdiImplementation.WELD11, versionRange =
"[1.1.14,1.2)"),
+            @LockedVersionRange(implementation = CdiImplementation.WELD20, versionRange =
"[2.0.1.Final,2.1)")
+            })
     public void testShutdownWithInactiveContexts()
     {
         CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedCDIImplementation.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedCDIImplementation.java
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedCDIImplementation.java
new file mode 100644
index 0000000..3d51d0a
--- /dev/null
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedCDIImplementation.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.cdise.tck.control;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.deltaspike.test.utils.CdiImplementation;
+
+/**
+ * This annotation is used to define the {@link #cdiImplementations()} which the test is
allowed to run. 
+ * 
+ * If {@link #cdiImplementations()} is not defined, It will be used all available implementations

+ * defined on {@link CdiImplementation}.
+ * 
+ * An specific implementation can have {@link #versions()} range locked throught the use
of {@link LockedVersionRange}
+ * @author rafaelbenevides
+ *
+ */
+@Target(value = { ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LockedCDIImplementation
+{
+
+    CdiImplementation[] cdiImplementations() default { CdiImplementation.OWB11, CdiImplementation.OWB12,
+            CdiImplementation.WELD11, CdiImplementation.WELD12, CdiImplementation.WELD20
};
+
+    LockedVersionRange[] versions() default { };
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedContainerVersions.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedContainerVersions.java
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedContainerVersions.java
new file mode 100644
index 0000000..25ba212
--- /dev/null
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedContainerVersions.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.cdise.tck.control;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(value = { ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LockedContainerVersions
+{
+
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedVersionRange.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedVersionRange.java
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedVersionRange.java
new file mode 100644
index 0000000..1972374
--- /dev/null
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/LockedVersionRange.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.cdise.tck.control;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.deltaspike.test.utils.CdiImplementation;
+
+/**
+ * It allows to specify the version range that the test is allowed to run for an specified
{@link #implementation()}.
+ * 
+ * The {@link #versionRange()} attribute uses the Maven version range pattern
+ * @author rafaelbenevides
+ *
+ */
+@Target(value = { ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LockedVersionRange
+{
+
+    CdiImplementation implementation();
+
+    String versionRange();
+
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/VersionControlRule.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/VersionControlRule.java
b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/VersionControlRule.java
new file mode 100644
index 0000000..7a40f15
--- /dev/null
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/control/VersionControlRule.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.cdise.tck.control;
+
+import org.apache.deltaspike.test.utils.CdiContainerUnderTest;
+import org.apache.deltaspike.test.utils.CdiImplementation;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+
+/** 
+ * 
+ * This {@link TestRule} allows an test to check those methods annotated with {@link LockedCDIImplementation}.
+ * 
+ * You can define some {@link LockedCDIImplementation}. Example: 
+ * 
+ * <pre>
+ *     @LockedCDIImplementation(cdiImplementations = {
+ *           CdiImplementation.OWB11,
+ *           CdiImplementation.OWB12
+ *   })
+ * </pre>
+ *  
+ * 
+ * You can also define specific versions of an specific implementation. Example:
+ * 
+ * <pre>
+ *     @LockedCDIImplementation(versions = {
+ *           @LockedVersionRange(implementation = CdiImplementation.WELD11, versionRange
= "[1.1.13,1.2)"),
+ *           @LockedVersionRange(implementation = CdiImplementation.WELD20, versionRange
= "[2.0.1.Final,2.1)")
+ *           })
+ * </pre>
+ * 
+ * @author rafaelbenevides
+ *
+ */
+public class VersionControlRule implements TestRule
+{
+
+    @Override
+    public Statement apply(final Statement base, final Description description)
+    {
+        return new Statement()
+        {
+
+            @Override
+            public void evaluate() throws Throwable
+            {
+                LockedCDIImplementation lockedCDIImplAnnotation = description
+                        .getAnnotation(LockedCDIImplementation.class);
+                // no @LockedCDIImplementation present or if running specified Container
+                if (lockedCDIImplAnnotation == null)
+                {
+                    base.evaluate();
+                }
+                else
+                {
+                    checkAnnotation(lockedCDIImplAnnotation, base);
+                }
+            }
+
+            private void checkAnnotation(LockedCDIImplementation lockedCDIImplAnnotation,
Statement base)
+                throws Throwable
+            {
+                CdiImplementation[] implementations = lockedCDIImplAnnotation.cdiImplementations();
+                for (CdiImplementation cdiImpl : implementations)
+                {
+                    String versionRange = getLockedVersionRange(lockedCDIImplAnnotation,
cdiImpl);
+                    if (CdiContainerUnderTest.isCdiVersion(cdiImpl, versionRange))
+                    {
+                        base.evaluate();
+                    }
+                }
+            }
+
+            /**
+             * Get the locked version Range
+             * 
+             * @param lockedCDIImplAnnotation
+             * @param cdiImpl
+             * @return the locked version range
+             */
+            private String getLockedVersionRange(LockedCDIImplementation lockedCDIImplAnnotation,
+                    CdiImplementation cdiImpl)
+            {
+                LockedVersionRange[] versions = lockedCDIImplAnnotation.versions();
+                for (LockedVersionRange versionRange : versions)
+                {
+                    if (versionRange.implementation().equals(cdiImpl))
+                    {
+                        return versionRange.versionRange();
+                    }
+                }
+                return null;
+            }
+        };
+    }
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 86b1ed0..7cdedbe 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -86,6 +86,7 @@
         <maven.checkstyle.plugin.version>2.9.1</maven.checkstyle.plugin.version>
         <maven.compiler.plugin.version>2.5</maven.compiler.plugin.version>
         <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
+        <maven.artifact.version>3.0</maven.artifact.version>
 
         <hamcrest.version>1.3</hamcrest.version>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/pom.xml b/deltaspike/test-utils/pom.xml
index e203944..53a832c 100644
--- a/deltaspike/test-utils/pom.xml
+++ b/deltaspike/test-utils/pom.xml
@@ -47,6 +47,12 @@
             <artifactId>arquillian-container-test-spi</artifactId>
             <version>${arquillian.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${maven.artifact.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java
b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java
index d39471c..90f86da 100644
--- a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java
+++ b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java
@@ -24,9 +24,12 @@ import java.security.PrivilegedAction;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
+
 /**
- * A small helper class which checks if the container
- * which is currently being tested matches the given version RegExp
+ * A small helper class which checks if the container which is currently being tested matches
the given version RegExp
  */
 public class CdiContainerUnderTest
 {
@@ -37,8 +40,9 @@ public class CdiContainerUnderTest
 
     /**
      * Checks whether the current container matches the given version regexps.
-     * @param containerRegExps container versions to test against.
-     *                         e.g. 'owb-1\\.0\\..*' or 'weld-2\\.0\\.0\\..*'
+     * 
+     * @param containerRegExps
+     *            container versions to test against. e.g. 'owb-1\\.0\\..*' or 'weld-2\\.0\\.0\\..*'
      */
     public static boolean is(String... containerRegExps)
     {
@@ -60,9 +64,19 @@ public class CdiContainerUnderTest
         return false;
     }
 
-    //TODO discuss merge with #is (there 'cdicontainer.version' isn't available in all cases)
-    public static boolean isCdiVersion(CdiImplementation cdiImplementation)
+    /**
+     * Verify if the runtime is using the following CdiImplementation
+     * 
+     * @param cdiImplementation
+     * @param versionRange
+     *            optional - If not defined it will used the range defined on {@link CdiImplementation}
+     * @return
+     * @throws InvalidVersionSpecificationException
+     */
+    public static boolean isCdiVersion(CdiImplementation cdiImplementation, String versionRange)
+        throws InvalidVersionSpecificationException
     {
+
         Class implementationClass = tryToLoadClassForName(cdiImplementation.getImplementationClassName());
 
         if (implementationClass == null)
@@ -70,8 +84,10 @@ public class CdiContainerUnderTest
             return false;
         }
 
-        String containerVersion = getJarVersion(implementationClass);
-        return containerVersion != null && containerVersion.matches(cdiImplementation.getVersionRegex());
+        VersionRange range = VersionRange.createFromVersionSpec(versionRange == null ? cdiImplementation
+                .getVersionRange() : versionRange);
+        String containerVersion = getJarSpecification(implementationClass);
+        return containerVersion != null && range.containsVersion(new DefaultArtifactVersion(containerVersion));
     }
 
     private static Class tryToLoadClassForName(String name)
@@ -82,7 +98,7 @@ public class CdiContainerUnderTest
         }
         catch (ClassNotFoundException e)
         {
-            //do nothing - it's just a try
+            // do nothing - it's just a try
             return null;
         }
     }
@@ -147,6 +163,21 @@ public class CdiContainerUnderTest
         }
     }
 
+    private static String getJarSpecification(Class targetClass)
+    {
+        String manifestFileLocation = getManifestFileLocationOfClass(targetClass);
+
+        try
+        {
+            return new Manifest(new URL(manifestFileLocation).openStream())
+                    .getMainAttributes().getValue(Attributes.Name.SPECIFICATION_VERSION);
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
     private static String getManifestFileLocationOfClass(Class targetClass)
     {
         String manifestFileLocation;
@@ -157,7 +188,7 @@ public class CdiContainerUnderTest
         }
         catch (Exception e)
         {
-            //in this case we have a proxy
+            // in this case we have a proxy
             manifestFileLocation = getManifestLocation(targetClass.getSuperclass());
         }
         return manifestFileLocation;
@@ -175,6 +206,7 @@ public class CdiContainerUnderTest
     private static class GetClassLoaderAction implements PrivilegedAction<ClassLoader>
     {
         private Object object;
+
         GetClassLoaderAction(Object object)
         {
             this.object = object;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b2d1937/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiImplementation.java
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiImplementation.java
b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiImplementation.java
index b11b747..9f95934 100644
--- a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiImplementation.java
+++ b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiImplementation.java
@@ -20,20 +20,20 @@ package org.apache.deltaspike.test.utils;
 
 public enum CdiImplementation
 {
-    OWB11 ("org.apache.webbeans.container.BeanManagerImpl", "1\\.1\\..*"),
-    OWB12 ("org.apache.webbeans.container.BeanManagerImpl", "1\\.2\\..*"),
+    OWB11 ("org.apache.webbeans.container.BeanManagerImpl", "[1.1,1.2)"),
+    OWB12 ("org.apache.webbeans.container.BeanManagerImpl", "[1.2,1.3)"),
 
-    WELD11("org.jboss.weld.manager.BeanManagerImpl", "1\\.1\\..*"),
-    WELD12("org.jboss.weld.manager.BeanManagerImpl", "1\\.2\\..*"),
-    WELD20("org.jboss.weld.manager.BeanManagerImpl", "2\\.0\\..*");
+    WELD11("org.jboss.weld.manager.BeanManagerImpl", "[1.1,1.2)"),
+    WELD12("org.jboss.weld.manager.BeanManagerImpl", "[1.2,1.3)"),
+    WELD20("org.jboss.weld.manager.BeanManagerImpl", "[2.0,2.1)");
 
     private final String implementationClassName;
-    private final String versionRegex;
+    private final String versionRange;
 
-    CdiImplementation(String implementationClassName, String versionRegex)
+    CdiImplementation(String implementationClassName, String versionRange)
     {
         this.implementationClassName = implementationClassName;
-        this.versionRegex = versionRegex;
+        this.versionRange = versionRange;
     }
 
     public String getImplementationClassName()
@@ -41,8 +41,8 @@ public enum CdiImplementation
         return implementationClassName;
     }
 
-    public String getVersionRegex()
+    public String getVersionRange()
     {
-        return versionRegex;
+        return versionRange;
     }
 }


Mime
View raw message