ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/jtreg/util/Collections/EmptyIterator.java
(Generate patch)

Comparing jsr166/src/test/jtreg/util/Collections/EmptyIterator.java (file contents):
Revision 1.1 by jsr166, Tue Sep 1 01:24:16 2009 UTC vs.
Revision 1.5 by dl, Wed Feb 8 00:01:38 2012 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
2 > * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5   * This code is free software; you can redistribute it and/or modify it
# Line 16 | Line 16
16   * 2 along with this work; if not, write to the Free Software Foundation,
17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18   *
19 < * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20 < * CA 95054 USA or visit www.sun.com if you need additional information or
21 < * have any questions.
19 > * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 > * or visit www.oracle.com if you need additional information or have any
21 > * questions.
22   */
23  
24   /*
# Line 35 | Line 35 | public class EmptyIterator {
35      void test(String[] args) throws Throwable {
36          testEmptyCollection(Collections.<Object>emptyList());
37          testEmptyCollection(Collections.<Object>emptySet());
38 <        testEmptyCollection(new java.util.concurrent.
39 <                            SynchronousQueue<Object>());
38 > //         Removed jdk7 dependency from SynchronousQueue.
39 > //         testEmptyCollection(new java.util.concurrent.
40 > //                             SynchronousQueue<Object>());
41  
42          testEmptyMap(Collections.<Object, Object>emptyMap());
43  
# Line 52 | Line 53 | public class EmptyIterator {
53          testEmptyEnumeration(javax.swing.text.SimpleAttributeSet
54                               .EMPTY.getAttributeNames());
55  
56 <        @SuppressWarnings("unchecked") Iterator<?> x =
57 <            new sun.tools.java.MethodSet()
56 >        @SuppressWarnings("unchecked")
57 >        Iterator<?> x = new sun.tools.java.MethodSet()
58              .lookupName(sun.tools.java.Identifier.lookup(""));
59          testEmptyIterator(x);
60      }
61  
62      <T> void testEmptyEnumeration(final Enumeration<T> e) {
62        check(e == emptyEnumeration());
63          check(! e.hasMoreElements());
64          THROWS(NoSuchElementException.class,
65                 new F(){void f(){ e.nextElement(); }});
66      }
67  
68      <T> void testEmptyIterator(final Iterator<T> it) {
69        check(it == emptyIterator());
69          check(! it.hasNext());
70          THROWS(NoSuchElementException.class,
71                 new F(){void f(){ it.next(); }});
# Line 75 | Line 74 | public class EmptyIterator {
74      }
75  
76      void testEmptyMap(Map<Object, Object> m) {
78        check(m == emptyMap());
77          check(m.entrySet().iterator() ==
78                Collections.<Map.Entry<Object,Object>>emptyIterator());
79          check(m.values().iterator() == emptyIterator());
# Line 110 | Line 108 | public class EmptyIterator {
108  
109      <E> void testEmptyCollection(final Collection<E> c) {
110          testEmptyIterator(c.iterator());
113
114        check(c.iterator() == emptyIterator());
115        if (c instanceof List)
116            check(((List<?>)c).listIterator() == emptyListIterator());
117
111          testToArray(c);
112      }
113  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines