Author: pete.muir(a)jboss.org Date: 2009-01-09 19:41:41 -0500 (Fri, 09 Jan 2009) New Revision: 868 Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/TCKRunner.java Modified: ri/trunk/pom.xml ri/trunk/webbeans-ri/pom.xml Log: updates for running TCK Modified: ri/trunk/pom.xml =================================================================== --- ri/trunk/pom.xml 2009-01-09 21:58:03 UTC (rev 867) +++ ri/trunk/pom.xml 2009-01-10 00:41:41 UTC (rev 868) @@ -64,7 +64,11 @@ <module>webbeans-ri</module> <module>webbeans-ri-spi</module> </modules> - + + <properties> + <webbeans.tck.version>1.0.0-SNAPSHOT</webbeans.tck.version> + </properties> + <dependencyManagement> <dependencies> @@ -187,13 +191,13 @@ <dependency> <groupId>org.jboss.webbeans.tck</groupId> <artifactId>webbeans-tck-api</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${webbeans.tck.version}</version> </dependency> <dependency> <groupId>org.jboss.webbeans.tck</groupId> <artifactId>webbeans-tck-impl</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${webbeans.tck.version}</version> </dependency> </dependencies> Modified: ri/trunk/webbeans-ri/pom.xml =================================================================== --- ri/trunk/webbeans-ri/pom.xml 2009-01-09 21:58:03 UTC (rev 867) +++ ri/trunk/webbeans-ri/pom.xml 2009-01-10 00:41:41 UTC (rev 868) @@ -103,17 +103,43 @@ <build> <defaultGoal>install</defaultGoal> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>testng.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> - </plugin> - </plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.webbeans.tck</groupId> + <artifactId>webbeans-tck-impl</artifactId> + <version>${webbeans.tck.version}</version> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>testng.xml,</suiteXmlFile> + <suiteXmlFile>${project.build.directory}/dependency/webbeans-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> + </plugin> + </plugins> </build> </project> \ No newline at end of file Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/TCKRunner.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/TCKRunner.java 2009-01-09 21:58:03 UTC (rev 867) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/TCKRunner.java 2009-01-10 00:41:41 UTC (rev 868) @@ -1,30 +0,0 @@ -package org.jboss.webbeans.test.tck; - -import org.jboss.webbeans.tck.api.TCKConfiguration; -import org.jboss.webbeans.tck.api.TestSuite; -import org.jboss.webbeans.tck.api.WebBeansTCK; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -public class TCKRunner -{ - - private WebBeansTCK tck; - - @BeforeClass - public void beforeClass() - { - TCKConfiguration configuration = new TCKConfiguration(new BeansImpl(), new ContextsImpl(), new ManagersImpl(), new TestSuite("target/surefire-reports")); - tck = WebBeansTCK.newInstance(configuration); - } - - @Test - public void runTCK() - { - if (!tck.run()) - { - throw new AssertionError("TCK run failed, see log"); - } - } - -}