maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1050729 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/fork-consoleOutput/ resources/fork-consoleOutput/src/test/java/forkConsoleOutput/ resources/surefire-639-redirectTestOutp...
Date Sat, 18 Dec 2010 22:44:14 GMT
Author: krosenvold
Date: Sat Dec 18 22:44:14 2010
New Revision: 1050729

URL: http://svn.apache.org/viewvc?rev=1050729&view=rev
Log:
Revert "o Lets see if this fixes grid"
Revert "o Made a generalized fork-consoleOutput IT test to test console output"

Will find out about this later. Don't like red builds

Added:
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml
  (contents, props changed)
      - copied, changed from r1050716, maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test1.java
      - copied, changed from r1050716, maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test2.java
  (contents, props changed)
      - copied, changed from r1050716, maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
Removed:
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java

Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml
(from r1050716, maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml&r1=1050716&r2=1050729&rev=1050729&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml
Sat Dec 18 22:44:14 2010
@@ -1,13 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>fork-consoleOutput</artifactId>
+  <groupId>mag</groupId>
+  <artifactId>junit4-test</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>fork-consoleOutput</name>
+  <name>junit4-test</name>
   <url>http://maven.apache.org</url>
-
+  <properties>
+    <junit.version>4.8.1</junit.version>
+    <redirect.to.file>true</redirect.to.file>
+    <forkMode>once</forkMode>
+  </properties>
   <dependencies>
       <dependency>
           <groupId>junit</groupId>
@@ -31,7 +35,6 @@
            <version>${surefire.version}</version>
            <configuration>
              <forkMode>${forkMode}</forkMode>
-             <printSummary>${printSummary}</printSummary>
              <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
              <includes>
                 <include>**/Test*.java</include>
@@ -39,14 +42,5 @@
            </configuration>
         </plugin>
      </plugins>
-
   </build>
-
-    <properties>
-      <junit.version>4.8.1</junit.version>
-      <redirect.to.file>true</redirect.to.file>
-      <forkMode>once</forkMode>
-      <printSummary>true</printSummary>
-    </properties>
-
 </project>

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test1.java
(from r1050716, maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test1.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test1.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java&r1=1050716&r2=1050729&rev=1050729&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test1.java
Sat Dec 18 22:44:14 2010
@@ -1,4 +1,4 @@
-package forkConsoleOutput;
+package surefire639;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -32,17 +32,17 @@ public class Test1
 {
     @Test
     public void test6281() {
-        System.out.println( "Test1 on" + Thread.currentThread().getName());
+        System.out.println( "628Test1 on" + Thread.currentThread().getName());
     }
 
     @BeforeClass
     public static void testWithFailingAssumption2() {
-        System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
+        System.out.println( "Before628Test1 on" + Thread.currentThread().getName());
     }
     
     @AfterClass
     public static void testWithFailingAssumption3() {
-        System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
+        System.out.println( "After628Test1 on" + Thread.currentThread().getName());
     }
 
 }

Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test2.java
(from r1050716, maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test2.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test2.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java&r1=1050716&r2=1050729&rev=1050729&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test2.java
Sat Dec 18 22:44:14 2010
@@ -1,5 +1,4 @@
-package forkConsoleOutput;
-
+package surefire639;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,6 +18,7 @@ package forkConsoleOutput;
  * under the License.
  */
 
+
 import org.junit.Test;
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
@@ -28,21 +28,21 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assume.*;
-public class Test1
+public class Test2
 {
     @Test
     public void test6281() {
-        System.out.println( "Test1 on" + Thread.currentThread().getName());
+        System.out.println( "628Test2 on" + Thread.currentThread().getName());
     }
 
     @BeforeClass
     public static void testWithFailingAssumption2() {
-        System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
+        System.out.println( "Before628Test2 on" + Thread.currentThread().getName());
     }
-    
+
     @AfterClass
     public static void testWithFailingAssumption3() {
-        System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
+        System.out.println( "After628Test2 on" + Thread.currentThread().getName());
     }
 
 }

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-639-redirectTestOutputToFileWhenForking/src/test/java/surefire639/Test2.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message