stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8016908: TEST_BUG: removing non-ascii characters causes tests to fail

Browse Source 
Reviewed-by: jjg, vromero
This commit is contained in:
Kumar Srinivasan 2013-06-26 09:54:46 -07:00
parent fd80bae5c5
commit 3ab53b61f0
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
langtools/test/tools/javac/api/6437999/T6437999.java
View File

@ -33,11 +33,28 @@
*/
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.tools.*;
import static java.nio.file.StandardOpenOption.*;
public class T6437999 extends ToolTester {
final File testFile = new File("Utf8.java");
T6437999() throws IOException {
createTestFile();
}
final void createTestFile() throws IOException {
List<String> scratch = new ArrayList<>();
scratch.add("// @author Peter von der Ah" + (char) 0xe9);
scratch.add("class Utf8{}");
Files.write(testFile.toPath(), scratch, Charset.forName("UTF-8"),
CREATE, TRUNCATE_EXISTING);
}
static class MyDiagnosticListener implements DiagnosticListener<JavaFileObject> {
boolean error = false;
public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
@ -55,7 +72,7 @@ public class T6437999 extends ToolTester {
dl.error = false;
fm = getFileManager(tool, dl, Charset.forName("ASCII"));
fm.handleOption("-source", sourceLevel.iterator());
files = fm.getJavaFileObjects(new File(test_src, "Utf8.java"));
files = fm.getJavaFileObjects(testFile);
tool.getTask(null, fm, null, null, null, files).call();
if (!dl.error)
throw new AssertionError("No error in ASCII mode");
@ -63,12 +80,12 @@ public class T6437999 extends ToolTester {
dl.error = false;
fm = getFileManager(tool, dl, Charset.forName("UTF-8"));
fm.handleOption("-source", sourceLevel.iterator());
files = fm.getJavaFileObjects(new File(test_src, "Utf8.java"));
files = fm.getJavaFileObjects(testFile);
task = tool.getTask(null, fm, null, null, null, files);
if (dl.error)
throw new AssertionError("Error in UTF-8 mode");
}
public static void main(String... args) {
public static void main(String... args) throws IOException {
new T6437999().test(args);
}
}

27
langtools/test/tools/javac/api/6437999/Utf8.java
View File

@ -1,27 +0,0 @@
/*
* Copyright (c) 2006, 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @author Peter von der Ah\u00e9
*/
class Utf8 {}

23
langtools/test/tools/javac/api/T6306137.java
View File

@ -31,8 +31,14 @@
*/
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.tools.*;
import static java.nio.file.StandardOpenOption.*;
public class T6306137 {
boolean error;
@ -40,8 +46,9 @@ public class T6306137 {
final JavaCompiler compiler;
Iterable<? extends JavaFileObject> files;
DiagnosticListener<JavaFileObject> dl;
final File testFile = new File("Utf8.java");
T6306137() {
T6306137() throws IOException {
dl = new DiagnosticListener<JavaFileObject>() {
public void report(Diagnostic<? extends JavaFileObject> message) {
if (message.getKind() == Diagnostic.Kind.ERROR)
@ -56,11 +63,17 @@ public class T6306137 {
};
compiler = ToolProvider.getSystemJavaCompiler();
fm = compiler.getStandardFileManager(dl, null, null);
String srcdir = System.getProperty("test.src");
files =
fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(srcdir, "T6306137.java")));
fm.getJavaFileObjectsFromFiles(Arrays.asList(testFile));
createTestFile();
}
final void createTestFile() throws IOException {
List<String> scratch = new ArrayList<>();
scratch.add("// @author Peter von der Ah" + (char)0xe9);
scratch.add("class Utf8{}");
Files.write(testFile.toPath(), scratch, Charset.forName("UTF-8"),
CREATE, TRUNCATE_EXISTING);
}
void test(String encoding, boolean good) {
error = false;
Iterable<String> args = Arrays.asList("-source", "6", "-encoding", encoding, "-d", ".");
@ -74,7 +87,7 @@ public class T6306137 {
}
}
public static void main(String[] args) {
public static void main(String[] args) throws IOException {
T6306137 self = new T6306137();
self.test("utf-8", true);
self.test("ascii", false);