Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 44863 invoked from network); 7 Dec 2006 07:17:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Dec 2006 07:17:25 -0000 Received: (qmail 76209 invoked by uid 500); 7 Dec 2006 07:17:33 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 76116 invoked by uid 500); 7 Dec 2006 07:17:33 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 76107 invoked by uid 99); 7 Dec 2006 07:17:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 23:17:33 -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; Wed, 06 Dec 2006 23:17:24 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 5275C1A9846; Wed, 6 Dec 2006 23:16:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r483366 - in /harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util: IdentityHashMap2Test.java IdentityHashMapTest.java Date: Thu, 07 Dec 2006 07:16:41 -0000 To: commits@harmony.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061207071642.5275C1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smishura Date: Wed Dec 6 23:16:40 2006 New Revision: 483366 URL: http://svn.apache.org/viewvc?view=rev&rev=483366 Log: Merge tests to one file Removed: harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java?view=diff&rev=483366&r1=483365&r2=483366 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMap2Test.java Wed Dec 6 23:16:40 2006 @@ -89,6 +89,23 @@ map.get(null)); } + /** + * @tests java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) + */ + public void test_putLjava_lang_ObjectLjava_lang_Object() { + IdentityHashMap map = new IdentityHashMap(); + + // Test null as a key. + Object value = "Some value"; + map.put(null, value); + assertSame("Assert 0: Failure getting null key", value, map.get(null)); + + // Test null as a value + Object key = "Some key"; + map.put(key, null); + assertNull("Assert 1: Failure getting null value", map.get(key)); + } + /** * @tests java.util.IdentityHashMap#remove(java.lang.Object) * @tests java.util.IdentityHashMap#keySet() @@ -108,6 +125,25 @@ && map.get("key2") == "value2"); assertNull("Modified null entry", map.get(null)); } + + /** + * @tests java.util.IdentityHashMapTest#remove(java.lang.Object) + */ + public void test_removeLjava_lang_Object() { + // Regression for HARMONY-37 + IdentityHashMap hashMap = new IdentityHashMap(); + hashMap.remove("absent"); + assertEquals("Assert 0: Size is incorrect", 0, hashMap.size()); + + hashMap.put("key", "value"); + hashMap.remove("key"); + assertEquals("Assert 1: After removing non-null element size is incorrect", 0, hashMap.size()); + + hashMap.put(null, null); + assertEquals("Assert 2: adding literal null failed", 1, hashMap.size()); + hashMap.remove(null); + assertEquals("Assert 3: After removing null element size is incorrect", 0, hashMap.size()); + } /** * @tests java.util.IdentityHashMap#entrySet()