test/java/util/NavigableMap/LockStep.java

rev 7361 : 7129185: Add Collections.{checked|empty|unmodifiable}Navigable{Map|Set}
Reviewed-by: dmocek, martin, smarks

*** 53,67 ****
--- 53,75 ----
      static void realMain(String[] args) {
          size = intArg(args, 0, DEFAULT_SIZE);
  
          lockSteps(new TreeMap(),
                    new ConcurrentSkipListMap());
+         lockSteps(new TreeMap(),
+                   Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class));
+         lockSteps(new TreeMap(),
+                   Collections.synchronizedNavigableMap(new TreeMap()));
          lockSteps(new TreeMap(reverseOrder()),
                    new ConcurrentSkipListMap(reverseOrder()));
  
          lockSteps(new TreeSet(),
                    new ConcurrentSkipListSet());
+         lockSteps(new TreeSet(),
+                   Collections.checkedNavigableSet(new TreeSet(), Integer.class));
+         lockSteps(new TreeSet(),
+                   Collections.synchronizedNavigableSet(new TreeSet()));
          lockSteps(new TreeSet(reverseOrder()),
                    new ConcurrentSkipListSet(reverseOrder()));
      }
  
      static void lockSteps(NavigableMap m1, NavigableMap m2) {
*** 179,189 ****
          testEmptySet(m.keySet());
          testEmptySet(m.entrySet());
          testEmptyCollection(m.values());
      }
  
!     static final Random rnd = new Random();
  
      static void equalNext(final Iterator<?> it, Object expected) {
          if (maybe(2))
              check(it.hasNext());
          equal(it.next(), expected);
--- 187,197 ----
          testEmptySet(m.keySet());
          testEmptySet(m.entrySet());
          testEmptyCollection(m.values());
      }
  
!     static final Random rnd = new Random(8675309);
  
      static void equalNext(final Iterator<?> it, Object expected) {
          if (maybe(2))
              check(it.hasNext());
          equal(it.next(), expected);
*** 206,217 ****
      static void checkNavigableSet(final NavigableSet s) {
          if (s.comparator() == null)
              check(s.descendingSet().descendingSet().comparator() == null);
          equal(s.isEmpty(), s.size() == 0);
          equal2(s, s.descendingSet());
!         if (maybe(4) && s instanceof Serializable)
!             equal2(s, serialClone(s));
          Comparator cmp = comparator(s);
          if (s.isEmpty()) {
              THROWS(NoSuchElementException.class,
                     new Fun(){void f(){ s.first(); }},
                     new Fun(){void f(){ s.last();  }});
--- 214,227 ----
      static void checkNavigableSet(final NavigableSet s) {
          if (s.comparator() == null)
              check(s.descendingSet().descendingSet().comparator() == null);
          equal(s.isEmpty(), s.size() == 0);
          equal2(s, s.descendingSet());
! // mduigou: I had to comment this out for the Collection wrappers which wrap
! // unserializable sets.
! //        if (maybe(4) && s instanceof Serializable)
! //            equal2(s, serialClone(s));
          Comparator cmp = comparator(s);
          if (s.isEmpty()) {
              THROWS(NoSuchElementException.class,
                     new Fun(){void f(){ s.first(); }},
                     new Fun(){void f(){ s.last();  }});
*** 274,283 ****
--- 284,302 ----
              equal(it1.next(), it2.next());
          }
          check(! it2.hasNext());
      }
  
+     static void equalSetsLeaf(final Set s1, final Set s2) {
+         equal2(s1,            s2);
+         equal( s1.size(),     s2.size());
+         equal( s1.isEmpty(),  s2.isEmpty());
+         equal( s1.hashCode(), s2.hashCode());
+         equal( s1.toString(), s2.toString());
+         equal( s1.containsAll(s2), s2.containsAll(s1));
+     }
+ 
      static void equalNavigableSetsLeaf(final NavigableSet s1,
                                         final NavigableSet s2) {
          equal2(s1,            s2);
          equal( s1.size(),     s2.size());
          equal( s1.isEmpty(),  s2.isEmpty());
*** 446,457 ****
      }
  
      static void equalNavigableMaps(NavigableMap m1,
                                     NavigableMap m2) {
          equalNavigableMapsLeaf(m1, m2);
!         equalNavigableSetsLeaf((NavigableSet) m1.keySet(),
!                                (NavigableSet) m2.keySet());
          equalNavigableSets(m1.navigableKeySet(),
                             m2.navigableKeySet());
          equalNavigableSets(m1.descendingKeySet(),
                             m2.descendingKeySet());
          equal2(m1.entrySet(),
--- 465,475 ----
      }
  
      static void equalNavigableMaps(NavigableMap m1,
                                     NavigableMap m2) {
          equalNavigableMapsLeaf(m1, m2);
!         equalSetsLeaf(m1.keySet(), m2.keySet());
          equalNavigableSets(m1.navigableKeySet(),
                             m2.navigableKeySet());
          equalNavigableSets(m1.descendingKeySet(),
                             m2.descendingKeySet());
          equal2(m1.entrySet(),