You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2006/04/14 05:13:49 UTC

svn commit: r394004 - /incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java

Author: smishura
Date: Thu Apr 13 20:13:47 2006
New Revision: 394004

URL: http://svn.apache.org/viewcvs?rev=394004&view=rev
Log:
Apply patch HARMONY-344 (javax/crypto/SecretKeyFactoryTest1.java doesn't compile with target jsr14)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java   (contents, props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java?rev=394004&r1=394003&r2=394004&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java Thu Apr 13 20:13:47 2006
@@ -391,9 +391,13 @@
                 }
             }
             try {
-                skF[i].getKeySpec(secKeySpec,
-                        (defaultAlgorithm.equals(defaultAlgorithm2)
-                                ? DESedeKeySpec.class : DESKeySpec.class));
+                Class c;
+                if (defaultAlgorithm.equals(defaultAlgorithm2)) {
+                    c = DESedeKeySpec.class;
+                } else {
+                    c = DESKeySpec.class;
+                }
+                skF[i].getKeySpec(secKeySpec, c);
                 fail("getKeySpec(secKey, Class): InvalidKeySpecException must be thrown");
             } catch (InvalidKeySpecException e) {
             }

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/javax/crypto/SecretKeyFactoryTest1.java
------------------------------------------------------------------------------
    svn:eol-style = native