Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88

4 files changed, 11 insertions, 137 deletions

diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk
index 012e5eb..5abfc88 100644
--- a/tests/CoreTests/android/Android.mk
+++ b/tests/CoreTests/android/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := \
 	$(call all-subdir-java-files)
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
 
 LOCAL_PACKAGE_NAME := CoreTests
 
diff --git a/tests/CoreTests/android/core/CryptoTest.java b/tests/CoreTests/android/core/CryptoTest.java
deleted file mode 100644
index e6e50ec..0000000
--- a/tests/CoreTests/android/core/CryptoTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.core;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.harmony.xnet.provider.jsse.OpenSSLMessageDigest;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.MD4Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-
-/**
- * Implements unit tests for our JNI wrapper around OpenSSL. We use the
- * existing Bouncy Castle implementation as our test oracle.
- */
-public class CryptoTest extends TestCase {
-
-    /**
-     * Processes the two given message digests for the same data and checks
-     * the results. Requirement is that the results must be equal, the digest
-     * implementations must have the same properties, and the new implementation
-     * must be faster than the old one.
-     * 
-     * @param oldDigest The old digest implementation, provided by Bouncy Castle 
-     * @param newDigest The new digest implementation, provided by OpenSSL
-     */
-    public void doTestMessageDigest(Digest oldDigest, Digest newDigest) {
-        final int ITERATIONS = 10;
-        
-        byte[] data = new byte[1024];
-        
-        byte[] oldHash = new byte[oldDigest.getDigestSize()];
-        byte[] newHash = new byte[newDigest.getDigestSize()];
-        
-        Assert.assertEquals("Hash names must be equal", oldDigest.getAlgorithmName(), newDigest.getAlgorithmName());
-        Assert.assertEquals("Hash sizes must be equal", oldHash.length, newHash.length);
-        Assert.assertEquals("Hash block sizes must be equal", ((ExtendedDigest)oldDigest).getByteLength(), ((ExtendedDigest)newDigest).getByteLength());
-        for (int i = 0; i < data.length; i++) {
-            data[i] = (byte)i;
-        }
-
-        long oldTime = 0;
-        long newTime = 0;
-        
-        for (int j = 0; j < ITERATIONS; j++) {
-            long t0 = System.currentTimeMillis();
-            for (int i = 0; i < 4; i++) {
-                oldDigest.update(data, 0, data.length);
-            }
-            int oldLength = oldDigest.doFinal(oldHash, 0);
-            long t1 = System.currentTimeMillis();
-    
-            oldTime = oldTime + (t1 - t0);
-            
-            long t2 = System.currentTimeMillis();
-            for (int i = 0; i < 4; i++) {
-                newDigest.update(data, 0, data.length);
-            }
-            int newLength = newDigest.doFinal(newHash, 0);
-            long t3 = System.currentTimeMillis();
-
-            newTime = newTime + (t3 - t2);
-            
-            Assert.assertEquals("Hash sizes must be equal", oldLength, newLength);
-    
-            for (int i = 0; i < oldLength; i++) {
-                Assert.assertEquals("Hashes[" + i + "] must be equal", oldHash[i], newHash[i]);
-            }
-        }
-
-        android.util.Log.d("CryptoTest", "Time for " + ITERATIONS + " x old hash processing: " + oldTime + " ms");
-        android.util.Log.d("CryptoTest", "Time for " + ITERATIONS + " x new hash processing: " + newTime + " ms");
-        
-        // Assert.assertTrue("New hash should be faster", newTime < oldTime);
-    }
-    
-    /**
-     * Tests the MD4 implementation.
-     */
-    @MediumTest
-    public void testMD4() {
-        Digest oldDigest = new MD4Digest();
-        Digest newDigest = OpenSSLMessageDigest.getInstance("MD4");
-        doTestMessageDigest(oldDigest, newDigest);
-    }
-    
-    /**
-     * Tests the MD5 implementation.
-     */
-    @MediumTest
-    public void testMD5() {
-        Digest oldDigest = new MD5Digest();
-        Digest newDigest = OpenSSLMessageDigest.getInstance("MD5");
-        doTestMessageDigest(oldDigest, newDigest);
-    }
-    
-    /**
-     * Tests the SHA-1 implementation.
-     */
-    @MediumTest
-    public void testSHA1() {
-        Digest oldDigest = new SHA1Digest();
-        Digest newDigest = OpenSSLMessageDigest.getInstance("SHA-1");
-        doTestMessageDigest(oldDigest, newDigest);
-    }
-    
-}
diff --git a/tests/CoreTests/android/core/SSLPerformanceTest.java b/tests/CoreTests/android/core/SSLPerformanceTest.java
index e2bd9c5..fd87e89 100644
--- a/tests/CoreTests/android/core/SSLPerformanceTest.java
+++ b/tests/CoreTests/android/core/SSLPerformanceTest.java
@@ -19,8 +19,8 @@ package android.core;
 import android.test.AndroidTestCase;
 import android.os.Debug;
 import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
