[seam-commits] Seam SVN: r14395 - in branches/community/Seam_2_3/examples-ee6/todo/todo-tests: src/test/java/org/jboss/seam/example/todo/test and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-03-14 13:43:45 -0400 (Wed, 14 Mar 2012)
New Revision: 14395

Modified:
   branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml
   branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java
Log:
fixed integration - tests disable its skipping

Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml	2012-03-14 17:43:07 UTC (rev 14394)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml	2012-03-14 17:43:45 UTC (rev 14395)
@@ -77,70 +77,46 @@
                 <directory>src/test/resources-integration</directory>
                 <filtering>false</filtering>
             </testResource>
+            <testResource>
+                <directory>${basedir}/../todo-ear/src/main/application</directory>
+                <filtering>true</filtering>
+            </testResource>
+            <testResource>
+                 <directory>${basedir}/../todo-web/src/main/resources</directory>
+                 <filtering>true</filtering>
+            </testResource>            
         </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                       <id>copy-seam-bootstrap</id>
-                       <phase>process-resources</phase>
-                       <goals>
-                          <goal>unpack</goal>
-                       </goals>
-                       <configuration>
-                          <includes>bootstrap/**</includes>
-                          <artifactItems>
-                              <artifactItem>
-                                   <groupId>org.jboss.seam</groupId>
-                                   <artifactId>jboss-embedded-bootstrap</artifactId>
-                                   <version>${project.version}</version>
-                                   <type>jar</type>
-                                   <overWrite>false</overWrite>
-                              </artifactItem>
-                          </artifactItems>
-                       </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>     
+   
     </build>    
 
     <profiles>
-		<profile>
-			<id>integration-tests</id>
-			<activation>
-				<property>
-					<name>arquillian</name>
-				</property>
-			</activation>
-		</profile>
-		<profile>
-			<id>arq-jbossas-7-managed</id>
-			<activation>
-				<property>
-					<name>arquillian</name>
-					<value>jbossas-managed-7</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
+        <profile>
+            <id>integration-tests</id>
+            <activation>
+                <property>
+                    <name>arquillian</name>
+                </property>
+            </activation>
+        </profile>
+
+        <profile>
+            <id>arq-jbossas-7-managed</id>
+            <activation>
+                <property>
+                    <name>arquillian</name>
+                    <value>jbossas-managed-7</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                     </plugin>
-				</plugins>
-	
-			</build>
-		</profile>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>arq-jbossas-7-remote</id>
             <activation>
@@ -149,7 +125,8 @@
                     <value>jbossas-remote-7</value>
                 </property>
             </activation>
-        </profile>		
+        </profile>
+        	
         <profile>
             <id>ftest-jbossas</id>
             <properties>

Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java	2012-03-14 17:43:07 UTC (rev 14394)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java	2012-03-14 17:43:45 UTC (rev 14395)
@@ -16,8 +16,8 @@
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jbpm.taskmgmt.exe.TaskInstance;
+import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.testng.annotations.Test;
 
 @RunWith(Arquillian.class)
 public class TodoTest extends JUnitSeamTest