svn commit: r1371949 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/unicode-testnames/src/test/java/junit/twoTestCases/

[kr...@apache.org]

Author: krosenvold
Date: Sat Aug 11 13:24:12 2012
New Revision: 1371949

URL: http://svn.apache.org/viewvc?rev=1371949&view=rev
Log:
o Renamed on-disk file to plain ascii and made IT rename file before running test.

All this because svn insists on failing the checkout when characters in the filename
cant be represented on the local filesystem.

Added:
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java
      - copied, changed from r1371895, maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/而索其情Test.java
Removed:
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/而索其情Test.java
Modified:
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java?rev=1371949&r1=1371948&r2=1371949&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java Sat Aug 11 13:24:12 2012
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.its;
 import java.io.File;
 import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.apache.maven.surefire.its.fixture.TestFile;
 
 import org.junit.Assert;
@@ -30,7 +31,7 @@ import org.junit.Test;
 
 /**
  * Verifies unicode filenames pass through correctly.
- *
+ * <p/>
  * If the underlying file system turns out not to support unicode, we just fail an assumption.s
  */
 public class UnicodeTestNamesIT
@@ -39,10 +40,17 @@ public class UnicodeTestNamesIT
     @Test
     public void checkFileNamesWithUnicode()
     {
-        File sourceFile = new File("src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java");
-        Assume.assumeTrue( sourceFile.exists() );
-        OutputValidator outputValidator =
-            unpack( "/unicode-testnames" ).executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
+        SurefireLauncher unpacked = unpack( "unicode-testnames" );
+        File xxyz = new File( unpacked.getUnpackLocation(), "src/test/java/junit/twoTestCases/XXYZTest.java" );
+        System.out.println( "xxyz.exists" + xxyz.exists() );
+        System.err.println( "xxyz.exists" + xxyz.exists() );
+
+        File dest = new File( unpacked.getUnpackLocation(),
+                              "src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java" );
+
+        Assume.assumeTrue( xxyz.renameTo( dest ));
+        Assume.assumeTrue( dest.exists() );
+        OutputValidator outputValidator = unpacked.executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
         TestFile surefireReportsFile = outputValidator.getSurefireReportsFile( "junit.twoTestCases.而索其情Test.txt" );
         Assert.assertTrue( surefireReportsFile.exists() );
         //surefireReportsFile .assertContainsText( "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.txt" );

Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java (from r1371895, maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/而索其情Test.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/%E8%80%8C%E7%B4%A2%E5%85%B6%E6%83%85Test.java&r1=1371895&r2=1371949&rev=1371949&view=diff
==============================================================================
    (empty)