[seam-commits] Seam SVN: r13179 - in modules/xml/trunk/impl: src/main/java/org/jboss/seam/xml/bootstrap and 13 other directories.

Author: swd847 Date: 2010-06-16 01:35:05 -0400 (Wed, 16 Jun 2010) New Revision: 13179 Added: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/SimpleXmlProvider.java Removed: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/TestXmlProvider.java Modified: modules/xml/trunk/impl/pom.xml modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/ResourceLoaderXmlDocumentProvider.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/BootstrapTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/constructor/ConstructorTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetArrayFieldValueBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetCollectionFieldValueBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetFieldValueBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetMapFieldValueBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/iface/InterfaceTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/ProducerFieldValueBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/QualifierAttributesTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/interceptor/InterceptorTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/producer/MultipleProducerBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/stereotype/StereotypeTest.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/types/TypesTest.java modules/xml/trunk/impl/src/test/resources/META-INF/services/org.jboss.seam.xml.XmlExtension Log: changed from testng to junit to keep in line with module handbook recommendation Modified: modules/xml/trunk/impl/pom.xml =================================================================== --- modules/xml/trunk/impl/pom.xml 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/pom.xml 2010-06-16 05:35:05 UTC (rev 13179) @@ -49,13 +49,26 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions</artifactId> </dependency> + + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <scope>test</scope> + </dependency> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> <scope>test</scope> - <classifier>jdk15</classifier> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> <scm> Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/ResourceLoaderXmlDocumentProvider.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/ResourceLoaderXmlDocumentProvider.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/ResourceLoaderXmlDocumentProvider.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -49,7 +49,7 @@ private final List<ResourceLoader> resourceLoaders; - static final String[] DEFAULT_RESOURCES = { "seam-beans.xml", "META-INF/seam-beans.xml", "META-INF/beans.xml" }; + static final String[] DEFAULT_RESOURCES = { "seam-beans.xml", "META-INF/seam-beans.xml", "META-INF/beans.xml", "WEB-INF/beans.xml" }; final String[] resources; Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -29,8 +29,8 @@ import org.jboss.weld.environment.se.Weld; import org.jboss.weld.environment.se.WeldContainer; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.junit.After; +import org.junit.Before; public abstract class AbstractXMLTest { @@ -40,17 +40,17 @@ protected abstract String getXmlFileName(); - @BeforeClass + @Before public void setup() { String fileName = getClass().getPackage().getName().replace('.', '/') + "/" + getXmlFileName(); - TestXmlProvider.fileName = fileName; + SimpleXmlProvider.fileName = fileName; weld = new Weld(); WeldContainer container = weld.initialize(); manager = container.getBeanManager(); } - @AfterClass + @After public void teardown() { weld.shutdown(); Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/BootstrapTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/BootstrapTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/BootstrapTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -25,26 +25,23 @@ import org.jboss.seam.xml.bootstrap.XmlDocumentProvider; import org.jboss.seam.xml.bootstrap.XmlExtension; -import org.testng.annotations.Test; +import org.junit.Test; -/** - * Unit test for simple App. - */ public class BootstrapTest extends AbstractXMLTest { - @Override - protected String getXmlFileName() - { - return "single-bean.xml"; - } - @Test public void testDocumentProviders() { - XmlExtension x = getReference(XmlExtension.class); - List<Class<? extends XmlDocumentProvider>> providers = x.getDocumentProviders(); + XmlExtension extension = getReference(XmlExtension.class); + List<Class<? extends XmlDocumentProvider>> providers = extension.getDocumentProviders(); assert providers.size() == 2; } + + @Override + protected String getXmlFileName() + { + return null; + } } Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/NamespaceResolverTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -33,7 +33,7 @@ import org.jboss.seam.xml.parser.namespace.NamespaceElementResolver; import org.jboss.seam.xml.parser.namespace.PackageNamespaceElementResolver; import org.jboss.seam.xml.test.simple.Bean1; -import org.testng.annotations.Test; +import org.junit.Test; public class NamespaceResolverTest { Copied: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/SimpleXmlProvider.java (from rev 13171, modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/TestXmlProvider.java) =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/SimpleXmlProvider.java (rev 0) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/SimpleXmlProvider.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.xml.test; + +import org.jboss.seam.xml.bootstrap.ResourceLoaderXmlDocumentProvider; +import org.jboss.seam.xml.bootstrap.XmlDocument; +import org.jboss.seam.xml.bootstrap.XmlDocumentProvider; + +public class SimpleXmlProvider implements XmlDocumentProvider +{ + + public static String fileName; + + ResourceLoaderXmlDocumentProvider docProvider; + + public void close() + { + docProvider.close(); + } + + public XmlDocument getNextDocument() + { + return docProvider.getNextDocument(); + } + + public void open() + { + String[] r = new String[1]; + r[0] = fileName; + docProvider = new ResourceLoaderXmlDocumentProvider(r); + docProvider.open(); + } + +} Deleted: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/TestXmlProvider.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/TestXmlProvider.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/TestXmlProvider.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.seam.xml.test; - -import org.jboss.seam.xml.bootstrap.ResourceLoaderXmlDocumentProvider; -import org.jboss.seam.xml.bootstrap.XmlDocument; -import org.jboss.seam.xml.bootstrap.XmlDocumentProvider; - -public class TestXmlProvider implements XmlDocumentProvider -{ - - public static String fileName; - - ResourceLoaderXmlDocumentProvider docProvider; - - public void close() - { - docProvider.close(); - } - - public XmlDocument getNextDocument() - { - return docProvider.getNextDocument(); - } - - public void open() - { - String[] r = new String[1]; - r[0] = fileName; - docProvider = new ResourceLoaderXmlDocumentProvider(r); - docProvider.open(); - } - -} Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/constructor/ConstructorTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/constructor/ConstructorTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/constructor/ConstructorTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -22,7 +22,7 @@ package org.jboss.seam.xml.test.constructor; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class ConstructorTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetArrayFieldValueBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetArrayFieldValueBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetArrayFieldValueBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -23,7 +23,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.weld.environment.se.util.WeldManagerUtils; -import org.testng.annotations.Test; +import org.junit.Test; public class SetArrayFieldValueBeanTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetCollectionFieldValueBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetCollectionFieldValueBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetCollectionFieldValueBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -23,7 +23,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.weld.environment.se.util.WeldManagerUtils; -import org.testng.annotations.Test; +import org.junit.Test; public class SetCollectionFieldValueBeanTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetFieldValueBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetFieldValueBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetFieldValueBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -27,7 +27,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.seam.xml.test.method.QualifierEnum; -import org.testng.annotations.Test; +import org.junit.Test; public class SetFieldValueBeanTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetMapFieldValueBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetMapFieldValueBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/SetMapFieldValueBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -23,7 +23,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.weld.environment.se.util.WeldManagerUtils; -import org.testng.annotations.Test; +import org.junit.Test; public class SetMapFieldValueBeanTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -24,7 +24,7 @@ import javax.enterprise.util.AnnotationLiteral; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class GenericBeanTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/iface/InterfaceTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/iface/InterfaceTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/iface/InterfaceTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -24,7 +24,7 @@ import javax.enterprise.util.AnnotationLiteral; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class InterfaceTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/ProducerFieldValueBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/ProducerFieldValueBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/ProducerFieldValueBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -22,7 +22,7 @@ package org.jboss.seam.xml.test.injection; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class ProducerFieldValueBeanTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/QualifierAttributesTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/QualifierAttributesTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/injection/QualifierAttributesTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -23,7 +23,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.weld.environment.se.util.WeldManagerUtils; -import org.testng.annotations.Test; +import org.junit.Test; /** * Test that XML configured Qualifiers work as expected Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/interceptor/InterceptorTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/interceptor/InterceptorTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/interceptor/InterceptorTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -22,7 +22,7 @@ package org.jboss.seam.xml.test.interceptor; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class InterceptorTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/MethodTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -22,7 +22,7 @@ package org.jboss.seam.xml.test.method; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class MethodTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/method/PrimitiveMethodTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -24,7 +24,7 @@ import javax.enterprise.util.AnnotationLiteral; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class PrimitiveMethodTest extends AbstractXMLTest { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/producer/MultipleProducerBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/producer/MultipleProducerBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/producer/MultipleProducerBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -22,7 +22,7 @@ package org.jboss.seam.xml.test.producer; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; public class MultipleProducerBeanTest extends AbstractXMLTest { @@ -38,17 +38,16 @@ { Reciever s = getReference(Reciever.class); - assert s.val1==1; - assert s.val2==2; + assert s.val1 == 1; + assert s.val2 == 2; } - - + @Test public void testProducerMethod() { Reciever s = getReference(Reciever.class); - assert s.meth1==1; - assert s.meth2==2; + assert s.meth1 == 1; + assert s.meth2 == 2; } } Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -27,7 +27,7 @@ import javax.enterprise.util.AnnotationLiteral; import org.jboss.seam.xml.test.AbstractXMLTest; -import org.testng.annotations.Test; +import org.junit.Test; /** * Unit test for simple App. Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/stereotype/StereotypeTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/stereotype/StereotypeTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/stereotype/StereotypeTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -24,7 +24,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.seam.xml.test.interceptor.InterceptedBean; import org.jboss.weld.environment.se.util.WeldManagerUtils; -import org.testng.annotations.Test; +import org.junit.Test; /** * this is the same as the interceptor test except the interceptor is applied @@ -39,7 +39,7 @@ return "stereotype-beans.xml"; } - @Test(enabled = true) + @Test public void testStereotypes() { Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/types/TypesTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/types/TypesTest.java 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/types/TypesTest.java 2010-06-16 05:35:05 UTC (rev 13179) @@ -23,7 +23,7 @@ import org.jboss.seam.xml.test.AbstractXMLTest; import org.jboss.weld.environment.se.util.WeldManagerUtils; -import org.testng.annotations.Test; +import org.junit.Test; /** * tests that <types> restricts the allowed types of an injection point @@ -37,7 +37,7 @@ return "types-test-beans.xml"; } - @Test(enabled = true) + @Test public void testTypeRestriction() { Modified: modules/xml/trunk/impl/src/test/resources/META-INF/services/org.jboss.seam.xml.XmlExtension =================================================================== --- modules/xml/trunk/impl/src/test/resources/META-INF/services/org.jboss.seam.xml.XmlExtension 2010-06-16 04:47:46 UTC (rev 13178) +++ modules/xml/trunk/impl/src/test/resources/META-INF/services/org.jboss.seam.xml.XmlExtension 2010-06-16 05:35:05 UTC (rev 13179) @@ -1 +1 @@ -org.jboss.seam.xml.test.TestXmlProvider \ No newline at end of file +org.jboss.seam.xml.test.SimpleXmlProvider \ No newline at end of file