diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/javax/crypto/Mac/TestGetInstance.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/crypto/Mac/TestGetInstance.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2003-2007 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 4898428
+ * @summary test that the new getInstance() implementation works correctly
+ * @author Andreas Sterbenz
+ */
+
+import java.security.*;
+
+import javax.crypto.*;
+
+public class TestGetInstance {
+
+    private static void same(Object o1, Object o2) throws Exception {
+        if (o1 != o2) {
+            throw new Exception("not same object");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        long start = System.currentTimeMillis();
+
+        Provider p = Security.getProvider("SunJCE");
+
+        Mac mac;
+
+        mac = Mac.getInstance("hmacmd5");
+        System.out.println("Default: " + mac.getProvider().getName());
+        mac = Mac.getInstance("hmacmd5", "SunJCE");
+        same(p, mac.getProvider());
+        mac = Mac.getInstance("hmacmd5", p);
+        same(p, mac.getProvider());
+
+        try {
+            mac = Mac.getInstance("foo");
+            throw new AssertionError();
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println(e);
+        }
+        try {
+            mac = Mac.getInstance("foo", "SunJCE");
+            throw new AssertionError();
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println(e);
+        }
+        try {
+            mac = Mac.getInstance("foo", p);
+            throw new AssertionError();
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println(e);
+        }
+
+        try {
+            mac = Mac.getInstance("foo", "SUN");
+            throw new AssertionError();
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println(e);
+        }
+        try {
+            mac = Mac.getInstance("foo", Security.getProvider("SUN"));
+            throw new AssertionError();
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println(e);
+        }
+        try {
+            mac = Mac.getInstance("foo", "foo");
+            throw new AssertionError();
+        } catch (NoSuchProviderException e) {
+            System.out.println(e);
+        }
+        long stop = System.currentTimeMillis();
+        System.out.println("Done (" + (stop - start) + " ms).");
+    }
+}