Much better configuration system for TCK, clean up TCK SPI and API

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1453 1c488680-804c-0410-94cd-c6b725194a0e
weld · Feb 8, 2009 · 2b0735d · 2b0735d
1 parent e3b241a
commit 2b0735d
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 62 deletions.
diff --git a/porting-package/pom.xml b/porting-package/pom.xml
@@ -31,7 +31,6 @@
        <dependency>
          <groupId>javax.el</groupId>
          <artifactId>el-ri</artifactId>
-         <scope>test</scope>
       </dependency>
 
    </dependencies>

diff --git a/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java b/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java
diff --git a/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java b/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java
@@ -0,0 +1,25 @@
+package org.jboss.webbeans.porting;
+
+import javax.el.ELContext;
+
+import org.jboss.webbeans.mock.el.EL;
+
+public class ELImpl implements org.jboss.webbeans.tck.spi.EL
+{
+
+
+   @SuppressWarnings("unchecked")
+   public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
+   {
+      ELContext elContext = EL.createELContext();
+      return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
+   }
+
+   @SuppressWarnings("unchecked")
+   public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
+   {
+      ELContext elContext = EL.createELContext();
+      return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams);
+   }
+
+}
diff --git a/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java b/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java
@@ -0,0 +1,34 @@
+package org.jboss.webbeans.porting;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.inject.manager.Manager;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.mock.MockBootstrap;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
+import org.jboss.webbeans.tck.spi.StandaloneContainers;
+
+public class StandaloneContainersImpl implements StandaloneContainers
+{
+
+   public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes)
+   {
+      MockBootstrap bootstrap = new MockBootstrap();
+      ManagerImpl manager = bootstrap.getManager();
+      if (enabledDeploymentTypes != null)
+      {
+         manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
+      }
+      bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes));
+      bootstrap.boot();
+      return manager;
+   }
+
+   public Manager deploy(java.lang.Class<?>... classes) 
+   {
+      return deploy(null, classes);
+   }
+
+}
diff --git a/porting-package/src/main/resources/META-INF/web-beans-tck.properties b/porting-package/src/main/resources/META-INF/web-beans-tck.properties
@@ -1,4 +1,5 @@
 org.jboss.webbeans.tck.spi.Managers=org.jboss.webbeans.porting.ManagersImpl
 org.jboss.webbeans.tck.spi.Beans=org.jboss.webbeans.porting.BeansImpl
 org.jboss.webbeans.tck.spi.Contexts=org.jboss.webbeans.porting.ContextsImpl
-org.jboss.webbeans.tck.spi.Containers=org.jboss.webbeans.porting.ContainersImpl
+org.jboss.webbeans.tck.spi.StandaloneContainers=org.jboss.webbeans.porting.StandaloneContainersImpl
+org.jboss.webbeans.tck.spi.EL=org.jboss.webbeans.porting.ELImpl