[weld-commits] Weld SVN: r6880 - in cdi-tck/branches/1.0/impl/src/main: resources and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-08-03 12:28:20 -0400 (Tue, 03 Aug 2010)
New Revision: 6880

Added:
   cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/faces-config.xml
Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
   cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-171

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java	2010-08-03 15:36:47 UTC (rev 6879)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java	2010-08-03 16:28:20 UTC (rev 6880)
@@ -21,6 +21,8 @@
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
 import org.jboss.testharness.impl.packaging.jsr299.Extension;
 import org.testng.annotations.Test;
 
@@ -28,6 +30,9 @@
 @SpecVersion(spec="cdi", version="20091101")
 @Extension("javax.enterprise.inject.spi.Extension")
 @IntegrationTest
+ at Resources({ 
+   @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
+})
 public class EnterpriseBeanNotDiscoveredAsManagedBeanTest extends AbstractJSR299Test
 {
 

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java	2010-08-03 15:36:47 UTC (rev 6879)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java	2010-08-03 16:28:20 UTC (rev 6880)
@@ -23,10 +23,15 @@
 import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
 import org.testng.annotations.Test;
 
 @Artifact
 @SpecVersion(spec="cdi", version="20091101")
+ at Resources({ 
+   @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
+})
 public class SimpleBeanDefinitionTest extends AbstractJSR299Test
 {
 

Added: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/faces-config.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/faces-config.xml	                        (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/faces-config.xml	2010-08-03 16:28:20 UTC (rev 6880)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<faces-config version="1.2" 
+              xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+</faces-config>
\ No newline at end of file

Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml	2010-08-03 15:36:47 UTC (rev 6879)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml	2010-08-03 16:28:20 UTC (rev 6880)
@@ -53,39 +53,6 @@
             </methods>
          </class>
          
-         <!-- CDITCK-171 -->
-         <class name="org.jboss.jsr299.tck.tests.implementation.simple.definition.SimpleBeanDefinitionTest">
-            <methods>
-               <exclude name="testAbstractClassDeclaredInJavaNotDiscovered" />
-               <exclude name="testDependentScopedBeanCanHavePublicField" />
-               <exclude name="testInitializerAnnotatedConstructor" />
-               <exclude name="testInitializerAnnotatedConstructorUsedOverEmptyConstuctor" />
-               <exclude name="testInterfaceNotDiscoveredAsSimpleBean" />
-               <exclude name="testNonStaticInnerClassDeclaredInJavaNotDiscovered" />
-               <exclude name="testSimpleBeanOnlyIfConstructorIsInitializer" />
-               <exclude name="testSimpleBeanOnlyIfConstructorParameterless" />
-               <exclude name="testStaticInnerClassDeclaredInJavaAllowed" />
-               <exclude name="testEmptyConstructorUsed" />
-            </methods>
-         </class>
-         <class name="org.jboss.jsr299.tck.tests.implementation.simple.definition.EnterpriseBeanNotDiscoveredAsManagedBeanTest">
-            <methods>
-               <exclude name="testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean" />
-            </methods>
-         </class>
-         
-         
-
-
-
-
-
-testSimpleBeanOnlyIfConstructorIsInitializer
-testSimpleBeanOnlyIfConstructorParameterless
-testStaticInnerClassDeclaredInJavaAllowed
-         
-         <!-- None known -->
-         
          <!-- Issues in Weld (the RI) -->
 
          <!-- WELD-401 -->