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

8052398: Uniqify test framework class names

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2016-08-12 17:45:31 -07:00
parent a39651d5ea
commit 0ae5880c01
49 changed files with 183 additions and 183 deletions

6
langtools/test/tools/javac/MethodParameters/AnnotationTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters AnnotationTest.java
* @run main Tester AnnotationTest AnnotationTest.out
* @run main MethodParametersTester AnnotationTest AnnotationTest.out
*/
import java.lang.annotation.*;

6
langtools/test/tools/javac/MethodParameters/AnonymousClass.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters AnonymousClass.java
* @run main Tester AnonymousClass AnonymousClass.out
* @run main MethodParametersTester AnonymousClass AnonymousClass.out
*/
class AnonymousClass {

8
langtools/test/tools/javac/MethodParameters/ClassFileVisitor.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -52,9 +52,9 @@ import com.sun.tools.classfile.*;
* rule is checked: <i>param[n] == ++param[n-1].charAt(0) + param[n-1]</i>
* </ul>
*/
class ClassFileVisitor extends Tester.Visitor {
class ClassFileVisitor extends MethodParametersTester.Visitor {
Tester tester;
MethodParametersTester tester;
public String cname;
public boolean isEnum;
@ -66,7 +66,7 @@ class ClassFileVisitor extends Tester.Visitor {
public ClassFile classFile;
public ClassFileVisitor(Tester tester) {
public ClassFileVisitor(MethodParametersTester tester) {
super(tester);
}

6
langtools/test/tools/javac/MethodParameters/Constructors.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters Constructors.java
* @run main Tester Constructors Constructors.out
* @run main MethodParametersTester Constructors Constructors.out
*/
public class Constructors {

6
langtools/test/tools/javac/MethodParameters/EnumTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582 8008658
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters EnumTest.java
* @run main Tester EnumTest EnumTest.out
* @run main MethodParametersTester EnumTest EnumTest.out
*/
/** Test that parameter names are recorded for enum methods */

6
langtools/test/tools/javac/MethodParameters/InstanceMethods.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters InstanceMethods.java
* @run main Tester InstanceMethods InstanceMethods.out
* @run main MethodParametersTester InstanceMethods InstanceMethods.out
*/
public class InstanceMethods {

6
langtools/test/tools/javac/MethodParameters/LambdaTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582 8037546 8138729
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters LambdaTest.java
* @run main Tester LambdaTest LambdaTest.out
* @run main MethodParametersTester LambdaTest LambdaTest.out
*/
/**

6
langtools/test/tools/javac/MethodParameters/LocalClassTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582 8008658
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters LocalClassTest.java
* @run main Tester LocalClassTest LocalClassTest.out
* @run main MethodParametersTester LocalClassTest LocalClassTest.out
*/
class LocalClassTest {

6
langtools/test/tools/javac/MethodParameters/MemberClassTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582 8008658
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters MemberClassTest.java
* @run main Tester MemberClassTest MemberClassTest.out
* @run main MethodParametersTester MemberClassTest MemberClassTest.out
*/
class MemberClassTest {

14
langtools/test/tools/javac/MethodParameters/Tester.java → langtools/test/tools/javac/MethodParameters/MethodParametersTester.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -45,7 +45,7 @@ import java.util.List;
* we wish to reuse the same test-cases, so both test are committed together,
* under langtools. The tests, may be duplicated in the jdk repository.
*/
public class Tester {
public class MethodParametersTester {
final static File classesdir = new File(System.getProperty("test.classes", "."));
@ -92,10 +92,10 @@ public class Tester {
throw new Error(file.getPath() + " not found");
}
new Tester(testName, files, refFile).run();
new MethodParametersTester(testName, files, refFile).run();
}
public Tester(String name, File[] files, File refFile) {
public MethodParametersTester(String name, File[] files, File refFile) {
this.classname = name;
this.files = files;
this.refFile = refFile;
@ -108,7 +108,7 @@ public class Tester {
boolean compResult = false;
try {
String vname = vclass.getName();
Constructor c = vclass.getConstructor(Tester.class);
Constructor c = vclass.getConstructor(MethodParametersTester.class);
info("\nRun " + vname + " for " + classname + "\n");
StringBuilder sb = new StringBuilder();
@ -167,10 +167,10 @@ public class Tester {
}
abstract static class Visitor {
Tester tester;
MethodParametersTester tester;
File classesdir;
public Visitor(Tester tester) {
public Visitor(MethodParametersTester tester) {
this.tester = tester;
}

6
langtools/test/tools/javac/MethodParameters/ReflectionVisitor.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -27,9 +27,9 @@ import java.lang.reflect.*;
/**
* Test MethodParameter attributs by reflection API
*/
public class ReflectionVisitor extends Tester.Visitor {
public class ReflectionVisitor extends MethodParametersTester.Visitor {
public ReflectionVisitor(Tester tester) {
public ReflectionVisitor(MethodParametersTester tester) {
super(tester);
}

6
langtools/test/tools/javac/MethodParameters/StaticMethods.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters StaticMethods.java
* @run main Tester StaticMethods StaticMethods.out
* @run main MethodParametersTester StaticMethods StaticMethods.out
*/
public class StaticMethods {

6
langtools/test/tools/javac/MethodParameters/UncommonParamNames.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -26,9 +26,9 @@
* @bug 8006582
* @summary javac should generate method parameters correctly.
* @modules jdk.jdeps/com.sun.tools.classfile
* @build Tester
* @build MethodParametersTester
* @compile -parameters UncommonParamNames.java
* @run main Tester UncommonParamNames UncommonParamNames.out
* @run main MethodParametersTester UncommonParamNames UncommonParamNames.out
*/
/** Test uncommon parameter names */

6
langtools/test/tools/javac/options/modes/AtFilesTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,13 +29,13 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main AtFilesTest
*/
import java.io.IOException;
public class AtFilesTest extends Tester {
public class AtFilesTest extends OptionModesTester {
public static void main(String... args) throws Exception {
AtFilesTest t = new AtFilesTest();
t.runTests();

6
langtools/test/tools/javac/options/modes/DocLintTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,14 +29,14 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main DocLintTest
*/
import com.sun.tools.javac.main.Main;
import java.io.IOException;
public class DocLintTest extends Tester {
public class DocLintTest extends OptionModesTester {
public static void main(String... args) throws Exception {
DocLintTest t = new DocLintTest();
t.runTests();

6
langtools/test/tools/javac/options/modes/FSInfoTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,7 +29,7 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main FSInfoTest
*/
@ -37,7 +37,7 @@ import com.sun.tools.javac.file.CacheFSInfo;
import com.sun.tools.javac.file.FSInfo;
import java.io.IOException;
public class FSInfoTest extends Tester {
public class FSInfoTest extends OptionModesTester {
public static void main(String... args) throws Exception {
FSInfoTest t = new FSInfoTest();
t.writeFile("C.java", "class C { }");

6
langtools/test/tools/javac/options/modes/InfoOptsTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,13 +29,13 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main InfoOptsTest
*/
import java.io.IOException;
public class InfoOptsTest extends Tester {
public class InfoOptsTest extends OptionModesTester {
public static void main(String... args) throws Exception {
InfoOptsTest t = new InfoOptsTest();
t.runTests();

6
langtools/test/tools/javac/options/modes/NoOperandsTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,14 +29,14 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main NoOperandsTest
*/
import com.sun.tools.javac.main.Main;
import java.io.IOException;
public class NoOperandsTest extends Tester {
public class NoOperandsTest extends OptionModesTester {
public static void main(String... args) throws Exception {
NoOperandsTest t = new NoOperandsTest();
t.runTests();

4
langtools/test/tools/javac/options/modes/Tester.java → langtools/test/tools/javac/options/modes/OptionModesTester.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -51,7 +51,7 @@ import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider;
public class Tester {
public class OptionModesTester {
/** Marker annotation for test methods to be invoked by runTests. */
@Retention(RetentionPolicy.RUNTIME)

6
langtools/test/tools/javac/options/modes/OutputDirTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,14 +29,14 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main OutputDirTest
*/
import com.sun.tools.javac.main.Main;
import java.io.IOException;
public class OutputDirTest extends Tester {
public class OutputDirTest extends OptionModesTester {
public static void main(String... args) throws Exception {
OutputDirTest t = new OutputDirTest();
t.writeFile("src/C.java", "class C { }");

8
langtools/test/tools/javac/options/modes/ProfileBootClassPathTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,7 +29,7 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main ProfileBootClassPathTest
*/
@ -37,13 +37,13 @@ import com.sun.tools.javac.main.Main;
import java.io.File;
import java.io.IOException;
public class ProfileBootClassPathTest extends Tester {
public class ProfileBootClassPathTest extends OptionModesTester {
public static void main(String... args) throws Exception {
ProfileBootClassPathTest t = new ProfileBootClassPathTest();
t.runTests();
}
@Tester.Test
@OptionModesTester.Test
void testProfileBootClassPath() throws IOException {
writeFile("C.java", "class C { }");

6
langtools/test/tools/javac/options/modes/ProfileTargetTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,14 +29,14 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main ProfileTargetTest
*/
import com.sun.tools.javac.main.Main;
import java.io.IOException;
public class ProfileTargetTest extends Tester {
public class ProfileTargetTest extends OptionModesTester {
public static void main(String... args) throws Exception {
ProfileTargetTest t = new ProfileTargetTest();
t.runTests();

6
langtools/test/tools/javac/options/modes/SourceTargetTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,14 +29,14 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main SourceTargetTest
*/
import com.sun.tools.javac.main.Main;
import java.io.IOException;
public class SourceTargetTest extends Tester {
public class SourceTargetTest extends OptionModesTester {
public static void main(String... args) throws Exception {
SourceTargetTest t = new SourceTargetTest();
t.runTests();

6
langtools/test/tools/javac/options/modes/StdOutTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, 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
@ -29,7 +29,7 @@
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build Tester
* @build OptionModesTester
* @run main StdOutTest
*/
@ -38,7 +38,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
public class StdOutTest extends Tester {
public class StdOutTest extends OptionModesTester {
public static void main(String... args) throws Exception {
StdOutTest t = new StdOutTest();
t.writeFile("src/Bad.java", "class Bad");

8
langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -29,16 +29,16 @@
* Test an annotation type with a type nested within.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/annotations/annotatePackage/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2016, 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
@ -27,16 +27,16 @@
* @summary Test package annotations and package-info.java package comments.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.*;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1", "pkg2");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1", "pkg2");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/annotations/annotateParams/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2016, 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
@ -27,16 +27,16 @@
* @summary Test parameter annotations.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

6
langtools/test/tools/javadoc/annotations/badVals/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2016, 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
@ -32,9 +32,9 @@
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/annotations/defaults/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -28,7 +28,7 @@
* annotations that use them.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
@ -36,9 +36,9 @@ import java.io.IOException;
import com.sun.javadoc.*;
import com.sun.javadoc.AnnotationDesc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/annotations/elementTypes/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -28,7 +28,7 @@
* types.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
@ -37,9 +37,9 @@ import java.util.Arrays;
import com.sun.javadoc.*;
import com.sun.javadoc.AnnotationDesc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

4
langtools/test/tools/javadoc/annotations/missing/Main.java

@ -34,9 +34,9 @@ import com.sun.javadoc.RootDoc;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.AnnotationDesc;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "somepackage");
private static final OldToolTester tester = new OldToolTester("Main", "somepackage");
public static void main(String... args) throws Exception {
tester.run();

8
langtools/test/tools/javadoc/annotations/shortcuts/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify that "shortcuts" are used when printing annotations.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

10
langtools/test/tools/javadoc/enum/docComments/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,17 +27,17 @@
* @summary Verify the comments in an enum type.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester =
new Tester("Main", "-package", "pkg1");
private static final OldToolTester tester =
new OldToolTester("Main", "-package", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/enum/enumType/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the contents of an enum type.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/genericClass/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the contents of the ClassDoc of a generic class.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -28,7 +28,7 @@
* a generic class with a generic inner class.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
@ -36,9 +36,9 @@ import java.io.IOException;
import java.util.Arrays;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/genericInterface/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the contents of the ClassDoc of a generic interface.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/genericMethod/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the reading of generic methods and constructors.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

10
langtools/test/tools/javadoc/generics/genericSuper/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,7 +27,7 @@
* @summary Verify the contents of the ClassDoc of a generic class.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
@ -35,10 +35,10 @@ import java.io.IOException;
import java.util.Arrays;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester =
new Tester("Main", "pkg1", "-package");
private static final OldToolTester tester =
new OldToolTester("Main", "pkg1", "-package");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/supertypes/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,7 +27,7 @@
* @summary Check supertypes and superinterfaces of parameterized types.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
@ -36,9 +36,9 @@ import java.util.Comparator;
import java.util.Arrays;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/throwsGeneric/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the reading of generic methods and constructors.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/tparamCycle/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Check a type parameter whose bound cycles back on itself.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the reading of type parameter tags on methods.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the reading of a type parameter tag on an interface.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/generics/wildcards/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -27,16 +27,16 @@
* @summary Verify the contents of the ClassDoc of a generic class.
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
* @compile ../../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester = new Tester("Main", "pkg1");
private static final OldToolTester tester = new OldToolTester("Main", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

8
langtools/test/tools/javadoc/lib/Tester.java → langtools/test/tools/javadoc/lib/OldToolTester.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -33,7 +33,7 @@ import java.util.*;
import com.sun.javadoc.*;
public class Tester {
public class OldToolTester {
protected final String TEST_SRC = System.getProperty("test.src", ".");
protected final String TEST_CLASSES = System.getProperty("test.classes",
@ -65,11 +65,11 @@ public class Tester {
}
public Tester(String docletName) {
public OldToolTester(String docletName) {
this(docletName, new String[0]);
}
public Tester(String docletName, String... additionalArgs) {
public OldToolTester(String docletName, String... additionalArgs) {
this.docletName = docletName;
int len = DEFAULT_ARGS.length + additionalArgs.length;

10
langtools/test/tools/javadoc/varArgs/Main.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -28,17 +28,17 @@
* Verify that see/link tags can use "..." notation.
* @library ../lib
* @modules jdk.javadoc
* @compile ../lib/Tester.java Main.java
* @compile ../lib/OldToolTester.java Main.java
* @run main Main
*/
import java.io.IOException;
import com.sun.javadoc.*;
public class Main extends Tester.Doclet {
public class Main extends OldToolTester.Doclet {
private static final Tester tester =
new Tester("Main", "-Xwerror", "pkg1");
private static final OldToolTester tester =
new OldToolTester("Main", "-Xwerror", "pkg1");
public static void main(String[] args) throws IOException {
tester.run();

22
langtools/test/tools/javap/output/Tester.java → langtools/test/tools/javap/output/JavapTester.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -27,7 +27,7 @@ import java.lang.annotation.*;
import java.lang.reflect.InvocationTargetException;
/**
* {@code Tester} is an abstract test-driver that provides the logic
* {@code JavapTester} is an abstract test-driver that provides the logic
* to execute test-cases, grouped by test classes.
* A test class is a main class extending this class, that instantiate
* itself, and calls the {@link run} method, passing any command line
@ -45,7 +45,7 @@ import java.lang.reflect.InvocationTargetException;
* setting up a test-case template, and possibly overwrite default
* test-driver behaviour.
*/
public abstract class Tester {
public abstract class JavapTester {
private static boolean debug = false;
private static final PrintStream out = System.err;
@ -95,7 +95,7 @@ public abstract class Tester {
}
out.println("TestCase: " + clname);
cases++;
Tester tc = (Tester) tclass.getConstructor().newInstance();
JavapTester tc = (JavapTester) tclass.getConstructor().newInstance();
if (tc.errors > 0) {
error("" + tc.errors + " test points failed in " + clname);
errors += tc.errors - 1;
@ -120,7 +120,7 @@ public abstract class Tester {
/**
* Test-cases must be marked with the {@code TestCase} annotation,
* as well as extend {@code Tester} (or an driver extension
* as well as extend {@code JavapTester} (or an driver extension
* specified as the first argument to the {@code main()} method.
*/
@Retention(RetentionPolicy.RUNTIME)
@ -135,7 +135,7 @@ public abstract class Tester {
@interface ignore { }
/**
* Test-cases are classes extending {@code Tester}, and
* Test-cases are classes extending {@code JavapTester}, and
* calling {@link setSrc}, followed by one or more invocations
* of {@link verify} in the body of the constructor.
* <p>
@ -144,7 +144,7 @@ public abstract class Tester {
* Subclasses will typically call {@code setSrc(TestSource)}
* to setup a useful test-case template.
*/
public Tester() {
public JavapTester() {
this.testCase = this.getClass().getName();
src = new TestSource("TESTCASE");
}
@ -152,7 +152,7 @@ public abstract class Tester {
/**
* Set the top-level source template.
*/
protected Tester setSrc(TestSource src) {
protected JavapTester setSrc(TestSource src) {
this.src = src;
return this;
}
@ -160,14 +160,14 @@ public abstract class Tester {
/**
* Convenience method for calling {@code innerSrc("TESTCASE", ...)}.
*/
protected Tester setSrc(String... lines) {
protected JavapTester setSrc(String... lines) {
return innerSrc("TESTCASE", lines);
}
/**
* Convenience method for calling {@code innerSrc(key, new TestSource(...))}.
*/
protected Tester innerSrc(String key, String... lines) {
protected JavapTester innerSrc(String key, String... lines) {
return innerSrc(key, new TestSource(lines));
}
@ -175,7 +175,7 @@ public abstract class Tester {
* Specialize the testcase template, setting replacement content
* for the specified key.
*/
protected Tester innerSrc(String key, TestSource content) {
protected JavapTester innerSrc(String key, TestSource content) {
if (src == null) {
src = new TestSource(key);
}

6
langtools/test/tools/javap/output/RepeatingTypeAnnotations.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -46,13 +46,13 @@ import java.util.*;
* produced to help debugging. Test annotated with {@code ignore}
* can be executed explicitly.
*/
public class RepeatingTypeAnnotations extends Tester {
public class RepeatingTypeAnnotations extends JavapTester {
/**
* Main method instantiates test and run test-cases.
*/
public static void main(String... args) throws Exception {
Tester tester = new RepeatingTypeAnnotations();
JavapTester tester = new RepeatingTypeAnnotations();
tester.run(args);
}