[webbeans-commits] Webbeans SVN: r1446 - ri/trunk/jboss-tck-runner/src/test/java and 12 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sat Feb 7 08:54:09 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-07 08:54:08 -0500 (Sat, 07 Feb 2009)
New Revision: 1446
Added:
ri/trunk/jboss-tck-runner/src/test/java/org/
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/
ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties
Modified:
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/porting-package/pom.xml
ri/trunk/webbeans-ri-spi/pom.xml
ri/trunk/webbeans-ri/pom.xml
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
Log:
Switch to a separate TCK runner, tidy up dependencies a bit
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-07 12:24:53 UTC (rev 1445)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-07 13:54:08 UTC (rev 1446)
@@ -6,9 +6,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>jboss-tck-runner</artifactId>
+ <artifactId>webbeans-jboss-tck-runner</artifactId>
<name>JSR-299 TCK runner for JBoss AS</name>
<description>Aggregates dependencies and run's the JSR-299 TCK on JBoss AS</description>
+
<dependencies>
<dependency>
@@ -19,13 +20,88 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-ri</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-porting-package</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
+ <artifactId>webbeans-tck-impl</artifactId>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <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>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.directory}/dependency/webbeans-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-02-07 12:24:53 UTC (rev 1445)
+++ ri/trunk/porting-package/pom.xml 2009-02-07 13:54:08 UTC (rev 1446)
@@ -6,7 +6,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>porting-package</artifactId>
+ <artifactId>webbeans-porting-package</artifactId>
<name>Web Beans Porting Package for JSR-299 TCK</name>
<dependencies>
@@ -24,6 +24,10 @@
<groupId>org.jboss.webbeans.tck</groupId>
<artifactId>webbeans-tck-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
</dependencies>
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2009-02-07 12:24:53 UTC (rev 1445)
+++ ri/trunk/webbeans-ri/pom.xml 2009-02-07 13:54:08 UTC (rev 1446)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-ri</artifactId>
- <name>Web Beans core</name>
+ <name>Web Beans Core</name>
<dependencies>
<dependency>
@@ -28,30 +28,35 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-impl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jbossws</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -79,16 +84,19 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-ri</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -103,36 +111,10 @@
<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>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>unit-tests.xml,</suiteXmlFile>
- <suiteXmlFile>${project.build.directory}/dependency/webbeans-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile>
+ <suiteXmlFile>unit-tests.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
@@ -156,4 +138,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Deleted: ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties 2009-02-07 12:24:53 UTC (rev 1445)
+++ ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties 2009-02-07 13:54:08 UTC (rev 1446)
@@ -1,4 +0,0 @@
-org.jboss.webbeans.tck.spi.Managers=org.jboss.webbeans.test.tck.ManagersImpl
-org.jboss.webbeans.tck.spi.Beans=org.jboss.webbeans.test.tck.BeansImpl
-org.jboss.webbeans.tck.spi.Contexts=org.jboss.webbeans.test.tck.ContextsImpl
-org.jboss.webbeans.tck.spi.Containers=org.jboss.webbeans.test.tck.ContainersImpl
\ No newline at end of file
Modified: ri/trunk/webbeans-ri-spi/pom.xml
===================================================================
--- ri/trunk/webbeans-ri-spi/pom.xml 2009-02-07 12:24:53 UTC (rev 1445)
+++ ri/trunk/webbeans-ri-spi/pom.xml 2009-02-07 13:54:08 UTC (rev 1446)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-ri-spi</artifactId>
- <name>Web Beans RI Service Provider Interfaces</name>
+ <name>Web Beans Service Provider Interfaces</name>
<dependencies>
<dependency>
@@ -39,4 +39,4 @@
<defaultGoal>install</defaultGoal>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-07 12:24:53 UTC (rev 1445)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-07 13:54:08 UTC (rev 1446)
@@ -75,6 +75,7 @@
@SpecAssertion(section = "8.1", id = "unknown")
public void testGetWithCreationalContextReturnsNewInstance()
{
+ deployBeans();
MyContextual bean = new MyContextual(manager);
bean.setShouldReturnNullInstances(false);
manager.addBean(bean);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-07 12:24:53 UTC (rev 1445)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-07 13:54:08 UTC (rev 1446)
@@ -8,6 +8,8 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
import org.jboss.webbeans.tck.SpecAssertions;
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.Classes;
import org.testng.annotations.Test;
/**
@@ -15,6 +17,8 @@
* Spec version: PRD2
*
*/
+ at Artifact(addCurrentPackage=false)
+ at Classes(DefaultDeploymentTypeTest.class)
public class DefaultDeploymentTypeTest extends AbstractTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-07 12:24:53 UTC (rev 1445)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-07 13:54:08 UTC (rev 1446)
@@ -173,6 +173,7 @@
@SpecAssertion(section = "7.3", id = "unknown")
public void testManagerAddObserver()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
// First test with the Class<T> of the event type
@@ -917,6 +918,7 @@
@SpecAssertion(section = "7.7", id = "unknown")
public void testResolvingChecksEventType()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
manager.addObserver(observer, AnEventType.class);
Set<Observer<AnEventType>> resolvedObservers = manager.resolveObservers(new AnEventType());
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-07 12:24:53 UTC (rev 1445)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-07 13:54:08 UTC (rev 1446)
@@ -80,7 +80,7 @@
}
}
- @Test @SpecAssertion(section="5.11", id = "unknown")
+ @Test(groups="broken") @SpecAssertion(section="5.11", id = "unknown")
public void testNamedBasedResolution()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-07 12:24:53 UTC (rev 1445)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-07 13:54:08 UTC (rev 1446)
@@ -34,9 +34,8 @@
@SpecAssertion(section = "5.4", id = "unknown")
public void testClientProxyUsedForNormalScope()
{
- Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
- manager.addBean(tunaBean);
- Tuna tuna = manager.getInstance(tunaBean);
+ deployBeans(Tuna.class);
+ Tuna tuna = manager.getInstanceByType(Tuna.class);
assert configuration().getBeans().isProxy(tuna);
}
More information about the weld-commits
mailing list