Author: krosenvold Date: Thu May 19 19:06:07 2011 New Revision: 1125058 URL: http://svn.apache.org/viewvc?rev=1125058&view=rev Log: [SUREFIRE-740] Fixed execution time truncation
With integration test Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java - copied, changed from r1104433, 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/junit-fork-mode-always/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml (with props) maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java (with props) maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java (with props) maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java (with props) maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml (with props) maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml (with props) maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml (with props) Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java?rev=1125058&r1=1125057&r2=1125058&view=diff ============================================================================== --- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java Thu May 19 19:06:07 2011 @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; @@ -47,7 +48,7 @@ public class TestSuiteXmlParser private ReportTestSuite defaultSuite; private ReportTestSuite currentSuite; private Map classesToSuites; - private final NumberFormat numberFormat = NumberFormat.getInstance(); + private final NumberFormat numberFormat = NumberFormat.getInstance( Locale.ENGLISH); /** * @noinspection StringBufferField Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java?rev=1125058&r1=1125057&r2=1125058&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java Thu May 19 19:06:07 2011 @@ -18,9 +18,8 @@ package org.apache.maven.surefire.its; * under the License. */ -import org.apache.maven.surefire.its.misc.HelperAssertions; - import java.io.File; +import org.apache.maven.surefire.its.misc.HelperAssertions; import junit.framework.Assert; @@ -41,7 +40,7 @@ public class CheckTestNgReportTestIT public void testTestNgReport() throws Exception { - execute( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" ); + execute( getSurefireReportGoal() ); verifyErrorFreeLog(); HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, getTestDir() ); 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=1125058&r1=1125057&r2=1125058&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 May 19 19:06:07 2011 @@ -35,8 +35,8 @@ public class Surefire257NotRerunningTest public void testShouldNotRerun() throws Exception { - addGoal("org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" ); - execute( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" ); + addGoal( getSurefireReportGoal() ); + execute( getSurefireReportGoal() ); verifyTextInLog( "Skipping execution of surefire because it has already been run for this configuration" ); } } Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1125058&r1=1125057&r2=1125058&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java Thu May 19 19:06:07 2011 @@ -22,7 +22,11 @@ package org.apache.maven.surefire.its; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; @@ -57,6 +61,8 @@ public abstract class SurefireVerifierTe private final Verifier verifier; + private final Map<String, String> envvars = new HashMap<String, String>( ); + private final String testNgVersion = System.getProperty( "testng.version" ); private final String surefireVersion = System.getProperty( "surefire.version" ); @@ -97,6 +103,11 @@ public abstract class SurefireVerifierTe cliOptions.clear(); } + + protected void addEnvVar(String key, String value){ + envvars.put( key, value ); + } + private List<String> getInitialGoals() { List<String> goals1 = new ArrayList<String>(); @@ -210,7 +221,7 @@ public abstract class SurefireVerifierTe verifier.setCliOptions( cliOptions ); try { - verifier.executeGoals( goals ); + verifier.executeGoals( goals, envvars ); return verifier; } finally @@ -379,4 +390,8 @@ public abstract class SurefireVerifierTe return surefireVersion; } + protected String getSurefireReportGoal() + { + return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report"; + } } Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java (from r1104433, 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/misc/Surefire740TruncatedCommaIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java&r1=1104433&r2=1125058&rev=1125058&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/misc/Surefire740TruncatedCommaIT.java Thu May 19 19:06:07 2011 @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.its; +package org.apache.maven.surefire.its.misc; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,25 +18,36 @@ package org.apache.maven.surefire.its; * under the License. */ + +import java.io.File; +import org.apache.maven.surefire.its.SurefireVerifierTestClass; + /** - * Test Surefire-257 Verifies that surefire does not re-run tests in site build + * Test Surefire-740 Truncated comma with non us locale * * @author Kristian Rosenvold */ -public class Surefire257NotRerunningTestsIT +public class Surefire740TruncatedCommaIT extends SurefireVerifierTestClass { - public Surefire257NotRerunningTestsIT() + public Surefire740TruncatedCommaIT() { - super( "/surefire-257-rerunningTests" ); + super( "/surefire-740-comma-truncated" ); } - public void testShouldNotRerun() + public void testRussianLocaleReport() throws Exception { - 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" ); + addEnvVar( "MAVEN_OPTS", "-Duser.language=ru -Duser.country=RU" ); + failNever(); + execute( getSurefireReportGoal() ); + + + File siteFile = getSiteFile( "surefire-report.html" ); + System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() ); + assertTrue( "Expecting file", siteFile.exists()); + assertContainsText( siteFile, "027" ); // Avoid asserting with the "," or "." ;) } + } Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml Thu May 19 19:06:07 2011 @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<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>testng-fork-mode</artifactId> + <version>1.0-SNAPSHOT</version> + <name>Test for forkMode</name> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> + <configuration> + <forkMode>${forkMode}</forkMode> + + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java Thu May 19 19:06:07 2011 @@ -0,0 +1,37 @@ +package junit4.forkMode; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.management.ManagementFactory; + +import org.junit.Test; + + +public class Test1 +{ + + @Test + public void test1() throws IOException { + dumpPidFile("test1"); + } + + public static void dumpPidFile(String name) throws IOException { + String fileName = name + "-pid"; + File target = new File("target"); + if (! (target.exists() && target.isDirectory()) ) { + target = new File ("."); + } + File pidFile = new File(target, fileName); + FileWriter fw = new FileWriter(pidFile); + // DGF little known trick... this is guaranteed to be unique to the PID + // In fact, it usually contains the pid and the local host name! + String pid = ManagementFactory.getRuntimeMXBean().getName(); + fw.write( pid ); + fw.flush(); + fw.close(); + + System.out.println( "pid = " + pid ); + } + +} Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java Thu May 19 19:06:07 2011 @@ -0,0 +1,16 @@ +package junit4.forkMode; + +import java.io.IOException; + +import org.junit.Test; + + +public class Test2 +{ + + @Test + public void test2() throws IOException { + Test1.dumpPidFile("test2"); + } + +} Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java Thu May 19 19:06:07 2011 @@ -0,0 +1,15 @@ +package junit4.forkMode; + +import java.io.IOException; + +import org.junit.Test; + +public class Test3 +{ + + @Test + public void test3() throws IOException { + Test1.dumpPidFile("test3"); + } + +} Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml Thu May 19 19:06:07 2011 @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest"> + <properties> + <property name="surefire.version" value="2.8.1"/> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/> + <property name="java.vm.version" value="19.1-b02"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=":"/> + <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="RU"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="unknown"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/> + <property name="java.runtime.version" value="1.6.0_24-b07"/> + <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/> + <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/> + <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/> + <property name="os.arch" value="amd64"/> + <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/> + <property name="java.io.tmpdir" value="/tmp"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="os.name" value="Linux"/> + <property name="sun.jnu.encoding" value="UTF-8"/> + <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/> + <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/> + <property name="os.version" value="2.6.32-29-generic"/> + <property name="user.home" value="/home/kristian"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="UTF-8"/> + <property name="user.name" value="kristian"/> + <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="64"/> + <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="ru"/> + <property name="java.vm.info" value="mixed mode"/> + <property name="java.version" value="1.6.0_24"/> + <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/> + <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="/home/kristian/fast/repo"/> + <property name="file.separator" value="/"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="gnome"/> + <property name="sun.cpu.isalist" value=""/> + </properties> + <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/> +</testsuite> \ No newline at end of file Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml Thu May 19 19:06:07 2011 @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo"> + <properties> + <property name="surefire.version" value="2.8.1"/> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/> + <property name="java.vm.version" value="19.1-b02"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=":"/> + <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="RU"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="unknown"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/> + <property name="java.runtime.version" value="1.6.0_24-b07"/> + <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/> + <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/> + <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/> + <property name="os.arch" value="amd64"/> + <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/> + <property name="java.io.tmpdir" value="/tmp"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="os.name" value="Linux"/> + <property name="sun.jnu.encoding" value="UTF-8"/> + <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/> + <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/> + <property name="os.version" value="2.6.32-29-generic"/> + <property name="user.home" value="/home/kristian"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="UTF-8"/> + <property name="user.name" value="kristian"/> + <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="64"/> + <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="ru"/> + <property name="java.vm.info" value="mixed mode"/> + <property name="java.version" value="1.6.0_24"/> + <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/> + <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="/home/kristian/fast/repo"/> + <property name="file.separator" value="/"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="gnome"/> + <property name="sun.cpu.isalist" value=""/> + </properties> + <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/> +</testsuite> \ No newline at end of file Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml?rev=1125058&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml Thu May 19 19:06:07 2011 @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<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>junit-twoTestCases</artifactId> + <version>1.0-SNAPSHOT</version> + <name>Test for two test cases</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${surefire.version}</version> + <inherited>true</inherited> + <configuration> + <reportsDirectories> + <reportsDirectory>${basedir}/persistent-reports</reportsDirectory> + </reportsDirectories> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.0-beta-3</version> + </plugin> + </plugins> + </build> + +</project> Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native