Initial load
diff --git a/test/java/util/AbstractMap/AbstractMapClone.java b/test/java/util/AbstractMap/AbstractMapClone.java
new file mode 100644
index 0000000..fe251c6
--- /dev/null
+++ b/test/java/util/AbstractMap/AbstractMapClone.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2000 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 4328748
+ * @summary AbstractMap's clone() method is implemented to
+ *  reset AbstractMap's private fields after super.clone()
+ *
+ * @author Konstantin Kladko
+ */
+
+import java.util.*;
+
+public class AbstractMapClone extends AbstractMap implements Cloneable {
+
+    private Map map = new HashMap();
+
+    public Set entrySet() {
+        return map.entrySet();
+    }
+
+    public Object put(Object key, Object value) {
+        return map.put(key, value);
+    }
+
+    public Object clone() {
+        AbstractMapClone clone = null;
+        try {
+        clone = (AbstractMapClone)super.clone();
+        } catch (CloneNotSupportedException e) {
+        }
+        clone.map = (Map)((HashMap)map).clone();
+        return clone;
+    }
+
+    public static void main(String[] args) {
+        AbstractMapClone m1 = new AbstractMapClone();
+        m1.put("1", "1");
+        Set k1 = m1.keySet();
+        AbstractMapClone m2 = (AbstractMapClone)m1.clone();
+        Set k2 = m2.keySet();
+        m2.put("2","2");
+        if (k1.equals(k2)) {
+            throw new RuntimeException("AbstractMap.clone() failed.");
+        }
+    }
+}
diff --git a/test/java/util/AbstractMap/Equals.java b/test/java/util/AbstractMap/Equals.java
new file mode 100644
index 0000000..a481745
--- /dev/null
+++ b/test/java/util/AbstractMap/Equals.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2001 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.
+ */
+
+import java.util.*;
+
+/**
+ * @test
+ * @bug     4503672
+ * @summary AbstractMap.equals and AbstractSet.equals are fragile: they
+ *          throw exceptions when they should return false.
+ * @author  Josh Bloch
+ */
+public class Equals {
+    public static void main(String[] args) {
+        Map m = new HashMap();
+        m.put(null, "");
+        Map h = new Hashtable();
+        h.put("", "");
+        if (m.equals(h))
+            throw new RuntimeException("1");
+
+        Map m1 = new TreeMap();
+        m1.put(new Integer(42), "The Answer");
+        Map m2 = new TreeMap();
+        m2.put("The Answer", new Integer(42));
+        if (m1.equals(m2))
+            throw new RuntimeException("3");
+
+        Set s1 = new TreeSet();
+        s1.add(new Integer(666));
+        Set s2 = new TreeSet();
+        s2.add("Great googly moogly!");
+        if (s1.equals(s2))
+            throw new RuntimeException("2");
+    }
+}
diff --git a/test/java/util/AbstractMap/SimpleEntries.java b/test/java/util/AbstractMap/SimpleEntries.java
new file mode 100644
index 0000000..9bc8063
--- /dev/null
+++ b/test/java/util/AbstractMap/SimpleEntries.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2005 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 4904074 6328220 6330389
+ * @summary Basic tests for SimpleEntry, SimpleImmutableEntry
+ * @author Martin Buchholz
+ */
+
+import java.util.*;
+import java.util.concurrent.*;
+import static java.util.AbstractMap.*;
+
+public class SimpleEntries {
+    private static String k = "foo";
+    private static Long v = 1L;
+    private static Long v2 = 2L;
+    private static void realMain(String[] args) throws Throwable {
+        testEntry(new SimpleEntry<String,Long>(k,v));
+        testEntry(new SimpleImmutableEntry<String,Long>(k,v));
+        testNullEntry(new SimpleEntry<String,Long>(null,null));
+        testNullEntry(new SimpleImmutableEntry<String,Long>(null,null));
+    }
+
+    private static void testEntry(Map.Entry<String,Long> e) {
+        equal(e.getKey(), k);
+        equal(e.getValue(), v);
+        equal(e, new SimpleEntry<String,Long>(k,v));
+        check(! e.equals(new SimpleEntry<String,Long>(k,v2)));
+        check(! e.equals(null));
+        equal(e, new SimpleImmutableEntry<String,Long>(k,v));
+        equal(e.toString(), k+"="+v);
+        if (e instanceof SimpleEntry) {
+            equal(e.setValue(v2), v);
+            equal(e.getValue(), v2);
+            equal(e.setValue(null), v2);
+            equal(e.getValue(), null);
+        } else {
+            try { e.setValue(v2); fail(); }
+            catch (UnsupportedOperationException t) {}
+            catch (Throwable t) { unexpected(t); }
+        }
+    }
+
+    private static void testNullEntry(Map.Entry<String,Long> e) {
+        equal(e.getKey(), null);
+        equal(e.getValue(), null);
+        equal(e, new SimpleEntry<String,Long>(null, null));
+        equal(e, new SimpleImmutableEntry<String,Long>(null, null));
+        equal(e.toString(), "null=null");
+        if (e instanceof SimpleEntry) {
+            equal(e.setValue(v), null);
+            equal(e.getValue(), v);
+        } else {
+            try { e.setValue(null); fail(); }
+            catch (UnsupportedOperationException t) {}
+            catch (Throwable t) { unexpected(t); }
+        }
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    static volatile int passed = 0, failed = 0;
+    static void pass() {passed++;}
+    static void fail() {failed++; Thread.dumpStack();}
+    static void fail(String msg) {System.out.println(msg); fail();}
+    static void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    static void check(boolean cond) {if (cond) pass(); else fail();}
+    static void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        try {realMain(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/test/java/util/AbstractMap/ToString.java b/test/java/util/AbstractMap/ToString.java
new file mode 100644
index 0000000..fc414d7
--- /dev/null
+++ b/test/java/util/AbstractMap/ToString.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2001 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 4486049
+ * @summary toString method fails if size changes in between a call to size
+ *           and an attempt to iterate.
+ * @author Josh Bloch
+ */
+
+import java.util.*;
+
+public class ToString {
+    public static void main(String[] args) {
+        Map m = new LyingMap();
+        if (!m.toString().equals("{}"))
+            throw new RuntimeException(m.toString() + "!= {}");
+
+        m.put("x", "1");
+        if (!m.toString().equals("{x=1}"))
+            throw new RuntimeException(m.toString() + "!= {x=1}");
+
+        m.put("y", "2");
+        if (!m.toString().equals("{x=1, y=2}"))
+            throw new RuntimeException(m.toString() + "!= {x=1, y=2}");
+    }
+}
+
+class LyingMap extends LinkedHashMap {
+    public int size() {
+        return super.size() + 1; // Lies, lies, all lies!
+    }
+}