openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r940120 - in /openwebbeans/trunk: webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java webbeans-tck/standalone-suite.xml webbeans-tck/webprofile-suite.xml
Date Sat, 01 May 2010 22:21:56 GMT
Author: gerdogdu
Date: Sat May  1 22:21:55 2010
New Revision: 940120

URL: http://svn.apache.org/viewvc?rev=940120&view=rev
Log:
Strong TCK standalone and Java EE Web Profile testing.

Modified:
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
    openwebbeans/trunk/webbeans-tck/standalone-suite.xml
    openwebbeans/trunk/webbeans-tck/webprofile-suite.xml

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java?rev=940120&r1=940119&r2=940120&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
Sat May  1 22:21:55 2010
@@ -18,6 +18,8 @@ import javax.el.ArrayELResolver;
 import javax.el.BeanELResolver;
 import javax.el.CompositeELResolver;
 import javax.el.ELContext;
+import javax.el.ELContextEvent;
+import javax.el.ELContextListener;
 import javax.el.ELResolver;
 import javax.el.ExpressionFactory;
 import javax.el.FunctionMapper;
@@ -29,13 +31,17 @@ import javax.el.VariableMapper;
 import org.apache.el.ExpressionFactoryImpl;
 import org.apache.el.lang.FunctionMapperImpl;
 import org.apache.el.lang.VariableMapperImpl;
+import org.apache.webbeans.el.OwbElContextListener;
 import org.apache.webbeans.el.WebBeansELResolver;
