commit 183a56daa817978687ce0f7b4859dc1fe79a3668
author Kenny Root <kroot@google.com> Fri Sep 23 09:15:47 2016 -0700
committer Kenny Root <kroot@google.com> Fri Sep 23 11:01:28 2016 -0700
tree 1c9d09cc1f688f177924c45370f81da7f3ffbc32
parent 075a6d2625ee8cc70fd87cb1b779080b2c079fd6

CipherTest: test providers that don't use full transform name

Some providers such as Bouncycastle list their Cipher implementations
without mode or padding specified, so we should test those providers as
well.

Test: make -j32 build-art-host vogar && vogar --mode host --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-support-hostdex_intermediates/classes.jack --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-hostdex_intermediates/classes.jack libcore/luni/src/test/java/libcore/javax/crypto/CipherTest.java
Change-Id: I79c59db637d7b7bfae4b1c1cb78be72490384e1d

luni/src/test/java/libcore/javax/crypto/CipherTest.java

diff --git a/luni/src/test/java/libcore/javax/crypto/CipherTest.java b/luni/src/test/java/libcore/javax/crypto/CipherTest.java
index 8dad349..d3a2615 100644
--- a/luni/src/test/java/libcore/javax/crypto/CipherTest.java
+++ b/luni/src/test/java/libcore/javax/crypto/CipherTest.java
@@ -3240,16 +3240,37 @@
         ByteArrayOutputStream errBuffer = new ByteArrayOutputStream();
         PrintStream out = new PrintStream(errBuffer);
         for (CipherTestParam testVector : testVectors) {
-            Provider[] providers = Security.getProviders("Cipher." + testVector.transformation);
-            if ((providers == null) || (providers.length == 0)) {
+            ArrayList<Provider> providers = new ArrayList<>();
+
+            Provider[] providerArray = Security.getProviders("Cipher." + testVector.transformation);
+            if (providerArray != null) {
+                Collections.addAll(providers, providerArray);
+            }
+
+            if (testVector.transformation.indexOf('/') > 0) {
+                Provider[] baseTransformProviderArray = Security.getProviders("Cipher."
+                        + testVector.transformation.substring(
+                                  0, testVector.transformation.indexOf('/')));
+                if (baseTransformProviderArray != null) {
+                    Collections.addAll(providers, baseTransformProviderArray);
+                }
+            }
+
+            if (providers.isEmpty()) {
                 out.append("No providers offer " + testVector.transformation + "\n");
                 continue;
             }
+
             for (Provider provider : providers) {
                 try {
                     checkCipher(testVector, provider.getName());
-                } catch (Exception e) {
-                    logTestFailure(out, provider.getName(), testVector, e);
+                } catch (Throwable e) {
+                    out.append("Error encountered checking " + testVector.transformation);
+                    if (testVector.encryptKey instanceof SecretKey) {
+                        out.append(", keySize=" + testVector.encryptKey.getEncoded().length * 8);
+                    }
+                    out.append(" with provider " + provider + "\n");
+                    e.printStackTrace(out);
                 }
             }
         }