--- jsr166/src/test/tck/TreeMapTest.java	2006/04/20 20:35:00	1.4
+++ jsr166/src/test/tck/TreeMapTest.java	2008/04/19 18:45:18	1.5
@@ -169,11 +169,33 @@ public class TreeMapTest extends JSR166T
         Iterator i = s.iterator();
         Integer last = (Integer)i.next();
         assertEquals(last, one);
+        int count = 1;
         while (i.hasNext()) {
             Integer k = (Integer)i.next();
             assertTrue(last.compareTo(k) < 0);
             last = k;
+            ++count;
         }
+        assertEquals(count ,5);
+    }
+
+    /**
+     * descending iterator of key set is inverse ordered
+     */
+    public void testKeySetDescendingIteratorOrder() {
+        TreeMap map = map5();
+	NavigableSet s = map.navigableKeySet();
+        Iterator i = s.descendingIterator();
+        Integer last = (Integer)i.next();
+        assertEquals(last, five);
+        int count = 1;
+        while (i.hasNext()) {
+            Integer k = (Integer)i.next();
+            assertTrue(last.compareTo(k) > 0);
+            last = k;
+            ++count;
+        }
+        assertEquals(count ,5);
     }
 
     /**
@@ -185,11 +207,33 @@ public class TreeMapTest extends JSR166T
         Iterator i = s.iterator();
         Integer last = (Integer)i.next();
         assertEquals(last, five);
+        int count = 1;
         while (i.hasNext()) {
             Integer k = (Integer)i.next();
             assertTrue(last.compareTo(k) > 0);
             last = k;
+            ++count;
+        }
+        assertEquals(count, 5);
+    }
+
+    /**
+     *  descending iterator of descendingKeySet is ordered
+     */
+    public void testDescendingKeySetDescendingIteratorOrder() {
+        TreeMap map = map5();
+	NavigableSet s = map.descendingKeySet();
+        Iterator i = s.descendingIterator();
+        Integer last = (Integer)i.next();
+        assertEquals(last, one);
+        int count = 1;
+        while (i.hasNext()) {
+            Integer k = (Integer)i.next();
+            assertTrue(last.compareTo(k) < 0);
+            last = k;
+            ++count;
         }
+        assertEquals(count, 5);
     }
 
     /**