test/java/util/Collections/EmptyIterator.java

@@ -21,16 +21,16 @@
  * questions.
  */
 
 /*
  * @test
- * @bug 5017904 6356890
+ * @bug 5017904 6356890 8004928
  * @summary Test empty iterators, enumerations, and collections
  */
 
-import java.util.*;
 import static java.util.Collections.*;
+import java.util.*;
 
 public class EmptyIterator {
 
     void test(String[] args) throws Throwable {
         testEmptyCollection(Collections.<Object>emptyList());

@@ -43,14 +43,17 @@
         testEmptyEnumeration(emptyTable.elements());
         testEmptyIterator(emptyTable.keySet().iterator());
         testEmptyIterator(emptyTable.values().iterator());
         testEmptyIterator(emptyTable.entrySet().iterator());
 
-        testEmptyEnumeration(javax.swing.tree.DefaultMutableTreeNode
-                             .EMPTY_ENUMERATION);
-        testEmptyEnumeration(javax.swing.text.SimpleAttributeSet
-                             .EMPTY.getAttributeNames());
+        final Enumeration<EmptyIterator> finalEmptyTyped = 
+            Collections.emptyEnumeration();
+        testEmptyEnumeration(finalEmptyTyped);
+        
+        final Enumeration finalEmptyAbstract =         
+            Collections.emptyEnumeration();
+        testEmptyEnumeration(finalEmptyAbstract);
 
         @SuppressWarnings("unchecked") Iterator<?> x =
             new sun.tools.java.MethodSet()
             .lookupName(sun.tools.java.Identifier.lookup(""));
         testEmptyIterator(x);