+import org.apache.webbeans.el.WrappedExpressionFactory;
 import org.jboss.jsr299.tck.spi.EL;
 
 public class ELImpl implements EL
 {
-    private static ExpressionFactory EXPRESSION_FACTORY = new ExpressionFactoryImpl();
+    private static final ExpressionFactory EXPRESSION_FACTORY = new WrappedExpressionFactory(new
ExpressionFactoryImpl());
     
+    public static final ELContextListener EL_CONTEXT_LISTENER = new OwbElContextListener();
+
     public ELImpl()
     {
     }
@@ -79,8 +85,7 @@ public class ELImpl implements EL
     @SuppressWarnings("unchecked")
     public <T> T evaluateMethodExpression(String expression, Class<T> expectedType,
Class<?>[] expectedParamTypes, Object[] expectedParams)
     {   
-        ELContext context = createELContext();
-        
+        ELContext context = createELContext();        
         Object object = EXPRESSION_FACTORY.createMethodExpression(context, expression, expectedType,
expectedParamTypes).invoke(context, expectedParams);
         
         return (T)object;
@@ -89,8 +94,7 @@ public class ELImpl implements EL
     @SuppressWarnings("unchecked")
     public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
     {
-        ELContext context = createELContext();
-        
+        ELContext context = createELContext();        
         Object object = EXPRESSION_FACTORY.createValueExpression(context, expression, expectedType).getValue(context);
         
         return (T)object;
@@ -98,7 +102,11 @@ public class ELImpl implements EL
 
     @Override
     public ELContext createELContext()
-    {        
-        return new ELContextImpl();
+    {   
+        ELContext context = new ELContextImpl();
+        ELContextEvent event = new ELContextEvent(context);
+        EL_CONTEXT_LISTENER.contextCreated(event);
+        
+        return context;
     }
 }
\ No newline at end of file

Modified: openwebbeans/trunk/webbeans-tck/standalone-suite.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/standalone-suite.xml?rev=940120&r1=940119&r2=940120&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/standalone-suite.xml Sat May  1 22:21:55 2010
@@ -64,27 +64,7 @@
      		</methods>
      	</class>
      	
-     	<!-- ERROR IN CDI-TCK-134 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest">
-     		<methods>
-     			<exclude name="testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails"></exclude>
-     		</methods>
-     	</class>     	
-     	
-     	<!-- ERROR IN CDI-TCK-134 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.DecoratorWithNonPassivatingInitializerMethodTest">
-     		<methods>
-     			<exclude name="testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails"></exclude>
-     		</methods>
-     	</class>     	
-
-     	<!-- ERROR IN CDI-TCK-134 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.DecoratorWithNonPassivatingInjectedFieldTest">
-     		<methods>
-     			<exclude name="testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails"></exclude>
-     		</methods>
-     	</class>     	
-     	
+     	     	
      	<!-- ERROR IN CDI-TCK-137 -->
      	<class name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
      		<methods>
@@ -92,12 +72,6 @@
      		</methods>
      	</class>     	
 
-     	<!-- ERROR IN CDI-TCK-121 -->
-     	<class name="org.jboss.jsr299.tck.tests.extensions.beanManager.BeanManagerTest">
-     		<methods>
-     			<exclude name="testGetPassivationCapableBeanById"></exclude>
-     		</methods>
-     	</class>     
      	
      	<!-- ERROR IN CDITCK-138 -->
      	<class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
@@ -116,35 +90,12 @@
      	<!-- ERROR IN CDITCK-140 -->
      	<class name="org.jboss.jsr299.tck.tests.lookup.circular.CircularDependencyTest">
      		<methods>
-     			<exclude name="testCircularInjectionOnTwoNormalBeans"></exclude>
      			<exclude name="testCircularInjectionOnOneNormalAndOneDependentBean"></exclude>
      			<exclude name="testCircularInjectionOnOneDependentAndOneNormalBean"></exclude>
      		</methods>
      	</class>     
      	
-     	<!-- ERROR IN CDITCK-142 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
-     		<methods>
-     			<exclude name="testDependentsDestroyedWhenProducerMethodCompletes"></exclude>
-     		</methods>
-     	</class>          
      	
-     	<!-- ERROR IN CDITCK-143 -->
-     	<class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
-     		<methods>
-     			<exclude name="testBeanCreateInjectsDependenciesAndInvokesInitializerToInstantiateInstance"></exclude>
-     			<exclude name="testCreateReturnsSameBeanPushed"></exclude>
-     		</methods>
-     	</class>         
-
-     	<!-- TODO EL-RESOLVER PROBLEM -->
-     	<class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
-     		<methods>
-     			<exclude name="testDependentsDestroyedWhenElEvaluationCompletes"></exclude>
-     		</methods>
-     	</class>     
-     		
-     	     	
      </classes>
      
       <packages>         

Modified: openwebbeans/trunk/webbeans-tck/webprofile-suite.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/webprofile-suite.xml?rev=940120&r1=940119&r2=940120&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/webprofile-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/webprofile-suite.xml Sat May  1 22:21:55 2010
@@ -1,133 +1,89 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<!--
-	
-	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.
--->
-<suite name="JSR-299 TCK" verbose="2"  >
-   <test name="JSR-299 TCK">
-      <method-selectors> 
-        
-         <method-selector>
-            <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector"
/>
-         </method-selector>
-		
-		<!-- Used for Web Profiles-->
-		<method-selector>
-			<selector-class name="org.jboss.jsr299.tck.impl.WebProfileMethodSelector" />
-		</method-selector>
-		
-		
-         <method-selector>
-            <selector-class name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector"
/>
-         </method-selector>
-      </method-selectors>
-      <groups>
-         <run>
-            <exclude name="ri-broken" />
-            <exclude name="jboss-as-broken" />
-            <exclude name="broken" />
-            <exclude name="integration"></exclude>
-         </run>
-      </groups>
-      
-      <classes>
-     	<!-- ERROR IN CDI-TCK-134 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest">
-     		<methods>
-     			<exclude name="testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails"></exclude>
-     		</methods>
-     	</class>     	
-     	
-     	<!-- ERROR IN CDI-TCK-134 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.DecoratorWithNonPassivatingInitializerMethodTest">
-     		<methods>
-     			<exclude name="testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails"></exclude>
-     		</methods>
-     	</class>     	
-
-     	<!-- ERROR IN CDI-TCK-134 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.DecoratorWithNonPassivatingInjectedFieldTest">
-     		<methods>
-     			<exclude name="testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails"></exclude>
-     		</methods>
-     	</class>     	
-     	
-     	<!-- ERROR IN CDI-TCK-137 -->
-     	<class name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
-     		<methods>
-     			<exclude name="testChainedDecoratorInvocation"></exclude>
-     		</methods>
-     	</class>     	
-
-     	<!-- ERROR IN CDI-TCK-121 -->
-     	<class name="org.jboss.jsr299.tck.tests.extensions.beanManager.BeanManagerTest">
-     		<methods>
-     			<exclude name="testGetPassivationCapableBeanById"></exclude>
-     		</methods>
-     	</class>     
-     	
-     	<!-- ERROR IN CDITCK-138 -->
-     	<class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
-     		<methods>
-     			<exclude name="testIsDelegate"></exclude>
-     		</methods>
-     	</class>     
-
-     	<!-- ERROR IN CDITCK-139 -->
-     	<class name="org.jboss.jsr299.tck.tests.decorators.resolution.DecoratorResolutionTest">
-     		<methods>
-     			<exclude name="testDelegateTypeVariableBeanTypeVariable"></exclude>
-     		</methods>
-     	</class>     
-     	
-     	<!-- ERROR IN CDITCK-140 -->
-     	<class name="org.jboss.jsr299.tck.tests.lookup.circular.CircularDependencyTest">
-     		<methods>
-     			<exclude name="testCircularInjectionOnTwoNormalBeans"></exclude>
-     			<exclude name="testCircularInjectionOnOneNormalAndOneDependentBean"></exclude>
-     			<exclude name="testCircularInjectionOnOneDependentAndOneNormalBean"></exclude>
-     		</methods>
-     	</class>          	
-     	
-     	<!-- ERROR IN CDITCK-142 -->
-     	<class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
-     		<methods>
-     			<exclude name="testDependentsDestroyedWhenProducerMethodCompletes"></exclude>
-     		</methods>
-     	</class>          
-     	
-     	<!-- ERROR IN CDITCK-143 -->
-     	<class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
-     		<methods>
-     			<exclude name="testBeanCreateInjectsDependenciesAndInvokesInitializerToInstantiateInstance"></exclude>
-     			<exclude name="testCreateReturnsSameBeanPushed"></exclude>
-     		</methods>
-     	</class>         
-     	
-
-     	<!-- TODO EL-RESOLVER PROBLEM -->
-     	<class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
-     		<methods>
-     			<exclude name="testDependentsDestroyedWhenElEvaluationCompletes"></exclude>
-     		</methods>
-     	</class>     
-      </classes>
-   
-      <packages>         
-         <package name="org.jboss.jsr299.tck.tests.*"></package>
-      </packages>
-   </test>
-   
+	<!--
+
+		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.
+	-->
+<suite name="JSR-299 TCK" verbose="2">
+	<test name="JSR-299 TCK">
+		<method-selectors>
+
+			<method-selector>
+				<selector-class
+					name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
+			</method-selector>
+
+			<!-- Used for Web Profiles-->
+			<method-selector>
+				<selector-class name="org.jboss.jsr299.tck.impl.WebProfileMethodSelector" />
+			</method-selector>
+
+
+			<method-selector>
+				<selector-class
+					name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector"
/>
+			</method-selector>
+		</method-selectors>
+		<groups>
+			<run>
+				<exclude name="ri-broken" />
+				<exclude name="jboss-as-broken" />
+				<exclude name="broken" />
+				<exclude name="integration"></exclude>
+			</run>
+		</groups>
+
+		<classes>
+			<!-- ERROR IN CDI-TCK-137 -->
+			<class
+				name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
+				<methods>
+					<exclude name="testChainedDecoratorInvocation"></exclude>
+				</methods>
+			</class>
+
+
+			<!-- ERROR IN CDITCK-138 -->
+			<class
+				name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
+				<methods>
+					<exclude name="testIsDelegate"></exclude>
+				</methods>
+			</class>
+
+			<!-- ERROR IN CDITCK-139 -->
+			<class
+				name="org.jboss.jsr299.tck.tests.decorators.resolution.DecoratorResolutionTest">
+				<methods>
+					<exclude name="testDelegateTypeVariableBeanTypeVariable"></exclude>
+				</methods>
+			</class>
+
+			<!-- ERROR IN CDITCK-140 -->
+			<class
+				name="org.jboss.jsr299.tck.tests.lookup.circular.CircularDependencyTest">
+				<methods>
+					<exclude name="testCircularInjectionOnOneNormalAndOneDependentBean"></exclude>
+					<exclude name="testCircularInjectionOnOneDependentAndOneNormalBean"></exclude>
+				</methods>
+			</class>
+
+		</classes>
+
+		<packages>
+			<package name="org.jboss.jsr299.tck.tests.*"></package>
+		</packages>
+	</test>
+
 </suite>



Mime
View raw message