test/jdk/javadoc/doclet/typeAnnotations/smoke/TestSmoke.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -27,11 +27,10 @@
  * @summary  Smoke test for ensuring that annotations are emitted to javadoc
  *
  * @author   Mahmood Ali <mali>
  * @library  ../../lib
  * @modules jdk.javadoc
- * @ignore
  * @build    JavadocTester
  * @run main TestSmoke
  */
 
 public class TestSmoke extends JavadocTester {

@@ -50,40 +49,29 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/T0x1C.html", true, "@DA");
         checkOutput("pkg/T0x1D.html", true, "@DA");
         checkOutput("pkg/T0x0D.html", true, "@DA");
-        checkOutput("pkg/T0x06.html", true, "@DA");
         checkOutput("pkg/T0x0B.html", true, "@DA");
         checkOutput("pkg/T0x0F.html", true, "@DA");
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x20.html", true, "@DA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x20A.html", true, "@DTPA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
         checkOutput("pkg/T0x20B.html", true, "@DA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x22.html", true, "@DA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x22A.html", true, "@DTPA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
         checkOutput("pkg/T0x22B.html", true, "@DA");
-        */
         checkOutput("pkg/T0x10.html", true, "@DA");
         checkOutput("pkg/T0x10A.html", true, "@DA");
-        checkOutput("pkg/T0x12.html", true, "@DA");
         checkOutput("pkg/T0x11.html", true, "@DA");
+        checkOutput("pkg/T0x12.html", true, "@DA");
         checkOutput("pkg/T0x13.html", true, "@DA");
-        checkOutput("pkg/T0x15.html", true, "@DA");
         checkOutput("pkg/T0x14.html", true, "@DA");
+        checkOutput("pkg/T0x15.html", true, "@DA");
         checkOutput("pkg/T0x16.html", true, "@DA");
 
+        checkOutput("pkg/T0x06.html", true, "@DA");
+        checkOutput("pkg/T0x20.html", true, "@DA");
+        checkOutput("pkg/T0x20A.html", true, "@DTPA");
+        checkOutput("pkg/T0x22.html", true, "@DA");
+        checkOutput("pkg/T0x22A.html", true, "@DTPA");
+
         checkOutput("pkg/T0x1C.html", false, "@A");
         checkOutput("pkg/T0x1D.html", false, "@A");
         checkOutput("pkg/T0x00.html", false, "@A");
         checkOutput("pkg/T0x01.html", false, "@A");
         checkOutput("pkg/T0x02.html", false, "@A");