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

8012728: Normalize @ignore comments on langtools tests

Browse source 
Reviewed-by: vromero, mcimadamore
This commit is contained in:
Jonathan Gibbons 2013-05-03 09:56:56 -07:00
parent 0ab1bb68cc
commit 155bd74411
26 changed files with 81 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

18
langtools/test/com/sun/javadoc/_template/Template.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 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
@ -22,15 +22,13 @@
*/
/*
* test
* @bug 0000000
* @summary <DESC>
* @author jamieh
* @library ../lib/
* @ignore This is a template for regression tests.
* @build JavadocTester
* @build <CLASS NAME>
* @run main <CLASS NAME>
* @ test
* @ bug <BUG-ID>
* @ summary <BUG-SYNOPSIS>
* @ author <AUTHOR> or delete
* @ library ../lib/
* @ build JavadocTester <CLASS NAME>
* @ run main <CLASS NAME>
*/
public class Template extends JavadocTester {

18
langtools/test/com/sun/javadoc/_template/TemplateComplete.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 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
@ -22,15 +22,13 @@
*/
/*
* test
* @bug 0000000
* @summary <DESC>
* @author jamieh
* @library ../lib/
* @ignore This is a template for regression tests.
* @build JavadocTester
* @build <CLASS NAME>
* @run main <CLASS NAME>
* @ test
* @ bug <BUG-ID>
* @ summary <BUG-SYNOPSIS>
* @ author <AUTHOR> or delete
* @ library ../lib/
* @ build JavadocTester <CLASS NAME>
* @ run main <CLASS NAME>
*/
public class TemplateComplete extends JavadocTester {

20
langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
View file

@ -45,7 +45,7 @@ public class TestTypeAnnotations extends JavadocTester {
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[][] TEST = {
// Test for type annotations on Class Extends (ClassExtends.java).
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "MyClass.html",
"extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " +
"in typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedClass.html\" " +
@ -54,7 +54,7 @@ public class TestTypeAnnotations extends JavadocTester {
"@ClassExtB</a> java.lang.String&gt;"
},
*/
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "MyClass.html",
"implements <a href=\"../typeannos/ClassExtB.html\" title=\"" +
"annotation in typeannos\">@ClassExtB</a> java.lang.CharSequence, " +
@ -65,7 +65,7 @@ public class TestTypeAnnotations extends JavadocTester {
"typeannos\">@ClassExtB</a> java.lang.String&gt;</pre>"
},
*/
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "MyInterface.html",
"extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " +
"in typeannos\">@ClassExtA</a> <a href=\"../typeannos/" +
@ -83,7 +83,7 @@ public class TestTypeAnnotations extends JavadocTester {
"href=\"../typeannos/ClassParamA.html\" title=\"annotation in " +
"typeannos\">@ClassParamA</a> java.lang.String&gt;</span>"
},
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html",
"<pre> class <span class=\"strong\">ExtendsGeneric&lt;K extends " +
"<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in " +
@ -119,7 +119,7 @@ public class TestTypeAnnotations extends JavadocTester {
},
// Test for type annotations on fields (Fields.java).
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "DefaultScope.html",
"<pre><a href=\"../typeannos/Parameterized.html\" title=\"class in " +
"typeannos\">Parameterized</a>&lt;<a href=\"../typeannos/FldA.html\" " +
@ -147,7 +147,7 @@ public class TestTypeAnnotations extends JavadocTester {
"typeannos\">@FldC</a> <a href=\"../typeannos/FldB.html\" title=\"" +
"annotation in typeannos\">@FldB</a> [] array2Deep</pre>"
},
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "ModifiedScoped.html",
"<pre>public final&nbsp;<a href=\"../typeannos/Parameterized.html\" " +
"title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"../" +
@ -184,7 +184,7 @@ public class TestTypeAnnotations extends JavadocTester {
"<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in " +
"typeannos\">@MRtnA</a> java.lang.String[][]&nbsp;array2()</pre>"
},
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "MtdModifiedScoped.html",
"<pre>public final&nbsp;<a href=\"../typeannos/MtdParameterized.html\" " +
"title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"../" +
@ -205,7 +205,7 @@ public class TestTypeAnnotations extends JavadocTester {
"annotation in typeannos\">@MTyParamA</a> java.lang.String&gt;" +
"&nbsp;void&nbsp;methodExtends()</pre>"
},
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "UnscopedUnmodified.html",
"<pre>&lt;K extends <a href=\"../typeannos/MTyParamA.html\" title=\"" +
"annotation in typeannos\">@MTyParamA</a> <a href=\"../typeannos/" +
@ -220,7 +220,7 @@ public class TestTypeAnnotations extends JavadocTester {
"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " +
"java.lang.String&gt;&nbsp;void&nbsp;methodExtends()</pre>"
},
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "PublicModifiedMethods.html",
"<pre>public final&nbsp;&lt;K extends <a href=\"../typeannos/" +
"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " +
@ -240,7 +240,7 @@ public class TestTypeAnnotations extends JavadocTester {
"ParaParameterized</a>&lt;java.lang.String,java.lang.String&gt;" +
"&nbsp;a)</pre>"
},
/* @ignore 8012173
/* @ignore 8012173: javadoc does not receive all type annotations information from javac
{BUG_ID + FS + "typeannos" + FS + "Parameters.html",
"<pre>void&nbsp;nestedParaParameterized(<a href=\"../typeannos/" +
"ParaParameterized.html\" title=\"class in typeannos\">" +

23
langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -24,7 +24,6 @@
/*
* @test
* @bug 8006735
* @ignore
* @summary Smoke test for ensuring that annotations are emited to javadoc
*
* @author Mahmood Ali <mali>
@ -37,7 +36,7 @@
public class TestSmoke extends JavadocTester {
//Test information.
private static final String BUG_ID = "NOT_SPECIFIED_YET";
private static final String BUG_ID = "8006735";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@ -47,19 +46,37 @@ public class TestSmoke extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "T0x1C.html", "@DA"},
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x1D.html", "@DA"},
*/
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x0D.html", "@DA"},
*/
{BUG_ID + FS + "pkg" + FS + "T0x06.html", "@DA"},
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x0B.html", "@DA"},
*/
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x0F.html", "@DA"},
*/
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x20.html", "@DA"},
*/
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x22.html", "@DA"},
*/
{BUG_ID + FS + "pkg" + FS + "T0x10.html", "@DA"},
{BUG_ID + FS + "pkg" + FS + "T0x10A.html", "@DA"},
{BUG_ID + FS + "pkg" + FS + "T0x12.html", "@DA"},
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x11.html", "@DA"},
*/
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x13.html", "@DA"},
*/
/* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
{BUG_ID + FS + "pkg" + FS + "T0x15.html", "@DA"},
*/
{BUG_ID + FS + "pkg" + FS + "T0x14.html", "@DA"},
{BUG_ID + FS + "pkg" + FS + "T0x16.html", "@DA"}
};

2
langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java
View file

@ -24,7 +24,7 @@
/*
* @test
* @bug 8005085 8005877 8004829 8005681 8006734 8006775
* @ignore
* @ignore 8013409: test failures for type annotations
* @summary Combinations of Target ElementTypes on (repeated)type annotations.
*/

2
langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java
View file

@ -24,7 +24,7 @@
/*
* @test
* @bug 8005085 8005877 8004829 8005681 8006734 8006775
* @ignore
* @ignore 8013409: test failures for type annotations
* @summary Combinations of Target ElementTypes on (repeated)type annotations.
*/

2
langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java
View file

@ -1,7 +1,7 @@
/*
* @test /nodynamiccopyright/
* @bug 8006733 8006775
* @ignore
* @ignore 8013409: test failures for type annotations
* @summary A static outer class cannot be annotated.
* @author Werner Dietl
* @compile/fail/ref=CantAnnotateStaticClass.out -XDrawDiagnostics CantAnnotateStaticClass.java

2
langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java
View file

@ -25,7 +25,7 @@ import java.lang.annotation.*;
/*
* @test
* @ignore // syntax not sure yet.
* @ignore 8013408: Need specification for type exceptions on multicatch
* @bug 8006775
* @summary new type annotation location: multicatch
* @author Werner Dietl

2
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
View file

@ -26,7 +26,7 @@ import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
/*
* @test
* @bug 8006732 8006775
* @ignore
* @ignore 8013408: Need specification for type exceptions on multicatch
* @summary Test population of reference info for multicatch exception parameters
* @author Werner Dietl
* @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java

4
langtools/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -25,7 +25,7 @@
/**
* @test
* @ignore 8004360
* @ignore 8007517: DefaultMethodRegressionTests.java fail in TL
* @bug 8003639
* @summary convert lambda testng tests to jtreg and add them
* @run testng DefaultMethodRegressionTests

4
langtools/test/tools/javac/generics/7034511/T7034511a.java
View file

@ -1,11 +1,13 @@
/*
* @test /nodynamiccopyright/
* @ignore backing out 7034511, see 7040883
* @ignore 7041019 Bogus type-variable substitution with array types with dependencies on accessibility check
* @bug 7034511 7040883
* @summary Loophole in typesafety
* @compile/fail/ref=T7034511a.out -XDrawDiagnostics T7034511a.java
*/
// backing out 7034511, see 7040883
class T7034511a {
interface A<T> {

4
langtools/test/tools/javac/generics/7034511/T7034511b.java
View file

@ -1,11 +1,13 @@
/*
* @test /nodynamiccopyright/
* @ignore backing out 7034511, see 7040883
* @ignore 7041019 Bogus type-variable substitution with array types with dependencies on accessibility check
* @bug 7034511 7040883
* @summary Loophole in typesafety
* @compile/fail/ref=T7034511b.out -XDrawDiagnostics T7034511b.java
*/
// backing out 7034511, see 7040883
class T7034511b {
static class MyList<E> {
E toArray(E[] e) { return null; }

6
langtools/test/tools/javac/generics/OverrideBridge.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -24,11 +24,13 @@
/*
* @test
* @bug 6337171 6996415
* @ignore fix has been disabled as a consequence of 6996415
* @ignore 6996758: Investigate better override bridges strategy
* @summary javac should create bridge methods when type variable bounds restricted
* @run main OverrideBridge
*/
// fix, and test, has been disabled as a consequence of 6996415
import java.io.*;
import java.net.URI;
import java.util.ArrayList;

4
langtools/test/tools/javac/lambda/TargetType36.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -23,7 +23,7 @@
/*
* @test
* @ignore
* @ignore 8013404: Test awaits spec clarification
* @bug 8003280
* @summary Add lambda tests
* check that target type of cast is propagated to conditional subexpressions

2
langtools/test/tools/javac/lambda/TargetType53.java
View file

@ -26,7 +26,7 @@
* @bug 8007464
* @summary Add graph inference support
* smoke test for graph inference
* @ignore awaits stream API: 800NNNN
* @ignore 8008682: Core stream API classes
* @compile TargetType53.java
*/
import java.util.*;

2
langtools/test/tools/javac/lambda/TargetType54.java
View file

@ -26,7 +26,7 @@
* @bug 8007464
* @summary Add graph inference support
* smoke test for graph inference
* @ignore awaits stream API: 800NNNN
* @ignore 8008682: Core stream API classes
* @compile TargetType54.java
*/
import java.util.stream.*;

2
langtools/test/tools/javac/lambda/TargetType58.java
View file

@ -26,7 +26,7 @@
* @bug 8007464
* @summary Add graph inference support
* more smoke tests for graph inference
* @ignore awaits stream API: 800NNNN
* @ignore 8008682: Core stream API classes
* @compile TargetType58.java
*/
import java.util.*;

2
langtools/test/tools/javac/lambda/TargetType59.java
View file

@ -26,7 +26,7 @@
* @bug 8007464
* @summary Add graph inference support
* more smoke tests for graph inference
* @ignore awaits stream API: 800NNNN
* @ignore 8008682: Core stream API classes
* @compile TargetType59.java
*/
import java.util.*;

2
langtools/test/tools/javac/lambda/TargetType62.java
View file

@ -26,7 +26,7 @@
* @bug 8007464
* @summary Add graph inference support
* check that new wildcards inference strategy doesn't run into 7190296
* @ignore awaits stream API: 800NNNN
* @ignore 8008682: Core stream API classes
* @compile TargetType62.java
*/
import java.util.*;

2
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java
View file

@ -22,13 +22,13 @@
*/
/*
* @ignore
* @test
* @bug 8004822
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
* @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only
* MixRepeatableAndOfficialContainerInheritedA1Test.java

2
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java
View file

@ -22,13 +22,13 @@
*/
/*
* @ignore
* @test
* @bug 8004822
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
* @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only
* MixRepeatableAndOfficialContainerInheritedB1Test.java

2
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java
View file

@ -22,13 +22,13 @@
*/
/*
* @ignore
* @test
* @bug 8004822
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
* @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only
* MixRepeatableAndOfficialContainerInheritedB2Test.java

2
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java
View file

@ -22,13 +22,13 @@
*/
/*
* @ignore
* @test
* @bug 8004822
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
* @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideATest.java
*/

2
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java
View file

@ -22,13 +22,13 @@
*/
/*
* @ignore
* @test
* @bug 8004822
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
* @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideBTest.java
*/

8
langtools/test/tools/javap/output/RepeatingTypeAnnotations.java
View file

@ -121,7 +121,7 @@ public class RepeatingTypeAnnotations extends Tester {
*/
@TestCase
@ignore // 8008082:missing type annotation for cast
@ignore // 8008082: missing type annotation for cast
public static class TC1 extends RepeatingTypeAnnotations {
public TC1() {
setSrc(" static String so = \"hello world\";",
@ -176,7 +176,7 @@ public class RepeatingTypeAnnotations extends Tester {
}
@TestCase
@ignore // 8008082:missing type annotation for cast
@ignore // 8008082: missing type annotation for cast
public static class TC5 extends RepeatingTypeAnnotations {
public TC5() {
setSrc(" static String so = \"hello world\";",
@ -231,7 +231,7 @@ public class RepeatingTypeAnnotations extends Tester {
}
@TestCase
@ignore // 8008082:missing type annotation for cast
@ignore // 8008082: missing type annotation for cast
public static class TC9 extends RepeatingTypeAnnotations {
public TC9() {
setSrc(" public Test(@A @A @A Object o, @A int i, long l) {",
@ -305,7 +305,7 @@ public class RepeatingTypeAnnotations extends Tester {
}
@TestCase
@ignore // 8008082:missing type annotation for cast
@ignore // 8008082: missing type annotation for cast
public static class TC13 extends RepeatingTypeAnnotations {
public TC13() {
setSrc(" public @A @A @A String foo(@A @A @A Object o, @A int i, long l) {",

4
langtools/test/tools/javap/output/Tester.java
View file

@ -128,8 +128,8 @@ public abstract class Tester {
/**
* Individual test-cases failing due to product bugs, may temporarily
* be excluded by marking them like this:
* @ignore // 1234567:bug synopsis
* be excluded by marking them like this, (where "at-" is replaced by "@")
* at-ignore // 1234567: bug synopsis
*/
@Retention(RetentionPolicy.RUNTIME)
@interface ignore { }