maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1076743 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java resources/surefire-257-rerunningTests/pom.xml
Date Thu, 03 Mar 2011 19:28:36 GMT
Author: krosenvold
Date: Thu Mar  3 19:28:35 2011
New Revision: 1076743

URL: http://svn.apache.org/viewvc?rev=1076743&view=rev
Log:
o Fixed test break. Simplified test to verify the one thing that we really care about

Modified:
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java?rev=1076743&r1=1076742&r2=1076743&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java
Thu Mar  3 19:28:35 2011
@@ -35,9 +35,8 @@ public class Surefire257NotRerunningTest
     public void testShouldNotRerun()
         throws Exception
     {
-
-        addGoal( "package" );
-        execute( "site" );
+        addGoal("org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion()
+ ":report"  );
+        execute( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion()
+ ":report" );
         verifyTextInLog( "Skipping execution of surefire because it has already been run
for this configuration" );
     }
 }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml?rev=1076743&r1=1076742&r2=1076743&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
Thu Mar  3 19:28:35 2011
@@ -20,61 +20,6 @@
   </build>
 
 
-  <profiles>
-    <profile>
-      <id>maven-3</id>
-      <activation>
-        <file>
-          <!--  This employs that the basedir expression is only recognized by Maven 3.x
(see MNG-2363) -->
-          <exists>${basedir}</exists>
-        </file>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-report-plugin</artifactId>
-              <version>${surefire.version}</version>
-              <inherited>true</inherited>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>${surefire.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-site-plugin</artifactId>
-              <version>3.0-beta-3</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-descriptor</id>
-                <goals>
-                  <goal>attach-descriptor</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-site-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <reporting>
     <plugins>
       <plugin>



Mime
View raw message