[jboss-svn-commits] JBoss Common SVN: r4122 - in arquillian/trunk/examples: domain/src/main/resources/com/acme and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 8 09:04:50 EST 2010
Author: aslak
Date: 2010-03-08 09:04:50 -0500 (Mon, 08 Mar 2010)
New Revision: 4122
Added:
arquillian/trunk/examples/domain/src/main/resources/com/acme/cdi/
arquillian/trunk/examples/domain/src/main/resources/com/acme/cdi/payment/
arquillian/trunk/examples/domain/src/main/resources/com/acme/cdi/payment/beans.xml
Removed:
arquillian/trunk/examples/junit/src/test/resources/com/acme/cdi/payment/
Modified:
arquillian/trunk/examples/domain/pom.xml
arquillian/trunk/examples/junit/pom.xml
arquillian/trunk/examples/testng/pom.xml
arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java
Log:
ARQ-44
Modified: arquillian/trunk/examples/domain/pom.xml
===================================================================
--- arquillian/trunk/examples/domain/pom.xml 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/domain/pom.xml 2010-03-08 14:04:50 UTC (rev 4122)
@@ -26,42 +26,14 @@
</properties>
- <build>
- <plugins>
- <!-- Surefire -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- ARQ-60 -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!--
- Added a default profile used during compiling. The JavaEE
- API jar can not be on classpath during test execution.
- -->
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<!-- Dependencies -->
<dependencies>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
Copied: arquillian/trunk/examples/domain/src/main/resources/com/acme/cdi/payment/beans.xml (from rev 4117, arquillian/trunk/examples/junit/src/test/resources/com/acme/cdi/payment/beans.xml)
===================================================================
--- arquillian/trunk/examples/domain/src/main/resources/com/acme/cdi/payment/beans.xml (rev 0)
+++ arquillian/trunk/examples/domain/src/main/resources/com/acme/cdi/payment/beans.xml 2010-03-08 14:04:50 UTC (rev 4122)
@@ -0,0 +1,6 @@
+<beans 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/beans_1_0.xsd">
+ <alternatives>
+ <class>com.acme.cdi.payment.MockPaymentProcessor</class>
+ </alternatives>
+</beans>
\ No newline at end of file
Modified: arquillian/trunk/examples/junit/pom.xml
===================================================================
--- arquillian/trunk/examples/junit/pom.xml 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/junit/pom.xml 2010-03-08 14:04:50 UTC (rev 4122)
@@ -25,19 +25,6 @@
</properties>
- <build>
- <plugins>
- <!-- Surefire -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- ARQ-60 -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<!--
@@ -55,6 +42,18 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <!-- Surefire -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- ARQ-60 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>weld-se</id>
Modified: arquillian/trunk/examples/testng/pom.xml
===================================================================
--- arquillian/trunk/examples/testng/pom.xml 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/testng/pom.xml 2010-03-08 14:04:50 UTC (rev 4122)
@@ -25,26 +25,13 @@
<!-- Versioning -->
</properties>
-
- <build>
- <plugins>
- <!-- Surefire -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- ARQ-60 -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
- <!--
- Added a default profile used during compiling.
- The JavaEE API jar can not be on classpath during test execution.
- -->
+ <!--
+ Added a default profile used during compiling. The JavaEE
+ API jar can not be on classpath during test execution.
+ -->
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -56,6 +43,18 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <!-- Surefire -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- ARQ-60 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>weld-se</id>
@@ -155,18 +154,17 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0-SP1</version>
+ <version>1.0-SP1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
- <version>3.0</version>
+ <version>3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
-
+</project>
\ No newline at end of file
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-03-08 14:04:50 UTC (rev 4122)
@@ -37,6 +37,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
+ at Test(groups = "integration")
public class InjectionTestCase extends Arquillian
{
@Deployment
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-03-08 14:04:50 UTC (rev 4122)
@@ -41,19 +41,19 @@
@Inject TranslateController controller;
- @Test
+ @Test(enabled = false) // https://jira.jboss.org/jira/browse/ARQ-55
public void shouldSetInputText() throws Exception
{
controller.setInputText("hi");
}
- @Test(dependsOnMethods = "shouldSetInputText")
+ @Test(dependsOnMethods = "shouldSetInputText", enabled = false) // https://jira.jboss.org/jira/browse/ARQ-55
public void shouldTranslate() throws Exception
{
controller.translate();
}
- @Test(dependsOnMethods = "shouldTranslate")
+ @Test(dependsOnMethods = "shouldTranslate", enabled = false) // https://jira.jboss.org/jira/browse/ARQ-55
public void shouldVerify() throws Exception
{
Assert.assertEquals(controller.getTranslation(), "hei");
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-03-08 14:04:50 UTC (rev 4122)
@@ -8,6 +8,7 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+ at Test(groups = "integration")
public class TemperatureConverterTestCase extends Arquillian {
@EJB
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-03-08 13:10:22 UTC (rev 4121)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-03-08 14:04:50 UTC (rev 4122)
@@ -53,14 +53,13 @@
@EJB
private UserRepository userRepository;
- @Test
+ @Test(enabled = false) // https://jira.jboss.org/jira/browse/ARQ-55
public void shouldBeAbleToStoreUser() throws Exception
{
userRepository.store(new User(FIRST_NAME, LAST_NAME));
}
- //@Test(dependsOnMethods = "shouldBeAbleToStoreUser")
- @Test
+ @Test(dependsOnMethods = "shouldBeAbleToStoreUser", enabled = false) // https://jira.jboss.org/jira/browse/ARQ-55
public void shouldBeAbleToFindUser() throws Exception
{
List<User> users = userRepository.getByFirstName(FIRST_NAME);
More information about the jboss-svn-commits
mailing list