archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7124443: (launcher) test DefaultsLocaleTest fails with Windows shells

Browse source 
Reviewed-by: darcy
This commit is contained in:
Kumar Srinivasan 2012-01-03 08:33:30 -08:00
parent 3890c64b86
commit 6274287b95
4 changed files with 116 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

53
jdk/test/tools/launcher/DefaultLocaleTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -21,22 +21,55 @@
* questions.
*/
import java.util.Properties;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import static java.nio.file.Files.*;
import static java.nio.file.StandardOpenOption.*;
public class DefaultLocaleTest {
public static void main(String[] args) {
String setting =
static final String setting =
"language:" + System.getProperty("user.language") + "_" +
"country:" + System.getProperty("user.country") + "_" +
"encoding:" + System.getProperty("file.encoding") + "_" +
"jnuEncoding:"+ System.getProperty("sun.jnu.encoding");
if (args.length != 0) {
if (!setting.equals(args[0])) {
System.exit(1);
public static void main(String[] args) throws IOException {
if (args != null && args.length > 1) {
File f = new File(args[1]);
switch (args[0]) {
case "-r":
System.out.println("reading file: " + args[1]);
String str = null;
try (BufferedReader in = newBufferedReader(f.toPath(),
Charset.defaultCharset())) {
str = in.readLine().trim();
}
if (setting.equals(str)) {
System.out.println("Compared ok");
} else {
System.out.println("Compare fails");
System.out.println("EXPECTED: " + setting);
System.out.println("OBTAINED: " + str);
throw new RuntimeException("Test fails: compare failed");
}
break;
case "-w":
System.out.println("writing file: " + args[1]);
try (BufferedWriter out = newBufferedWriter(f.toPath(),
Charset.defaultCharset(), CREATE_NEW)) {
out.write(setting);
}
break;
default:
throw new RuntimeException("ERROR: invalid arguments");
}
} else {
System.out.println(setting);
throw new RuntimeException("ERROR: invalid arguments");
}
System.exit(0);
}
}
}