+import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
 import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
-import org.apache.harmony.xnet.provider.jsse.SSLContextImpl;
 import org.apache.http.conn.scheme.SchemeRegistry;
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.ClientConnectionManager;
@@ -189,14 +189,14 @@ public class SSLPerformanceTest extends AndroidTestCase {
     public void testEngineInit() throws IOException, KeyManagementException {
         Stopwatch stopwatch = new Stopwatch();
 
-        new SSLContextImpl().engineInit(null, null, null);
+        new OpenSSLContextImpl().engineInit(null, null, null);
 
         stopwatch.stop();
     }
 
     public void testWebRequestWithoutCache() throws IOException,
             KeyManagementException {
-        SSLContextImpl sslContext = new SSLContextImpl();
+        OpenSSLContextImpl sslContext = new OpenSSLContextImpl();
         sslContext.engineInit(null, null, null);
 
         Stopwatch stopwatch = new Stopwatch();
@@ -210,7 +210,7 @@ public class SSLPerformanceTest extends AndroidTestCase {
             KeyManagementException {
         deleteDirectory();
 
-        SSLContextImpl sslContext = new SSLContextImpl();
+        OpenSSLContextImpl sslContext = new OpenSSLContextImpl();
         sslContext.engineInit(null, null, null,
                 FileClientSessionCache.usingDirectory(getCacheDirectory()),
                 null);
@@ -234,7 +234,7 @@ public class SSLPerformanceTest extends AndroidTestCase {
             KeyManagementException {
         deleteDirectory();
 
-        SSLContextImpl sslContext = new SSLContextImpl();
+        OpenSSLContextImpl sslContext = new OpenSSLContextImpl();
         sslContext.engineInit(null, null, null);
 
         // Make sure www.google.com is in the cache.
@@ -247,7 +247,7 @@ public class SSLPerformanceTest extends AndroidTestCase {
         stopwatch.stop();
     }
 
-    private void getVerisignDotCom(SSLContextImpl sslContext)
+    private void getVerisignDotCom(OpenSSLContextImpl sslContext)
             throws IOException {
         SchemeRegistry schemeRegistry = new SchemeRegistry();
         schemeRegistry.register(new Scheme("https",
diff --git a/tests/CoreTests/android/core/SSLSocketTest.java b/tests/CoreTests/android/core/SSLSocketTest.java
index 088fa8c..021df80 100644
--- a/tests/CoreTests/android/core/SSLSocketTest.java
+++ b/tests/CoreTests/android/core/SSLSocketTest.java
@@ -19,9 +19,9 @@ package android.core;
 import junit.framework.TestCase;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.harmony.xnet.provider.jsse.SSLContextImpl;
-import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
 import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
+import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
+import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -907,7 +907,7 @@ public class SSLSocketTest extends TestCase {
      */
     public void testClientSessionCaching() throws IOException,
             KeyManagementException {
-        SSLContextImpl context = new SSLContextImpl();
+        OpenSSLContextImpl context = new OpenSSLContextImpl();
 
         // Cache size = 2.
         FakeClientSessionCache fakeCache = new FakeClientSessionCache();
@@ -997,7 +997,7 @@ public class SSLSocketTest extends TestCase {
 
     public void testFileBasedClientSessionCache() throws IOException,
             KeyManagementException {
-        SSLContextImpl context = new SSLContextImpl();
+        OpenSSLContextImpl context = new OpenSSLContextImpl();
         String tmpDir = System.getProperty("java.io.tmpdir");
         if (tmpDir == null) {
             fail("Please set 'java.io.tmpdir' system property.");