Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/tools/javac/4846262/CheckEBCDICLocaleTest.java	Thu Mar 14 01:45:44 2013 -0400
     1.2 +++ b/test/tools/javac/4846262/CheckEBCDICLocaleTest.java	Thu Mar 14 08:30:16 2013 +0000
     1.3 @@ -34,9 +34,7 @@
     1.4  import java.nio.file.Files;
     1.5  import java.nio.file.Paths;
     1.6  import java.util.Arrays;
     1.7 -import com.sun.tools.javac.util.ArrayUtils;
     1.8  
     1.9 -//original test: test/tools/javac/4846262/Test.sh
    1.10  public class CheckEBCDICLocaleTest {
    1.11  
    1.12      private static final String TestSrc =
    1.13 @@ -46,11 +44,11 @@
    1.14          "    }\n" +
    1.15          "}";
    1.16  
    1.17 -    private static final String TestOut =
    1.18 -        "output/Test.java:3: error: not a statement\n" +
    1.19 +    private static final String TestOutTemplate =
    1.20 +        "output%1$sTest.java:3: error: not a statement\n" +
    1.21          "        abcdefg\n" +
    1.22          "        ^\n" +
    1.23 -        "output/Test.java:3: error: ';' expected\n" +
    1.24 +        "output%1$sTest.java:3: error: ';' expected\n" +
    1.25          "        abcdefg\n" +
    1.26          "               ^\n" +
    1.27          "2 errors\n";
    1.28 @@ -62,38 +60,37 @@
    1.29      public void test() throws Exception {
    1.30          String native2asciiBinary = Paths.get(
    1.31                  System.getProperty("test.jdk"),"bin", "native2ascii").toString();
    1.32 -        String testVMOpts = System.getProperty("test.tool.vm.opts");
    1.33 -        String[] mainArgs = ToolBox.getJavacBin();
    1.34  
    1.35          ToolBox.createJavaFileFromSource(TestSrc);
    1.36          Files.createDirectory(Paths.get("output"));
    1.37  
    1.38 -//"${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -reverse -encoding IBM1047 ${TESTSRC}${FS}Test.java Test.java
    1.39          ToolBox.AnyToolArgs nativeCmdParams =
    1.40                  new ToolBox.AnyToolArgs()
    1.41 -                .setAllArgs(native2asciiBinary, testVMOpts,
    1.42 -                    "-reverse", "-encoding", "IBM1047",
    1.43 -                    "Test.java", "output/Test.java");
    1.44 +                .appendArgs(native2asciiBinary)
    1.45 +                .appendArgs(ToolBox.testToolVMOpts)
    1.46 +                .appendArgs("-reverse", "-encoding", "IBM1047", "Test.java",
    1.47 +                "output/Test.java");
    1.48          ToolBox.executeCommand(nativeCmdParams);
    1.49  
    1.50 -//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -J-Duser.language=en -J-Duser.region=US -J-Dfile.encoding=IBM1047 Test.java 2>Test.tmp
    1.51          ToolBox.AnyToolArgs javacParams =
    1.52                  new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
    1.53 -                .setAllArgs(ArrayUtils.concatOpen(mainArgs, "-J-Duser.language=en",
    1.54 +                .appendArgs(ToolBox.javacBinary)
    1.55 +                .appendArgs(ToolBox.testToolVMOpts)
    1.56 +                .appendArgs("-J-Duser.language=en",
    1.57                  "-J-Duser.region=US", "-J-Dfile.encoding=IBM1047",
    1.58 -                "output/Test.java"))
    1.59 +                "output/Test.java")
    1.60                  .setErrOutput(new File("Test.tmp"));
    1.61          ToolBox.executeCommand(javacParams);
    1.62  
    1.63 -//"${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -encoding IBM1047 Test.tmp Test.out
    1.64 -        nativeCmdParams.setAllArgs(native2asciiBinary, "-encoding", "IBM1047",
    1.65 -                    "Test.tmp", "Test.out");
    1.66 +        nativeCmdParams = new ToolBox.AnyToolArgs()
    1.67 +                .appendArgs(native2asciiBinary)
    1.68 +                .appendArgs(ToolBox.testToolVMOpts)
    1.69 +                .appendArgs("-encoding", "IBM1047", "Test.tmp", "Test.out");
    1.70          ToolBox.executeCommand(nativeCmdParams);
    1.71  
    1.72 -//diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
    1.73 +        String goldenFile = String.format(TestOutTemplate, File.separator);
    1.74          ToolBox.compareLines(Paths.get("Test.out"),
    1.75 -                Arrays.asList(TestOut.split("\n")), null);
    1.76 -
    1.77 +                Arrays.asList(goldenFile.split("\n")), null, true);
    1.78      }
    1.79  
    1.80  }