Initial load
diff --git a/test/java/util/HashMap/KeySetRemove.java b/test/java/util/HashMap/KeySetRemove.java
new file mode 100644
index 0000000..9d4f980
--- /dev/null
+++ b/test/java/util/HashMap/KeySetRemove.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 4286765
+ * @summary HashMap and TreeMap entrySet().remove(k) spuriously returned
+ * false if the Map previously mapped k to null.
+ */
+
+import java.util.*;
+
+public class KeySetRemove {
+ public static void main(String args[]) throws Exception {
+ Map m[] = {new HashMap(), new TreeMap()};
+ for (int i=0; i<m.length; i++) {
+ m[i].put("bananas", null);
+ if (!m[i].keySet().remove("bananas"))
+ throw new Exception("Yes, we have no bananas: "+i);
+ }
+ }
+}
diff --git a/test/java/util/HashMap/SetValue.java b/test/java/util/HashMap/SetValue.java
new file mode 100644
index 0000000..d44c3c9
--- /dev/null
+++ b/test/java/util/HashMap/SetValue.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 4627516
+ * @summary HashMap.Entry.setValue() returns new value (as opposed to old)
+ * @author jbloch
+ */
+
+import java.util.*;
+
+public class SetValue {
+ static final String key = "key";
+ static final String oldValue = "old";
+ static final String newValue = "new";
+
+ public static void main(String args[]) throws Exception {
+ Map m = new HashMap();
+ m.put(key, oldValue);
+ Map.Entry e = (Map.Entry) m.entrySet().iterator().next();
+ Object returnVal = e.setValue(newValue);
+ if (!returnVal.equals(oldValue))
+ throw new RuntimeException("Return value: " + returnVal);
+ }
+}
diff --git a/test/java/util/HashMap/ToString.java b/test/java/util/HashMap/ToString.java
new file mode 100644
index 0000000..6dce66d
--- /dev/null
+++ b/test/java/util/HashMap/ToString.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 4189821
+ * @summary HashMap's entry.toString threw a null pointer exc if the HashMap
+ * contained null keys or values.
+ */
+
+import java.util.*;
+
+public class ToString {
+ public static void main(String[] args) throws Exception {
+ Map m = new HashMap();
+ m.put(null, null);
+ m.entrySet().iterator().next().toString();
+ }
+}