Initial load
diff --git a/test/java/util/LinkedHashMap/Basic.java b/test/java/util/LinkedHashMap/Basic.java
new file mode 100644
index 0000000..b826b49
--- /dev/null
+++ b/test/java/util/LinkedHashMap/Basic.java
@@ -0,0 +1,235 @@
+/*
+ * 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 4245809
+ * @summary Basic test for LinkedHashMap.  (Based on MapBash)
+ */
+
+import java.util.*;
+import java.io.*;
+
+public class Basic {
+    static Random rnd = new Random(666);
+    static Object nil = new Integer(0);
+
+    public static void main(String[] args)  throws Exception {
+        int numItr =  500;
+        int mapSize = 500;
+
+        // Linked List test
+        for (int i=0; i<numItr; i++) {
+            Map m = new LinkedHashMap();
+            Object head = nil;
+
+            for (int j=0; j<mapSize; j++) {
+                Object newHead;
+                do {
+                    newHead = new Integer(rnd.nextInt());
+                } while (m.containsKey(newHead));
+                m.put(newHead, head);
+                head = newHead;
+            }
+            if (m.size() != mapSize)
+                throw new Exception("Size not as expected.");
+
+            if (new HashMap(m).hashCode() != m.hashCode())
+                throw new Exception("Incorrect hashCode computation.");
+
+            Map m2 = new LinkedHashMap(); m2.putAll(m);
+            m2.values().removeAll(m.keySet());
+            if (m2.size()!= 1 || !m2.containsValue(nil))
+                throw new Exception("Collection views test failed.");
+
+            int j=0;
+            while (head != nil) {
+                if (!m.containsKey(head))
+                    throw new Exception("Linked list doesn't contain a link.");
+                Object newHead = m.get(head);
+                if (newHead == null)
+                    throw new Exception("Could not retrieve a link.");
+                m.remove(head);
+                head = newHead;
+                j++;
+            }
+            if (!m.isEmpty())
+                throw new Exception("Map nonempty after removing all links.");
+            if (j != mapSize)
+                throw new Exception("Linked list size not as expected.");
+        }
+
+        Map m = new LinkedHashMap();
+        for (int i=0; i<mapSize; i++)
+            if (m.put(new Integer(i), new Integer(2*i)) != null)
+                throw new Exception("put returns non-null value erroenously.");
+        for (int i=0; i<2*mapSize; i++)
+            if (m.containsValue(new Integer(i)) != (i%2==0))
+                throw new Exception("contains value "+i);
+        if (m.put(nil, nil) == null)
+            throw new Exception("put returns a null value erroenously.");
+        Map m2 = new LinkedHashMap(); m2.putAll(m);
+        if (!m.equals(m2))
+            throw new Exception("Clone not equal to original. (1)");
+        if (!m2.equals(m))
+            throw new Exception("Clone not equal to original. (2)");
+        Set s = m.entrySet(), s2 = m2.entrySet();
+        if (!s.equals(s2))
+            throw new Exception("Clone not equal to original. (3)");
+        if (!s2.equals(s))
+            throw new Exception("Clone not equal to original. (4)");
+        if (!s.containsAll(s2))
+            throw new Exception("Original doesn't contain clone!");
+        if (!s2.containsAll(s))
+            throw new Exception("Clone doesn't contain original!");
+
+        m2 = serClone(m);
+        if (!m.equals(m2))
+            throw new Exception("Serialize Clone not equal to original. (1)");
+        if (!m2.equals(m))
+            throw new Exception("Serialize Clone not equal to original. (2)");
+        s = m.entrySet(); s2 = m2.entrySet();
+        if (!s.equals(s2))
+            throw new Exception("Serialize Clone not equal to original. (3)");
+        if (!s2.equals(s))
+            throw new Exception("Serialize Clone not equal to original. (4)");
+        if (!s.containsAll(s2))
+            throw new Exception("Original doesn't contain Serialize clone!");
+        if (!s2.containsAll(s))
+            throw new Exception("Serialize Clone doesn't contain original!");
+
+        s2.removeAll(s);
+        if (!m2.isEmpty())
+            throw new Exception("entrySet().removeAll failed.");
+
+        m2.putAll(m);
+        m2.clear();
+        if (!m2.isEmpty())
+            throw new Exception("clear failed.");
+
+        Iterator it = m.entrySet().iterator();
+        while(it.hasNext()) {
+            it.next();
+            it.remove();
+        }
+        if (!m.isEmpty())
+            throw new Exception("Iterator.remove() failed");
+
+        // Test ordering properties with insert order
+        m = new LinkedHashMap();
+        List l = new ArrayList(mapSize);
+        for (int i=0; i<mapSize; i++) {
+            Integer x = new Integer(i);
+            m.put(x, x);
+            l.add(x);
+        }
+        if (!new ArrayList(m.keySet()).equals(l))
+            throw new Exception("Insertion order not preserved.");
+        for (int i=mapSize-1; i>=0; i--) {
+            Integer x = (Integer) l.get(i);
+            if (!m.get(x).equals(x))
+                throw new Exception("Wrong value: "+i+", "+m.get(x)+", "+x);
+        }
+        if (!new ArrayList(m.keySet()).equals(l))
+            throw new Exception("Insertion order not preserved after read.");
+
+        for (int i=mapSize-1; i>=0; i--) {
+            Integer x = (Integer) l.get(i);
+            m.put(x, x);
+        }
+        if (!new ArrayList(m.keySet()).equals(l))
+            throw new Exception("Insert order not preserved after reinsert.");
+
+        m2 = (Map) ((LinkedHashMap)m).clone();
+        if (!m.equals(m2))
+            throw new Exception("Insert-order Map != clone.");
+
+        List l2 = new ArrayList(l);
+        Collections.shuffle(l2);
+        for (int i=0; i<mapSize; i++) {
+            Integer x = (Integer) l2.get(i);
+            if (!m2.get(x).equals(x))
+              throw new Exception("Clone: Wrong val: "+i+", "+m.get(x)+", "+x);
+        }
+        if (!new ArrayList(m2.keySet()).equals(l))
+            throw new Exception("Clone: altered by read.");
+
+        // Test ordering properties with access order
+        m = new LinkedHashMap(1000, .75f, true);
+        for (int i=0; i<mapSize; i++) {
+            Integer x = new Integer(i);
+            m.put(x, x);
+        }
+        if (!new ArrayList(m.keySet()).equals(l))
+            throw new Exception("Insertion order not properly preserved.");
+
+        for (int i=0; i<mapSize; i++) {
+            Integer x = (Integer) l2.get(i);
+            if (!m.get(x).equals(x))
+                throw new Exception("Wrong value: "+i+", "+m.get(x)+", "+x);
+        }
+        if (!new ArrayList(m.keySet()).equals(l2))
+            throw new Exception("Insert order not properly altered by read.");
+
+        for (int i=0; i<mapSize; i++) {
+            Integer x = new Integer(i);
+            m.put(x, x);
+        }
+        if (!new ArrayList(m.keySet()).equals(l))
+            throw new Exception("Insertion order not altered by reinsert.");
+
+        m2 = (Map) ((LinkedHashMap)m).clone();
+        if (!m.equals(m2))
+            throw new Exception("Access-order Map != clone.");
+        for (int i=0; i<mapSize; i++) {
+            Integer x = (Integer) l.get(i);
+            if (!m2.get(x).equals(x))
+              throw new Exception("Clone: Wrong val: "+i+", "+m.get(x)+", "+x);
+        }
+        if (!new ArrayList(m2.keySet()).equals(l))
+            throw new Exception("Clone: order not properly altered by read.");
+
+        System.err.println("Success.");
+    }
+
+    private static Map serClone(Map m) {
+        Map result = null;
+        try {
+            // Serialize
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            ObjectOutputStream out = new ObjectOutputStream(bos);
+            out.writeObject(m);
+            out.flush();
+
+            // Deserialize
+            ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+            out.close();
+            ObjectInputStream in = new ObjectInputStream(bis);
+            result = (Map)in.readObject();
+            in.close();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+}
diff --git a/test/java/util/LinkedHashMap/Cache.java b/test/java/util/LinkedHashMap/Cache.java
new file mode 100644
index 0000000..cffcca6
--- /dev/null
+++ b/test/java/util/LinkedHashMap/Cache.java
@@ -0,0 +1,50 @@
+/*
+ * 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 4245809
+ * @summary Basic test of removeEldestElement method.
+ */
+
+import java.util.*;
+
+public class Cache {
+    private static final int MAP_SIZE = 10;
+    private static final int NUM_KEYS = 100;
+
+    public static void main(String[] args)  throws Exception {
+        Map m = new LinkedHashMap() {
+            protected boolean removeEldestEntry(Map.Entry eldest) {
+                return size() > MAP_SIZE;
+            }
+        };
+
+        for (int i = 0; i < NUM_KEYS; i++) {
+            m.put(new Integer(i), "");
+            int eldest = ((Integer) m.keySet().iterator().next()).intValue();
+            if (eldest != Math.max(i-9, 0))
+                throw new RuntimeException("i = " + i + ", eldest = " +eldest);
+        }
+    }
+}
diff --git a/test/java/util/LinkedHashMap/EmptyMapIterator.java b/test/java/util/LinkedHashMap/EmptyMapIterator.java
new file mode 100644
index 0000000..66af976
--- /dev/null
+++ b/test/java/util/LinkedHashMap/EmptyMapIterator.java
@@ -0,0 +1,44 @@
+/*
+ * 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 4473440
+ * @summary iterators on collection views of empty map weren't fail-fast.
+ */
+
+import java.util.*;
+
+public class EmptyMapIterator {
+    public static void main(String args[]) throws Exception {
+        HashMap map = new HashMap();
+        Iterator iter = iter = map.entrySet().iterator();
+        map.put("key", "value");
+
+        try {
+            iter.next();
+            throw new Exception("No exception thrown");
+        } catch (ConcurrentModificationException e) {
+        }
+    }
+}