Return-Path: 
 <harmony-commits-return-18653-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org
Received: (qmail 419 invoked from network); 14 Nov 2006 18:53:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Nov 2006 18:53:16 -0000
Received: (qmail 24975 invoked by uid 500); 14 Nov 2006 18:53:26 -0000
Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org
Received: (qmail 24958 invoked by uid 500); 14 Nov 2006 18:53:26 -0000
Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:harmony-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:harmony-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:harmony-commits@incubator.apache.org>
List-Id: <harmony-commits.incubator.apache.org>
Reply-To: harmony-dev@incubator.apache.org
Delivered-To: mailing list harmony-commits@incubator.apache.org
Received: (qmail 24947 invoked by uid 99); 14 Nov 2006 18:53:26 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Nov 2006 10:53:26 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Nov 2006 10:53:14 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 367D01A9846; Tue, 14 Nov 2006 10:52:44 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r474919 -
 /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java
Date: Tue, 14 Nov 2006 18:52:44 -0000
To: harmony-commits@incubator.apache.org
From: tellison@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061114185244.367D01A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tellison
Date: Tue Nov 14 10:52:43 2006
New Revision: 474919

URL: http://svn.apache.org/viewvc?view=rev&rev=474919
Log:
Convert console output to assertion, and code format/tidy-up.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java?view=diff&rev=474919&r1=474918&r2=474919
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java Tue Nov 14 10:52:43 2006
@@ -37,242 +37,246 @@
 
 public class TreeMapTest extends junit.framework.TestCase {
 
-	public static class ReversedComparator implements Comparator {
-		public int compare(Object o1, Object o2) {
-			return -(((Comparable) o1).compareTo((Comparable) o2));
-		}
-
-		public boolean equals(Object o1, Object o2) {
-			return (((Comparable) o1).compareTo((Comparable) o2)) == 0;
-		}
-	}
-    
+    public static class ReversedComparator implements Comparator {
+        public int compare(Object o1, Object o2) {
+            return -(((Comparable) o1).compareTo(o2));
+        }
+
+        public boolean equals(Object o1, Object o2) {
+            return (((Comparable) o1).compareTo(o2)) == 0;
+        }
+    }
+
     // Regression for Harmony-1026
-    public static class MockComparator<T extends Comparable<T>> implements Comparator<T>, Serializable{
-        
+    public static class MockComparator<T extends Comparable<T>> implements
+            Comparator<T>, Serializable {
+
         public int compare(T o1, T o2) {
-            if( o1 == o2 ) return 0;
-            if( null == o1 || null == o2) return -1;
-            T c1 = (T)o1;
-            T c2 = (T)o2;
+            if (o1 == o2) {
+                return 0;
+            }
+            if (null == o1 || null == o2) {
+                return -1;
+            }
+            T c1 = o1;
+            T c2 = o2;
             return c1.compareTo(c2);
         }
     }
-    
+
     // Regression for Harmony-1161
     class MockComparatorNullTolerable implements Comparator<String> {
 
         public int compare(String o1, String o2) {
-            if( o1 == o2 ) {
+            if (o1 == o2) {
                 return 0;
             }
-            if( null == o1 ) {
+            if (null == o1) {
                 return -1;
             }
             return o1.compareTo(o2);
         }
     }
 
-	TreeMap tm;
+    TreeMap tm;
+
+    Object objArray[] = new Object[1000];
+
+    /**
+     * @tests java.util.TreeMap#TreeMap()
+     */
+    public void test_Constructor() {
+        // Test for method java.util.TreeMap()
+        new Support_MapTest2(new TreeMap()).runTest();
+
+        assertTrue("New treeMap non-empty", new TreeMap().isEmpty());
+    }
+
+    /**
+     * @tests java.util.TreeMap#TreeMap(java.util.Comparator)
+     */
+    public void test_ConstructorLjava_util_Comparator() {
+        // Test for method java.util.TreeMap(java.util.Comparator)
+        Comparator comp = new ReversedComparator();
+        TreeMap reversedTreeMap = new TreeMap(comp);
+        assertTrue("TreeMap answered incorrect comparator", reversedTreeMap
+                .comparator() == comp);
+        reversedTreeMap.put(new Integer(1).toString(), new Integer(1));
+        reversedTreeMap.put(new Integer(2).toString(), new Integer(2));
+        assertTrue("TreeMap does not use comparator (firstKey was incorrect)",
+                reversedTreeMap.firstKey().equals(new Integer(2).toString()));
+        assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
+                reversedTreeMap.lastKey().equals(new Integer(1).toString()));
+
+    }
+
+    /**
+     * @tests java.util.TreeMap#TreeMap(java.util.Map)
+     */
+    public void test_ConstructorLjava_util_Map() {
+        // Test for method java.util.TreeMap(java.util.Map)
+        TreeMap myTreeMap = new TreeMap(new HashMap(tm));
+        assertTrue("Map is incorrect size", myTreeMap.size() == objArray.length);
+        for (Object element : objArray) {
+            assertTrue("Map has incorrect mappings", myTreeMap.get(
+                    element.toString()).equals(element));
+        }
+    }
+
+    /**
+     * @tests java.util.TreeMap#TreeMap(java.util.SortedMap)
+     */
+    public void test_ConstructorLjava_util_SortedMap() {
+        // Test for method java.util.TreeMap(java.util.SortedMap)
+        Comparator comp = new ReversedComparator();
+        TreeMap reversedTreeMap = new TreeMap(comp);
+        reversedTreeMap.put(new Integer(1).toString(), new Integer(1));
+        reversedTreeMap.put(new Integer(2).toString(), new Integer(2));
+        TreeMap anotherTreeMap = new TreeMap(reversedTreeMap);
+        assertTrue("New tree map does not answer correct comparator",
+                anotherTreeMap.comparator() == comp);
+        assertTrue("TreeMap does not use comparator (firstKey was incorrect)",
+                anotherTreeMap.firstKey().equals(new Integer(2).toString()));
+        assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
+                anotherTreeMap.lastKey().equals(new Integer(1).toString()));
+
+    }
+
+    /**
+     * @tests java.util.TreeMap#clear()
+     */
+    public void test_clear() {
+        // Test for method void java.util.TreeMap.clear()
+        tm.clear();
+        assertEquals("Cleared map returned non-zero size", 0, tm.size());
+    }
+
+    /**
+     * @tests java.util.TreeMap#clone()
+     */
+    public void test_clone() {
+        // Test for method java.lang.Object java.util.TreeMap.clone()
+        TreeMap clonedMap = (TreeMap) tm.clone();
+        assertTrue("Cloned map does not equal the original map", clonedMap
+                .equals(tm));
+        assertTrue("Cloned map is the same reference as the original map",
+                clonedMap != tm);
+        for (Object element : objArray) {
+            assertTrue("Cloned map contains incorrect elements", clonedMap
+                    .get(element.toString()) == tm.get(element.toString()));
+        }
+
+        TreeMap map = new TreeMap();
+        map.put("key", "value");
+        // get the keySet() and values() on the original Map
+        Set keys = map.keySet();
+        Collection values = map.values();
+        assertEquals("values() does not work", "value", values.iterator()
+                .next());
+        assertEquals("keySet() does not work", "key", keys.iterator().next());
+        AbstractMap map2 = (AbstractMap) map.clone();
+        map2.put("key", "value2");
+        Collection values2 = map2.values();
+        assertTrue("values() is identical", values2 != values);
+        // values() and keySet() on the cloned() map should be different
+        assertEquals("values() was not cloned", "value2", values2.iterator()
+                .next());
+        map2.clear();
+        map2.put("key2", "value3");
+        Set key2 = map2.keySet();
+        assertTrue("keySet() is identical", key2 != keys);
+        assertEquals("keySet() was not cloned", "key2", key2.iterator().next());
+    }
+
+    /**
+     * @tests java.util.TreeMap#comparator()
+     */
+    public void test_comparator() {
+        // Test for method java.util.Comparator java.util.TreeMap.comparator()\
+        Comparator comp = new ReversedComparator();
+        TreeMap reversedTreeMap = new TreeMap(comp);
+        assertTrue("TreeMap answered incorrect comparator", reversedTreeMap
+                .comparator() == comp);
+        reversedTreeMap.put(new Integer(1).toString(), new Integer(1));
+        reversedTreeMap.put(new Integer(2).toString(), new Integer(2));
+        assertTrue("TreeMap does not use comparator (firstKey was incorrect)",
+                reversedTreeMap.firstKey().equals(new Integer(2).toString()));
+        assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
+                reversedTreeMap.lastKey().equals(new Integer(1).toString()));
+    }
 
-	Object objArray[] = new Object[1000];
+    /**
+     * @tests java.util.TreeMap#containsKey(java.lang.Object)
+     */
+    public void test_containsKeyLjava_lang_Object() {
+        // Test for method boolean
+        // java.util.TreeMap.containsKey(java.lang.Object)
+        assertTrue("Returned false for valid key", tm.containsKey("95"));
+        assertTrue("Returned true for invalid key", !tm.containsKey("XXXXX"));
+    }
 
-	/**
-	 * @tests java.util.TreeMap#TreeMap()
-	 */
-	public void test_Constructor() {
-		// Test for method java.util.TreeMap()
-		new Support_MapTest2(new TreeMap()).runTest();
-
-		assertTrue("New treeMap non-empty", new TreeMap().isEmpty());
-	}
-
-	/**
-	 * @tests java.util.TreeMap#TreeMap(java.util.Comparator)
-	 */
-	public void test_ConstructorLjava_util_Comparator() {
-		// Test for method java.util.TreeMap(java.util.Comparator)
-		Comparator comp = new ReversedComparator();
-		TreeMap reversedTreeMap = new TreeMap(comp);
-		assertTrue("TreeMap answered incorrect comparator", reversedTreeMap
-				.comparator() == comp);
-		reversedTreeMap.put(new Integer(1).toString(), new Integer(1));
-		reversedTreeMap.put(new Integer(2).toString(), new Integer(2));
-		assertTrue("TreeMap does not use comparator (firstKey was incorrect)",
-				reversedTreeMap.firstKey().equals(new Integer(2).toString()));
-		assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
-				reversedTreeMap.lastKey().equals(new Integer(1).toString()));
-
-	}
-
-	/**
-	 * @tests java.util.TreeMap#TreeMap(java.util.Map)
-	 */
-	public void test_ConstructorLjava_util_Map() {
-		// Test for method java.util.TreeMap(java.util.Map)
-		TreeMap myTreeMap = new TreeMap(new HashMap(tm));
-		assertTrue("Map is incorrect size", myTreeMap.size() == objArray.length);
-		for (int counter = 0; counter < objArray.length; counter++)
-			assertTrue("Map has incorrect mappings", myTreeMap.get(
-					objArray[counter].toString()).equals(objArray[counter]));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#TreeMap(java.util.SortedMap)
-	 */
-	public void test_ConstructorLjava_util_SortedMap() {
-		// Test for method java.util.TreeMap(java.util.SortedMap)
-		Comparator comp = new ReversedComparator();
-		TreeMap reversedTreeMap = new TreeMap(comp);
-		reversedTreeMap.put(new Integer(1).toString(), new Integer(1));
-		reversedTreeMap.put(new Integer(2).toString(), new Integer(2));
-		TreeMap anotherTreeMap = new TreeMap(reversedTreeMap);
-		assertTrue("New tree map does not answer correct comparator",
-				anotherTreeMap.comparator() == comp);
-		assertTrue("TreeMap does not use comparator (firstKey was incorrect)",
-				anotherTreeMap.firstKey().equals(new Integer(2).toString()));
-		assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
-				anotherTreeMap.lastKey().equals(new Integer(1).toString()));
-
-	}
-
-	/**
-	 * @tests java.util.TreeMap#clear()
-	 */
-	public void test_clear() {
-		// Test for method void java.util.TreeMap.clear()
-		tm.clear();
-		assertEquals("Cleared map returned non-zero size", 0, tm.size());
-	}
-
-	/**
-	 * @tests java.util.TreeMap#clone()
-	 */
-	public void test_clone() {
-		// Test for method java.lang.Object java.util.TreeMap.clone()
-		TreeMap clonedMap = (TreeMap) tm.clone();
-		assertTrue("Cloned map does not equal the original map", clonedMap
-				.equals(tm));
-		assertTrue("Cloned map is the same reference as the original map",
-				clonedMap != tm);
-		for (int counter = 0; counter < objArray.length; counter++)
-			assertTrue("Cloned map contains incorrect elements", clonedMap
-					.get(objArray[counter].toString()) == tm
-					.get(objArray[counter].toString()));
-
-		TreeMap map = new TreeMap();
-		map.put("key", "value");
-		// get the keySet() and values() on the original Map
-		Set keys = map.keySet();
-		Collection values = map.values();
-		assertEquals("values() does not work", 
-				"value", values.iterator().next());
-		assertEquals("keySet() does not work", 
-				"key", keys.iterator().next());
-		AbstractMap map2 = (AbstractMap) map.clone();
-		map2.put("key", "value2");
-		Collection values2 = map2.values();
-		assertTrue("values() is identical", values2 != values);
-		// values() and keySet() on the cloned() map should be different
-		assertEquals("values() was not cloned", 
-				"value2", values2.iterator().next());
-		map2.clear();
-		map2.put("key2", "value3");
-		Set key2 = map2.keySet();
-		assertTrue("keySet() is identical", key2 != keys);
-		assertEquals("keySet() was not cloned", 
-				"key2", key2.iterator().next());
-	}
-
-	/**
-	 * @tests java.util.TreeMap#comparator()
-	 */
-	public void test_comparator() {
-		// Test for method java.util.Comparator java.util.TreeMap.comparator()\
-		Comparator comp = new ReversedComparator();
-		TreeMap reversedTreeMap = new TreeMap(comp);
-		assertTrue("TreeMap answered incorrect comparator", reversedTreeMap
-				.comparator() == comp);
-		reversedTreeMap.put(new Integer(1).toString(), new Integer(1));
-		reversedTreeMap.put(new Integer(2).toString(), new Integer(2));
-		assertTrue("TreeMap does not use comparator (firstKey was incorrect)",
-				reversedTreeMap.firstKey().equals(new Integer(2).toString()));
-		assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
-				reversedTreeMap.lastKey().equals(new Integer(1).toString()));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#containsKey(java.lang.Object)
-	 */
-	public void test_containsKeyLjava_lang_Object() {
-		// Test for method boolean
-		// java.util.TreeMap.containsKey(java.lang.Object)
-		assertTrue("Returned false for valid key", tm.containsKey("95"));
-		assertTrue("Returned true for invalid key", !tm.containsKey("XXXXX"));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#containsValue(java.lang.Object)
-	 */
-	public void test_containsValueLjava_lang_Object() {
-		// Test for method boolean
-		// java.util.TreeMap.containsValue(java.lang.Object)
-		assertTrue("Returned false for valid value", tm
-				.containsValue(objArray[986]));
-		assertTrue("Returned true for invalid value", !tm
-				.containsValue(new Object()));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#entrySet()
-	 */
-	public void test_entrySet() {
-		// Test for method java.util.Set java.util.TreeMap.entrySet()
-		Set anEntrySet = tm.entrySet();
-		Iterator entrySetIterator = anEntrySet.iterator();
-		assertTrue("EntrySet is incorrect size",
-				anEntrySet.size() == objArray.length);
-		Map.Entry entry;
-		while (entrySetIterator.hasNext()) {
-			entry = (Map.Entry) entrySetIterator.next();
-			assertTrue("EntrySet does not contain correct mappings", tm
-					.get(entry.getKey()) == entry.getValue());
-		}
-	}
-
-	/**
-	 * @tests java.util.TreeMap#firstKey()
-	 */
-	public void test_firstKey() {
-		// Test for method java.lang.Object java.util.TreeMap.firstKey()
-		assertEquals("Returned incorrect first key", "0", tm.firstKey());
-	}
-
-	/**
-	 * @tests java.util.TreeMap#get(java.lang.Object)
-	 */
-	public void test_getLjava_lang_Object() {
-		// Test for method java.lang.Object
-		// java.util.TreeMap.get(java.lang.Object)
-		Object o = new Object();
-		tm.put("Hello", o);
-		assertTrue("Failed to get mapping", tm.get("Hello") == o);
-
-	}
-
-	/**
-	 * @tests java.util.TreeMap#headMap(java.lang.Object)
-	 */
-	public void test_headMapLjava_lang_Object() {
-		// Test for method java.util.SortedMap
-		// java.util.TreeMap.headMap(java.lang.Object)
-		Map head = tm.headMap("100");
-		assertEquals("Returned map of incorrect size", 3, head.size());
-		assertTrue("Returned incorrect elements", head.containsKey("0")
-				&& head.containsValue(new Integer("1"))
-				&& head.containsKey("10"));
-        
-	    // Regression for Harmony-1026
+    /**
+     * @tests java.util.TreeMap#containsValue(java.lang.Object)
+     */
+    public void test_containsValueLjava_lang_Object() {
+        // Test for method boolean
+        // java.util.TreeMap.containsValue(java.lang.Object)
+        assertTrue("Returned false for valid value", tm
+                .containsValue(objArray[986]));
+        assertTrue("Returned true for invalid value", !tm
+                .containsValue(new Object()));
+    }
+
+    /**
+     * @tests java.util.TreeMap#entrySet()
+     */
+    public void test_entrySet() {
+        // Test for method java.util.Set java.util.TreeMap.entrySet()
+        Set anEntrySet = tm.entrySet();
+        Iterator entrySetIterator = anEntrySet.iterator();
+        assertTrue("EntrySet is incorrect size",
+                anEntrySet.size() == objArray.length);
+        Map.Entry entry;
+        while (entrySetIterator.hasNext()) {
+            entry = (Map.Entry) entrySetIterator.next();
+            assertTrue("EntrySet does not contain correct mappings", tm
+                    .get(entry.getKey()) == entry.getValue());
+        }
+    }
+
+    /**
+     * @tests java.util.TreeMap#firstKey()
+     */
+    public void test_firstKey() {
+        // Test for method java.lang.Object java.util.TreeMap.firstKey()
+        assertEquals("Returned incorrect first key", "0", tm.firstKey());
+    }
+
+    /**
+     * @tests java.util.TreeMap#get(java.lang.Object)
+     */
+    public void test_getLjava_lang_Object() {
+        // Test for method java.lang.Object
+        // java.util.TreeMap.get(java.lang.Object)
+        Object o = new Object();
+        tm.put("Hello", o);
+        assertTrue("Failed to get mapping", tm.get("Hello") == o);
+
+    }
+
+    /**
+     * @tests java.util.TreeMap#headMap(java.lang.Object)
+     */
+    public void test_headMapLjava_lang_Object() {
+        // Test for method java.util.SortedMap
+        // java.util.TreeMap.headMap(java.lang.Object)
+        Map head = tm.headMap("100");
+        assertEquals("Returned map of incorrect size", 3, head.size());
+        assertTrue("Returned incorrect elements", head.containsKey("0")
+                && head.containsValue(new Integer("1"))
+                && head.containsKey("10"));
+
+        // Regression for Harmony-1026
         TreeMap<Integer, Double> map = new TreeMap<Integer, Double>(
                 new MockComparator());
         map.put(1, 2.1);
@@ -283,21 +287,22 @@
 
         SortedMap<Integer, Double> smap = map.headMap(null);
         assertEquals(0, smap.size());
-        
+
         Set<Integer> keySet = smap.keySet();
         assertEquals(0, keySet.size());
-        
+
         Set<Map.Entry<Integer, Double>> entrySet = smap.entrySet();
         assertEquals(0, entrySet.size());
-        
+
         Collection<Double> valueCollection = smap.values();
         assertEquals(0, valueCollection.size());
-        
+
         // Regression for Harmony-1066
         assertTrue(head instanceof Serializable);
-        
+
         // Regression for ill-behaved collator
         Collator c = new Collator() {
+            @Override
             public int compare(String o1, String o2) {
                 if (o1 == null) {
                     return 0;
@@ -305,10 +310,12 @@
                 return o1.compareTo(o2);
             }
 
+            @Override
             public CollationKey getCollationKey(String string) {
                 return null;
             }
 
+            @Override
             public int hashCode() {
                 return 0;
             }
@@ -317,171 +324,174 @@
         TreeMap<String, String> treemap = new TreeMap<String, String>(c);
         treemap.put("key", "value"); //$NON-NLS-1$ //$NON-NLS-2$
         assertEquals(0, treemap.headMap(null).size());
-	}
+    }
 
-	/**
+    /**
      * @tests java.util.TreeMap#keySet()
      */
-	public void test_keySet() {
-		// Test for method java.util.Set java.util.TreeMap.keySet()
-		Set ks = tm.keySet();
-		assertTrue("Returned set of incorrect size",
-				ks.size() == objArray.length);
-		for (int i = 0; i < tm.size(); i++)
-			assertTrue("Returned set is missing keys", ks.contains(new Integer(
-					i).toString()));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#lastKey()
-	 */
-	public void test_lastKey() {
-		// Test for method java.lang.Object java.util.TreeMap.lastKey()
-		assertTrue("Returned incorrect last key", tm.lastKey().equals(
-				objArray[objArray.length - 1].toString()));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#put(java.lang.Object, java.lang.Object)
-	 */
-	public void test_putLjava_lang_ObjectLjava_lang_Object() {
-		// Test for method java.lang.Object
-		// java.util.TreeMap.put(java.lang.Object, java.lang.Object)
-		Object o = new Object();
-		tm.put("Hello", o);
-		assertTrue("Failed to put mapping", tm.get("Hello") == o);
-		
-		// regression for Harmony-780
-		tm = new TreeMap();
-		assertNull(tm.put(new Object(), new Object()));
-		try {
-			tm.put(new Integer(1), new Object());
-			fail("should throw ClassCastException");
-		} catch (ClassCastException e) {
-			// expected
-		}
-		
-		tm = new TreeMap();
-		assertNull(tm.put(new Integer(1), new Object()));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#putAll(java.util.Map)
-	 */
-	public void test_putAllLjava_util_Map() {
-		// Test for method void java.util.TreeMap.putAll(java.util.Map)
-		TreeMap x = new TreeMap();
-		x.putAll(tm);
-		assertTrue("Map incorrect size after put", x.size() == tm.size());
-		for (int i = 0; i < objArray.length; i++)
-			assertTrue("Failed to put all elements", x.get(
-					objArray[i].toString()).equals(objArray[i]));
-	}
-
-	/**
-	 * @tests java.util.TreeMap#remove(java.lang.Object)
-	 */
-	public void test_removeLjava_lang_Object() {
-		// Test for method java.lang.Object
-		// java.util.TreeMap.remove(java.lang.Object)
-		tm.remove("990");
-		assertTrue("Failed to remove mapping", !tm.containsKey("990"));
-
-	}
-
-	/**
-	 * @tests java.util.TreeMap#size()
-	 */
-	public void test_size() {
-		// Test for method int java.util.TreeMap.size()
-		assertEquals("Returned incorrect size", 1000, tm.size());
-	}
-
-	/**
-	 * @tests java.util.TreeMap#subMap(java.lang.Object, java.lang.Object)
-	 */
-	public void test_subMapLjava_lang_ObjectLjava_lang_Object() {
-		// Test for method java.util.SortedMap
-		// java.util.TreeMap.subMap(java.lang.Object, java.lang.Object)
-		SortedMap subMap = tm.subMap(objArray[100].toString(), objArray[109]
-				.toString());
-		assertEquals("subMap is of incorrect size", 9, subMap.size());
-		for (int counter = 100; counter < 109; counter++)
-			assertTrue("SubMap contains incorrect elements", subMap.get(
-					objArray[counter].toString()).equals(objArray[counter]));
-
-		int result;
-		try {
-			tm.subMap(objArray[9].toString(), objArray[1].toString());
-			result = 0;
-		} catch (IllegalArgumentException e) {
-			result = 1;
-		}
-		assertEquals("end key less than start key should throw IllegalArgumentException",
-				1, result);
-        
-                // Regression for Harmony-1161
-                TreeMap<String, String> treeMapWithNull = new TreeMap<String, String>(new MockComparatorNullTolerable());
-                treeMapWithNull.put("key1" , "value1"); //$NON-NLS-1$ //$NON-NLS-2$
-                treeMapWithNull.put(null, "value2"); //$NON-NLS-1$
-                SortedMap<String, String> subMapWithNull =  treeMapWithNull.subMap( null, "key1"); //$NON-NLS-1$
-                assertEquals("Size of subMap should be 1:", 1, subMapWithNull.size()); //$NON-NLS-1$
-
-                // Regression test for typo in lastKey method
-                SortedMap<String, String> map = new TreeMap<String, String>();
-                map.put("1", "one"); //$NON-NLS-1$ //$NON-NLS-2$
-                map.put("2", "two"); //$NON-NLS-1$ //$NON-NLS-2$
-                map.put("3", "three"); //$NON-NLS-1$ //$NON-NLS-2$
-                System.out.println("Last: " + map.lastKey());
-                SortedMap<String, String> sub =
-                    map.subMap( "1", "3"); //$NON-NLS-1$ //$NON-NLS-2$
-                assertEquals("2", sub.lastKey()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @tests java.util.TreeMap#tailMap(java.lang.Object)
-	 */
-	public void test_tailMapLjava_lang_Object() {
-		// Test for method java.util.SortedMap
-		// java.util.TreeMap.tailMap(java.lang.Object)
-		Map tail = tm.tailMap(objArray[900].toString());
-		assertTrue("Returned map of incorrect size : " + tail.size(), tail
-				.size() == (objArray.length - 900) + 9);
-		for (int i = 900; i < objArray.length; i++)
-			assertTrue("Map contains incorrect entries", tail
-					.containsValue(objArray[i]));
-        
+    public void test_keySet() {
+        // Test for method java.util.Set java.util.TreeMap.keySet()
+        Set ks = tm.keySet();
+        assertTrue("Returned set of incorrect size",
+                ks.size() == objArray.length);
+        for (int i = 0; i < tm.size(); i++) {
+            assertTrue("Returned set is missing keys", ks.contains(new Integer(
+                    i).toString()));
+        }
+    }
+
+    /**
+     * @tests java.util.TreeMap#lastKey()
+     */
+    public void test_lastKey() {
+        // Test for method java.lang.Object java.util.TreeMap.lastKey()
+        assertTrue("Returned incorrect last key", tm.lastKey().equals(
+                objArray[objArray.length - 1].toString()));
+    }
+
+    /**
+     * @tests java.util.TreeMap#put(java.lang.Object, java.lang.Object)
+     */
+    public void test_putLjava_lang_ObjectLjava_lang_Object() {
+        // Test for method java.lang.Object
+        // java.util.TreeMap.put(java.lang.Object, java.lang.Object)
+        Object o = new Object();
+        tm.put("Hello", o);
+        assertTrue("Failed to put mapping", tm.get("Hello") == o);
+
+        // regression for Harmony-780
+        tm = new TreeMap();
+        assertNull(tm.put(new Object(), new Object()));
+        try {
+            tm.put(new Integer(1), new Object());
+            fail("should throw ClassCastException");
+        } catch (ClassCastException e) {
+            // expected
+        }
+
+        tm = new TreeMap();
+        assertNull(tm.put(new Integer(1), new Object()));
+    }
+
+    /**
+     * @tests java.util.TreeMap#putAll(java.util.Map)
+     */
+    public void test_putAllLjava_util_Map() {
+        // Test for method void java.util.TreeMap.putAll(java.util.Map)
+        TreeMap x = new TreeMap();
+        x.putAll(tm);
+        assertTrue("Map incorrect size after put", x.size() == tm.size());
+        for (Object element : objArray) {
+            assertTrue("Failed to put all elements", x.get(element.toString())
+                    .equals(element));
+        }
+    }
+
+    /**
+     * @tests java.util.TreeMap#remove(java.lang.Object)
+     */
+    public void test_removeLjava_lang_Object() {
+        // Test for method java.lang.Object
+        // java.util.TreeMap.remove(java.lang.Object)
+        tm.remove("990");
+        assertTrue("Failed to remove mapping", !tm.containsKey("990"));
+
+    }
+
+    /**
+     * @tests java.util.TreeMap#size()
+     */
+    public void test_size() {
+        // Test for method int java.util.TreeMap.size()
+        assertEquals("Returned incorrect size", 1000, tm.size());
+    }
+
+    /**
+     * @tests java.util.TreeMap#subMap(java.lang.Object, java.lang.Object)
+     */
+    public void test_subMapLjava_lang_ObjectLjava_lang_Object() {
+        // Test for method java.util.SortedMap
+        // java.util.TreeMap.subMap(java.lang.Object, java.lang.Object)
+        SortedMap subMap = tm.subMap(objArray[100].toString(), objArray[109]
+                .toString());
+        assertEquals("subMap is of incorrect size", 9, subMap.size());
+        for (int counter = 100; counter < 109; counter++) {
+            assertTrue("SubMap contains incorrect elements", subMap.get(
+                    objArray[counter].toString()).equals(objArray[counter]));
+        }
+
+        try {
+            tm.subMap(objArray[9].toString(), objArray[1].toString());
+            fail("end key less than start key should throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            // Expected
+        }
+
+        // Regression for Harmony-1161
+        TreeMap<String, String> treeMapWithNull = new TreeMap<String, String>(
+                new MockComparatorNullTolerable());
+        treeMapWithNull.put("key1", "value1"); //$NON-NLS-1$ //$NON-NLS-2$
+        treeMapWithNull.put(null, "value2"); //$NON-NLS-1$
+        SortedMap<String, String> subMapWithNull = treeMapWithNull.subMap(null,
+                "key1"); //$NON-NLS-1$
+        assertEquals("Size of subMap should be 1:", 1, subMapWithNull.size()); //$NON-NLS-1$
+
+        // Regression test for typo in lastKey method
+        SortedMap<String, String> map = new TreeMap<String, String>();
+        map.put("1", "one"); //$NON-NLS-1$ //$NON-NLS-2$
+        map.put("2", "two"); //$NON-NLS-1$ //$NON-NLS-2$
+        map.put("3", "three"); //$NON-NLS-1$ //$NON-NLS-2$
+        assertEquals("3", map.lastKey());
+        SortedMap<String, String> sub = map.subMap("1", "3"); //$NON-NLS-1$ //$NON-NLS-2$
+        assertEquals("2", sub.lastKey()); //$NON-NLS-1$
+    }
+
+    /**
+     * @tests java.util.TreeMap#tailMap(java.lang.Object)
+     */
+    public void test_tailMapLjava_lang_Object() {
+        // Test for method java.util.SortedMap
+        // java.util.TreeMap.tailMap(java.lang.Object)
+        Map tail = tm.tailMap(objArray[900].toString());
+        assertTrue("Returned map of incorrect size : " + tail.size(), tail
+                .size() == (objArray.length - 900) + 9);
+        for (int i = 900; i < objArray.length; i++) {
+            assertTrue("Map contains incorrect entries", tail
+                    .containsValue(objArray[i]));
+        }
+
         // Regression for Harmony-1066
         assertTrue(tail instanceof Serializable);
-	}
+    }
+
+    /**
+     * @tests java.util.TreeMap#values()
+     */
+    public void test_values() {
+        // Test for method java.util.Collection java.util.TreeMap.values()
+        Collection vals = tm.values();
+        vals.iterator();
+        assertTrue("Returned collection of incorrect size",
+                vals.size() == objArray.length);
+        for (Object element : objArray) {
+            assertTrue("Collection contains incorrect elements", vals
+                    .contains(element));
+        }
 
-	/**
-	 * @tests java.util.TreeMap#values()
-	 */
-	public void test_values() {
-		// Test for method java.util.Collection java.util.TreeMap.values()
-		Collection vals = tm.values();
-		vals.iterator();
-		assertTrue("Returned collection of incorrect size",
-				vals.size() == objArray.length);
-		for (int i = 0; i < objArray.length; i++)
-			assertTrue("Collection contains incorrect elements", vals
-					.contains(objArray[i]));
-
-		TreeMap myTreeMap = new TreeMap();
-		for (int i = 0; i < 100; i++)
-			myTreeMap.put(objArray[i], objArray[i]);
-		Collection values = myTreeMap.values();
-		new Support_UnmodifiableCollectionTest(
-				"Test Returned Collection From TreeMap.values()", values)
-				.runTest();
-		values.remove(new Integer(0));
-		assertTrue(
-				"Removing from the values collection should remove from the original map",
-				!myTreeMap.containsValue(new Integer(0)));
+        TreeMap myTreeMap = new TreeMap();
+        for (int i = 0; i < 100; i++) {
+            myTreeMap.put(objArray[i], objArray[i]);
+        }
+        Collection values = myTreeMap.values();
+        new Support_UnmodifiableCollectionTest(
+                "Test Returned Collection From TreeMap.values()", values)
+                .runTest();
+        values.remove(new Integer(0));
+        assertTrue(
+                "Removing from the values collection should remove from the original map",
+                !myTreeMap.containsValue(new Integer(0)));
+    }
 
-	}
-    
     /**
      * @tests java.util.TreeMap#SerializationTest()
      */
@@ -496,32 +506,26 @@
         assertTrue(headMap instanceof Serializable);
         assertFalse(headMap instanceof TreeMap);
         assertTrue(headMap instanceof SortedMap);
-        
+
         assertFalse(headMap.entrySet() instanceof Serializable);
         assertFalse(headMap.keySet() instanceof Serializable);
         assertFalse(headMap.values() instanceof Serializable);
-        
+
         // This assertion will fail on RI. This is a bug of RI.
         SerializationTest.verifySelf(headMap);
-        
     }
-    
-	/**
-	 * Sets up the fixture, for example, open a network connection. This method
-	 * is called before a test is executed.
-	 */
-	protected void setUp() {
-		tm = new TreeMap();
-		for (int i = 0; i < objArray.length; i++) {
-			Object x = objArray[i] = new Integer(i);
-			tm.put(x.toString(), x);
-		}
-	}
-
-	/**
-	 * Tears down the fixture, for example, close a network connection. This
-	 * method is called after a test is executed.
-	 */
-	protected void tearDown() {
-	}
+
+    /**
+     * Sets up the fixture, for example, open a network connection. This method
+     * is called before a test is executed.
+     */
+    @Override
+    protected void setUp() {
+        tm = new TreeMap();
+        for (int i = 0; i < objArray.length; i++) {
+            Object x = objArray[i] = new Integer(i);
+            tm.put(x.toString(), x);
+        }
+    }
+
 }