[weld-commits] Weld SVN: r6611 - in extensions/trunk: src/test/java/org/jboss/weld/extensions/test/autoproxy and 8 other directories.

Author: swd847 Date: 2010-07-10 03:06:59 -0400 (Sat, 10 Jul 2010) New Revision: 6611 Modified: extensions/trunk/pom.xml extensions/trunk/src/test/java/org/jboss/weld/extensions/test/autoproxy/AutoproxyTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/RaceTrack.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/interceptor/InterceptorTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/log/LoggerInjectionTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/LionTamer.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedReciever.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/resourceLoader/ResourceLoaderTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInspectorTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInstanceProviderTest.java extensions/trunk/src/test/java/org/slf4j/impl/TestLogger.java extensions/trunk/src/test/java/org/slf4j/impl/TestLoggerFactory.java Log: Moved weld-ext to arquillian Modified: extensions/trunk/pom.xml =================================================================== --- extensions/trunk/pom.xml 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/pom.xml 2010-07-10 07:06:59 UTC (rev 6611) @@ -64,6 +64,8 @@ <testng.version>5.12.1</testng.version> <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version> <servlet.api.version>2.5</servlet.api.version> + <arquillian.version>1.0.0.Alpha2</arquillian.version> + <junit.version>4.8.1</junit.version> </properties> <!-- Dependency management, including extra repositories if needed --> @@ -85,87 +87,90 @@ <!-- Import the BOMs --> <dependencyManagement> <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${weld.api.version}</version> + </dependency> + + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-api-bom</artifactId> <version>${weld.api.version}</version> <type>pom</type> <scope>import</scope> </dependency> + <dependency> <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <version>${weld.core.version}</version> <type>pom</type> <scope>import</scope> </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${testng.version}</version> </dependency> + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions</artifactId> <version>${project.version}</version> </dependency> + <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>${jboss.test.harness.version}</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet.api.version}</version> </dependency> - + <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-50</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <version>${jboss.test.harness.version}</version> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-embedded</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-tomcat</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet.api.version}</version> - </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - </dependency> - + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <scope>provided</scope> @@ -178,24 +183,12 @@ </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> <scope>test</scope> @@ -207,13 +200,113 @@ <optional>true</optional> <scope>provided</scope> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + </dependencies> + <profiles> + <profile> + <id>defualt</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-jbossas-remote-60</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <version>6.0.0.20100429-M3</version> + <type>pom</type> + <scope>test</scope> + </dependency> + </dependencies> + </profile> +<!-- + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-test-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <classpathScope>test</classpathScope> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/test-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> +--> + </profiles> + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trun... <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extension... <url>http://fisheye.jboss.org/browse/weld/extensions/trunk</url> </scm> - </project> Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/autoproxy/AutoproxyTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/autoproxy/AutoproxyTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/autoproxy/AutoproxyTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -1,24 +1,40 @@ package org.jboss.weld.extensions.test.autoproxy; -import javax.enterprise.inject.Default; -import javax.enterprise.util.AnnotationLiteral; +import javax.inject.Inject; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; +import org.jboss.weld.extensions.autoproxy.AutoProxyExtension; +import org.junit.Test; +import org.junit.runner.RunWith; -@Artifact -public class AutoproxyTest extends AbstractWeldTest +(a)RunWith(Arquillian.class) +public class AutoproxyTest { + @Deployment + public static Archive<?> deploy() + { + JavaArchive a = ShrinkWrap.create("test.jar", JavaArchive.class); + a.addPackage(AutoproxyTest.class.getPackage()); + a.addPackage(AutoProxyExtension.class.getPackage()); + a.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml"); + return a; + } + @Inject + HelloBob bob; + + @Inject + HelloJane jane; + @Test public void testAutoProxy() { - HelloBob bob = getReference(HelloBob.class, new AnnotationLiteral<Default>() - { - }); assert bob.sayHello().equals("Hello Bob"); - HelloJane jane = getReference(HelloJane.class); assert jane.sayHello().equals("Hello Jane"); } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -16,18 +16,31 @@ */ package org.jboss.weld.extensions.test.bean.generic; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import javax.inject.Inject; -@Artifact -public class GenericBeanTest extends AbstractWeldTest +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class GenericBeanTest { + @Deployment + public static Archive<?> deploy() + { + return ShrinkWrap.create("test.jar", JavaArchive.class).addPackage(GenericBeanTest.class.getPackage()); + } + + @Inject + InjectedBean bean; + @Test public void testGeneric() { - //TODO: This needs to be split up into lots of little tests - InjectedBean bean = getReference(InjectedBean.class); assert bean.main1.getValue().equals("hello1"); assert bean.main2.getValue().equals("hello2"); assert bean.main1.getNoData() == null; Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -16,23 +16,37 @@ */ package org.jboss.weld.extensions.test.core; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import javax.inject.Inject; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + /** * @author Stuart Douglas * */ -@Artifact -public class CoreTest extends AbstractWeldTest +(a)RunWith(Arquillian.class) +public class CoreTest { + + @Inject + RaceTrack raceTrack; + + @Deployment + public static Archive<?> deploy() + { + return ShrinkWrap.create("test.jar", JavaArchive.class).addPackage(CoreTest.class.getPackage()); + } + @Test public void testExact() { - // TODO: This needs to be split up into lots of little tests - RaceTrack bean = getReference(RaceTrack.class); - assert bean.dog instanceof Greyhound; + assert raceTrack.getDog() instanceof Greyhound; } } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/RaceTrack.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/RaceTrack.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/core/RaceTrack.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -24,5 +24,11 @@ { @Inject @Exact(Greyhound.class) - Dog dog; + private Dog dog; + + public Dog getDog() + { + return dog; + } + } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/interceptor/InterceptorTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/interceptor/InterceptorTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/interceptor/InterceptorTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -16,25 +16,24 @@ */ package org.jboss.weld.extensions.test.interceptor; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.weld.extensions.interceptor.Interceptors; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import org.junit.Test; -@Artifact -(a)Classes(Interceptors.class) -public class InterceptorTest extends AbstractWeldTest +//@Artifact +//(a)Classes(Interceptors.class) +public class InterceptorTest // extends AbstractWeldTest { - + // Disabled, needs a snapshot of Weld to work - @Test(enabled=false) + // @Test(enabled=false) + @Test public void testInterceptorResolvable() { - assert getReference(Interceptors.class).isInterceptorEnabled(FooInterceptor.class); + // assert + // getReference(Interceptors.class).isInterceptorEnabled(FooInterceptor.class); // Waiting on WELD-503 - // assert !getReference(Interceptors.class).isInterceptorEnabled(BarInterceptor.class); - + // assert + // !getReference(Interceptors.class).isInterceptorEnabled(BarInterceptor.class); + // } } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/log/LoggerInjectionTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/log/LoggerInjectionTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/log/LoggerInjectionTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -17,37 +17,57 @@ package org.jboss.weld.extensions.test.log; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.weld.test.AbstractWeldTest; +import javax.inject.Inject; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; +import org.jboss.weld.extensions.log.Category; +import org.junit.Test; +import org.junit.runner.RunWith; import org.slf4j.impl.TestLoggerFactory; -import org.testng.annotations.Test; /** * All the tests related to the @Logger binding type and injection. * * @author David Allen */ -@Artifact -@Classes(packages = { "org.jboss.weld.extensions.log" }) -public class LoggerInjectionTest extends AbstractWeldTest +(a)RunWith(Arquillian.class) +public class LoggerInjectionTest { + @Inject + Sparrow sparrow; + + @Inject + Finch finch; + + @Deployment + public static Archive<?> deploy() + { + JavaArchive a = ShrinkWrap.create("test.jar", JavaArchive.class); + a.addPackage(LoggerInjectionTest.class.getPackage()); + a.addPackage(Category.class.getPackage()); + a.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml"); + return a; + } + @Test public void testBasicLogInjection() { - Sparrow bird = getReference(Sparrow.class); TestLoggerFactory.INSTANCE.getLogger("").reset(); - bird.generateLogMessage(); + sparrow.generateLogMessage(); assert TestLoggerFactory.INSTANCE.getLogger("").getLastMessage() != null; assert TestLoggerFactory.INSTANCE.getLogger("").getLastMessage().equals("Sparrow"); } - + @Test public void testCategorySpecifiedLogger() { - Finch bird = getReference(Finch.class); TestLoggerFactory.INSTANCE.getLogger("").reset(); - bird.generateLogMessage(); + finch.generateLogMessage(); assert TestLoggerFactory.INSTANCE.getLogger("").getLastMessage() != null; assert TestLoggerFactory.INSTANCE.getLogger("").getLastMessage().equals("Finch"); } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/LionTamer.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/LionTamer.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/LionTamer.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -1,11 +1,10 @@ package org.jboss.weld.extensions.test.managedproducer; import javax.enterprise.context.ApplicationScoped; +import javax.inject.Named; import org.jboss.weld.extensions.managedproducer.ManagedProducer; -import com.google.inject.name.Named; - /* * JBoss, Home of Professional Open Source * Copyright 2010, Red Hat, Inc., and individual contributors Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -16,26 +16,53 @@ */ package org.jboss.weld.extensions.test.managedproducer; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import javax.inject.Inject; +import javax.inject.Named; -@Artifact -public class ManagedProducerTest extends AbstractWeldTest +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; +import org.jboss.weld.extensions.managedproducer.ManagedProducerExtension; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class ManagedProducerTest { + + @Deployment + public static Archive<?> deploy() + { + JavaArchive a = ShrinkWrap.create("test.jar", JavaArchive.class); + a.addPackage(ManagedProducerTest.class.getPackage()); + a.addPackage(ManagedProducerExtension.class.getPackage()); + a.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml"); + return a; + } + + @Inject + ManagedReciever bean; + + @Inject + @Named("lion") + Lion lion; + + @Inject + LionTamer lionTamer; + @Test public void testManagedProducersInjectionPoint() { - ManagedReciever bean = getReference(ManagedReciever.class); - assert bean.bean1.getValue().equals("bean1") : " value: " + bean.bean1.getValue(); - assert bean.bean2.getValue().equals("bean2") : " value: " + bean.bean1.getValue(); + assert bean.getBean1().getValue().equals("bean1") : " value: " + bean.getBean1().getValue(); + assert bean.getBean2().getValue().equals("bean2") : " value: " + bean.getBean2().getValue(); } @Test public void testManagedProducers() { - Lion lion = getReference(Lion.class); - LionTamer lionTamer = getReference(LionTamer.class); assert lion.getName().equals("lion one"); lionTamer.changeLion(); assert lion.getName().equals("lion two"); Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedReciever.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedReciever.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedReciever.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -22,10 +22,20 @@ { @MPType("bean1") @Inject - ProducedInterface bean1; + private ProducedInterface bean1; @MPType("bean2") @Inject - ProducedInterface bean2; + private ProducedInterface bean2; + public ProducedInterface getBean1() + { + return bean1; + } + + public ProducedInterface getBean2() + { + return bean2; + } + } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/resourceLoader/ResourceLoaderTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/resourceLoader/ResourceLoaderTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/resourceLoader/ResourceLoaderTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -24,21 +24,42 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; +import org.junit.Test; +import org.junit.runner.RunWith; -@Artifact -@Classes(packages = {"org.jboss.weld.extensions.resourceLoader"}) -public class ResourceLoaderTest extends AbstractWeldTest +(a)RunWith(Arquillian.class) +public class ResourceLoaderTest { + @Deployment + public static Archive<?> deploy() + { + JavaArchive a = ShrinkWrap.create("test.jar", JavaArchive.class); + a.addPackage(ResourceLoaderTest.class.getPackage()); + a.addPackage(ResourceProvider.class.getPackage()); + a.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml"); + return a; + } + @Inject + ResourceClient resourceClient; + + @Inject + BeanManager beanManager; + @Test public void testLoadsStream() throws Throwable { - InputStream stream = getReference(ResourceClient.class).getResourceProvider().loadResourceStream("com/acme/foo1"); + InputStream stream = resourceClient.getResourceProvider().loadResourceStream("com/acme/foo1"); assert stream != null; assert stream.available() > 0; InputStreamReader reader = new InputStreamReader(stream); @@ -46,11 +67,11 @@ reader.read(chars, 0, 4); assert new String(chars).equals("foo1"); } - + @Test public void testLoadsURLs() throws Throwable { - URL url = getReference(ResourceClient.class).getResourceProvider().loadResource("com/acme/foo1"); + URL url = resourceClient.getResourceProvider().loadResource("com/acme/foo1"); assert url != null; InputStream stream = url.openStream(); assert stream.available() > 0; @@ -60,11 +81,11 @@ assert new String(chars).equals("foo1"); assert url.getFile().endsWith("/com/acme/foo1"); } - + @Test public void testInitialSlashIgnored() throws Throwable { - URL url = getReference(ResourceClient.class).getResourceProvider().loadResource("/com/acme/foo1"); + URL url = resourceClient.getResourceProvider().loadResource("/com/acme/foo1"); assert url != null; InputStream stream = url.openStream(); assert stream.available() > 0; @@ -74,12 +95,12 @@ assert new String(chars).equals("foo1"); assert url.getFile().endsWith("com/acme/foo1"); } - + @Test public void testStreamsAreCleanedUp() throws Throwable { - Bean<ResourceClient> bean = getBean(ResourceClient.class); - CreationalContext<ResourceClient> creationalContext = getCurrentManager().createCreationalContext(bean); + Bean<ResourceClient> bean = (Bean) beanManager.getBeans(ResourceClient.class).iterator().next(); + CreationalContext<ResourceClient> creationalContext = beanManager.createCreationalContext(bean); ResourceClient client = bean.create(creationalContext); InputStream stream = client.getResourceProvider().loadResourceStream("/com/acme/foo1"); assert stream.available() > 0; @@ -88,15 +109,15 @@ reader.read(chars, 0, 4); assert new String(chars).equals("foo1"); bean.destroy(client, creationalContext); - try + try { stream.available(); assert false; } - catch (IOException e) + catch (IOException e) { // Expected } } - + } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInspectorTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInspectorTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInspectorTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -1,26 +1,41 @@ package org.jboss.weld.extensions.test.util; -import org.jboss.testharness.impl.packaging.Artifact; +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.extensions.util.AnnotationInspector; -import org.jboss.weld.test.AbstractWeldTest; -import org.testng.annotations.Test; +import org.junit.Test; +import org.junit.runner.RunWith; -@Artifact -public class AnnotationInspectorTest extends AbstractWeldTest +(a)RunWith(Arquillian.class) +public class AnnotationInspectorTest { - + @Deployment + public static Archive<?> deploy() + { + return ShrinkWrap.create("test.jar", JavaArchive.class).addPackage(AnnotationInspectorTest.class.getPackage()); + } + + @Inject + BeanManager beanManager; + @Test public void testAnnotationOnElement() throws Exception { - assert AnnotationInspector.isAnnotationPresent(Animals.class.getMethod("dog"), Animal.class, false, getCurrentManager()); - assert AnnotationInspector.getAnnotation(Animals.class.getMethod("dog"), Animal.class, false, getCurrentManager()).species().equals("Dog"); + assert AnnotationInspector.isAnnotationPresent(Animals.class.getMethod("dog"), Animal.class, false, beanManager); + assert AnnotationInspector.getAnnotation(Animals.class.getMethod("dog"), Animal.class, false, beanManager).species().equals("Dog"); } - + @Test public void testAnnotationOnStereotype() throws Exception { - assert AnnotationInspector.isAnnotationPresent(Animals.class.getMethod("cat"), Animal.class, true, getCurrentManager()); - assert AnnotationInspector.getAnnotation(Animals.class.getMethod("cat"), Animal.class, true, getCurrentManager()).species().equals("Cat"); + assert AnnotationInspector.isAnnotationPresent(Animals.class.getMethod("cat"), Animal.class, true, beanManager); + assert AnnotationInspector.getAnnotation(Animals.class.getMethod("cat"), Animal.class, true, beanManager).species().equals("Cat"); } } Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInstanceProviderTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInstanceProviderTest.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInstanceProviderTest.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -22,7 +22,7 @@ import org.jboss.weld.extensions.util.AnnotationInstanceProvider; import org.jboss.weld.extensions.util.NullMemberException; -import org.testng.annotations.Test; +import org.junit.Test; /** * Test of dynamic annotation creation @@ -40,7 +40,7 @@ public void testSimpleAnnotationCreation() { AnnotationInstanceProvider provider = new AnnotationInstanceProvider(); - SimpleAnnotation an = provider.get(SimpleAnnotation.class, Collections.<String, Object>emptyMap()); + SimpleAnnotation an = provider.get(SimpleAnnotation.class, Collections.<String, Object> emptyMap()); assert an != null : "Annotation was null"; assert an.annotationType() == SimpleAnnotation.class : "Annotation returned wrong result for annotationType()"; SimpleAnnotation realAn = AnnotatedClass.class.getAnnotation(SimpleAnnotation.class); @@ -108,7 +108,7 @@ /** * Test that an exception is thrown when a member is null */ - @Test(expectedExceptions = NullMemberException.class) + @Test(expected = NullMemberException.class) public void testNullMemberException() { AnnotationInstanceProvider provider = new AnnotationInstanceProvider(); @@ -120,8 +120,8 @@ } /** - * Test that an Annotation will use the default values if a member with default - * values is null + * Test that an Annotation will use the default values if a member with + * default values is null */ @Test public void testDefaultValue() Modified: extensions/trunk/src/test/java/org/slf4j/impl/TestLogger.java =================================================================== --- extensions/trunk/src/test/java/org/slf4j/impl/TestLogger.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/slf4j/impl/TestLogger.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -16,25 +16,25 @@ */ package org.slf4j.impl; +import org.junit.Ignore; import org.slf4j.helpers.MarkerIgnoringBase; /** * A very limited test logger which records the last info message logged */ +@Ignore public class TestLogger extends MarkerIgnoringBase { private String lastMessage; - + private static final long serialVersionUID = 8313525025872406710L; - - - + public String getLastMessage() { return lastMessage; } - + public void reset() { this.lastMessage = null; @@ -43,61 +43,61 @@ public void debug(String msg) { // TODO Auto-generated method stub - + } public void debug(String format, Object arg) { // TODO Auto-generated method stub - + } public void debug(String format, Object[] argArray) { // TODO Auto-generated method stub - + } public void debug(String msg, Throwable t) { // TODO Auto-generated method stub - + } public void debug(String format, Object arg1, Object arg2) { // TODO Auto-generated method stub - + } public void error(String msg) { // TODO Auto-generated method stub - + } public void error(String format, Object arg) { // TODO Auto-generated method stub - + } public void error(String format, Object[] argArray) { // TODO Auto-generated method stub - + } public void error(String msg, Throwable t) { // TODO Auto-generated method stub - + } public void error(String format, Object arg1, Object arg2) { // TODO Auto-generated method stub - + } public void info(String msg) @@ -108,25 +108,25 @@ public void info(String format, Object arg) { // TODO Auto-generated method stub - + } public void info(String format, Object[] argArray) { // TODO Auto-generated method stub - + } public void info(String msg, Throwable t) { // TODO Auto-generated method stub - + } public void info(String format, Object arg1, Object arg2) { // TODO Auto-generated method stub - + } public boolean isDebugEnabled() @@ -162,61 +162,61 @@ public void trace(String msg) { // TODO Auto-generated method stub - + } public void trace(String format, Object arg) { // TODO Auto-generated method stub - + } public void trace(String format, Object[] argArray) { // TODO Auto-generated method stub - + } public void trace(String msg, Throwable t) { // TODO Auto-generated method stub - + } public void trace(String format, Object arg1, Object arg2) { // TODO Auto-generated method stub - + } public void warn(String msg) { // TODO Auto-generated method stub - + } public void warn(String format, Object arg) { // TODO Auto-generated method stub - + } public void warn(String format, Object[] argArray) { // TODO Auto-generated method stub - + } public void warn(String msg, Throwable t) { // TODO Auto-generated method stub - + } public void warn(String format, Object arg1, Object arg2) { // TODO Auto-generated method stub - + } } Modified: extensions/trunk/src/test/java/org/slf4j/impl/TestLoggerFactory.java =================================================================== --- extensions/trunk/src/test/java/org/slf4j/impl/TestLoggerFactory.java 2010-07-10 05:49:18 UTC (rev 6610) +++ extensions/trunk/src/test/java/org/slf4j/impl/TestLoggerFactory.java 2010-07-10 07:06:59 UTC (rev 6611) @@ -16,15 +16,17 @@ */ package org.slf4j.impl; +import org.junit.Ignore; import org.slf4j.ILoggerFactory; +@Ignore public class TestLoggerFactory implements ILoggerFactory { public final static TestLoggerFactory INSTANCE = new TestLoggerFactory(); private final TestLogger logger = new TestLogger(); - + public TestLogger getLogger(String name) { return logger;