diff options
author | Adam Vartanian <flooey@google.com> | 2017-03-23 09:50:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 09:50:17 +0000 |
commit | 45162a13460e053e5b84cbc9e62c7014278fa29b (patch) | |
tree | 241e5ee09e1165e9b6b7c23716660c91af2ca9a4 | |
parent | 8d29ded8559f3927697bf3438d0b6462ab56bb8a (diff) | |
parent | a1edc5a661f114b7cbfa894b71897ca05f3c4963 (diff) | |
download | apache-harmony-45162a13460e053e5b84cbc9e62c7014278fa29b.tar.gz |
Merge "Enable Apache Harmony crypto tests." am: 90b7ee1056 am: eac933553f
am: a1edc5a661
Change-Id: I223372f96477718540eb83816926bd5cc5f94f99
-rw-r--r-- | Android.mk | 7 | ||||
-rw-r--r-- | crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java | 8 | ||||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser) | bin | 1388 -> 1388 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser) | bin | 1388 -> 1388 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser) | bin | 1473 -> 1473 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser) | bin | 1412 -> 1412 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser) | bin | 1412 -> 1412 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser) | bin | 1497 -> 1497 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser) | bin | 1491 -> 1491 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser) | bin | 1397 -> 1397 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser) | bin | 1397 -> 1397 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser) | bin | 1482 -> 1482 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser) | bin | 1391 -> 1391 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser) | bin | 1391 -> 1391 bytes | |||
-rw-r--r-- | crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser (renamed from crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser) | bin | 1476 -> 1476 bytes | |||
-rw-r--r-- | security/src/test/support/common/java/org/apache/harmony/security/tests/support/provider/cert/CertFactoryTestData.java | 21 |
18 files changed, 28 insertions, 8 deletions
@@ -8,23 +8,26 @@ endef harmony_test_dirs := \ beans \ + crypto \ logging \ luni \ sql \ support \ # TODO: get these working too! -# crypto \ # security \ # x-net harmony_test_src_files := \ $(call all-harmony-test-java-files-under,$(harmony_test_dirs),src/test/java) \ + $(call all-harmony-test-java-files-under,$(harmony_test_dirs),src/test/api/java) \ $(call all-harmony-test-java-files-under,$(harmony_test_dirs),src/test/support/java) \ + $(call all-harmony-test-java-files-under,$(harmony_test_dirs),src/test/support/common/java) \ $(call all-harmony-test-java-files-under,luni,src/test/api/common) \ $(call all-harmony-test-java-files-under,luni,src/test/api/unix) \ $(call all-harmony-test-java-files-under,luni,src/test/impl/common) \ - $(call all-harmony-test-java-files-under,luni,src/test/impl/unix) + $(call all-harmony-test-java-files-under,luni,src/test/impl/unix) \ + $(call all-harmony-test-java-files-under,security,src/test/support/common/java) # We need to use -maxdepth 4 because there's a non-resource directory called "resources" deeper in the tree. define harmony-test-resource-dirs diff --git a/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java b/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java index ce1a97b..4b61174 100644 --- a/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java +++ b/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java @@ -121,6 +121,11 @@ public class SecretKeySpecTest extends TestCase { } catch (ArrayIndexOutOfBoundsException e) { } + // BEGIN Android-removed: Unnecessarily specific test + // This is illegal for three reasons (key too short, invalid offset, invalid length), + // and the spec doesn't specify which exception should be thrown if multiple are + // valid. We happen to throw IllegalArgumentException, which is allowed behavior. + /* // Regression test for HARMONY-6347 try { new SecretKeySpec(key, -1, key.length + 2, algorithm); @@ -130,6 +135,9 @@ public class SecretKeySpecTest extends TestCase { fail("Not expected IllegalArgumentException was thrown."); } catch (ArrayIndexOutOfBoundsException e) { } + */ + // END Android-removed: Unnecessarily specific test + try { new SecretKeySpec(key, offset, len, null); diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser Binary files differindex a7d6333..a7d6333 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser Binary files differindex 447c1f4..447c1f4 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser Binary files differindex ae028bd..ae028bd 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser Binary files differindex 60c67c0..60c67c0 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser Binary files differindex 58b303f..58b303f 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser Binary files differindex ee41ad6..ee41ad6 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser Binary files differindex 98823fc..98823fc 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser Binary files differindex a69ae56..a69ae56 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser Binary files differindex f23826c..f23826c 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser Binary files differindex 0cdc09d..0cdc09d 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser Binary files differindex 3a12187..3a12187 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser Binary files differindex 5818cd4..5818cd4 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser Binary files differindex 1f8e55f..1f8e55f 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser Binary files differindex b0fadb2..b0fadb2 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser diff --git a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser Binary files differindex 9edf260..9edf260 100644 --- a/crypto/src/test/resources/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser +++ b/crypto/src/test/resources/serialization/com/android/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser diff --git a/security/src/test/support/common/java/org/apache/harmony/security/tests/support/provider/cert/CertFactoryTestData.java b/security/src/test/support/common/java/org/apache/harmony/security/tests/support/provider/cert/CertFactoryTestData.java index 15fad04..875350c 100644 --- a/security/src/test/support/common/java/org/apache/harmony/security/tests/support/provider/cert/CertFactoryTestData.java +++ b/security/src/test/support/common/java/org/apache/harmony/security/tests/support/provider/cert/CertFactoryTestData.java @@ -22,8 +22,9 @@ package org.apache.harmony.security.tests.support.provider.cert; import java.io.UnsupportedEncodingException; - -import org.apache.harmony.luni.util.Base64; +// Android-changed: Don't use Harmony's Base64 class +// import org.apache.harmony.luni.util.Base64; +import java.util.Base64; /** * Class contains the base 64 encodings of X.509 certificates, @@ -295,15 +296,21 @@ public class CertFactoryTestData { public static byte[] getCertPathPKCS7Encoding() throws UnsupportedEncodingException { - return Base64.decode(certPathPKCS7Base64.getBytes("UTF-8")); + // Android-changed: Don't use Harmony's Base64 class + // return Base64.decode(certPathPKCS7Base64.getBytes("UTF-8")); + return Base64.getDecoder().decode(certPathPKCS7Base64.getBytes("UTF-8")); } public static byte[] getCertPathPkiPathEncoding() throws UnsupportedEncodingException { - return Base64.decode(certPathPkiPathBase64.getBytes("UTF-8")); + // Android-changed: Don't use Harmony's Base64 class + // return Base64.decode(certPathPkiPathBase64.getBytes("UTF-8")); + return Base64.getDecoder().decode(certPathPkiPathBase64.getBytes("UTF-8")); } public static byte[] getCertEncoding() throws UnsupportedEncodingException { - return Base64.decode(certEncodingBase64.getBytes("UTF-8")); + // Android-changed: Don't use Harmony's Base64 class + // return Base64.decode(certEncodingBase64.getBytes("UTF-8")); + return Base64.getDecoder().decode(certEncodingBase64.getBytes("UTF-8")); } public static byte[] getBase64CertEncoding() throws UnsupportedEncodingException { @@ -315,7 +322,9 @@ public class CertFactoryTestData { } public static byte[] getCRLEncoding() throws UnsupportedEncodingException { - return Base64.decode(crlEncodingBase64.getBytes("UTF-8")); + // Android-changed: Don't use Harmony's Base64 class + // return Base64.decode(crlEncodingBase64.getBytes("UTF-8")); + return Base64.getDecoder().decode(crlEncodingBase64.getBytes("UTF-8")); } } |