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/20 09:44:25 UTC
svn commit: r395524 - in
/incubator/harmony/enhanced/classlib/trunk/modules/crypto:
make/common/build.xml src/main/java/javax/crypto/Cipher.java
Author: smishura
Date: Thu Apr 20 00:44:23 2006
New Revision: 395524
URL: http://svn.apache.org/viewcvs?rev=395524&view=rev
Log:
Partial fix for HARMONY-315 (javax.crypto.Cipher.getInstance doesn't match RI exception behaviour.)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=395524&r1=395523&r2=395524&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Thu Apr 20 00:44:23 2006
@@ -109,14 +109,15 @@
<!-- public API tests must be separated -->
<jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+ <classpath>
+ <pathelement path="${hy.crypto.src.test.resources}"/>
+ </classpath>
+
<formatter type="xml" />
<batchtest todir="${hy.tests.reports}" haltonfailure="no">
<fileset dir="${hy.crypto.src.test.java}">
<include name="**/*Test.java"/>
-
- <!-- Harmony exclude list -->
- <exclude name="tests/api/javax/crypto/CipherTest.java"/>
</fileset>
</batchtest>
</junit>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java?rev=395524&r1=395523&r2=395524&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java Thu Apr 20 00:44:23 2006
@@ -146,6 +146,11 @@
public static final Cipher getInstance(String transformation,
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException, NoSuchPaddingException {
+
+ if (provider == null) {
+ throw new IllegalArgumentException("provider is null");
+ }
+
Provider p = Security.getProvider(provider);
if (p == null) {
throw new NoSuchProviderException("Provider " + provider
Re: svn commit: r395524 - in /incubator/harmony/enhanced/classlib/trunk/modules/crypto: make/common/build.xml src/main/java/javax/crypto/Cipher.java
Posted by Stepan Mishura <st...@gmail.com>.
Interesting it passed on Windows but fails on Linux :-(
Thanks,
Stepan.
On 4/20/06, Mark Hindess <ma...@googlemail.com> wrote:
>
> Looks like the (unrelated?) change to the classpath broken another test. I
> get:
>
> Failed to load resource: hyts_des-ede3-cbc.test1.cipherText
>
> junit.framework.AssertionFailedError: Failed to load resource:
> hyts_des-ede3-cbc.test1.cipherText at
> tests.api.javax.crypto.CipherTest.getStream(CipherTest.java:583) at
> tests.api.javax.crypto.CipherTest.loadBytes(CipherTest.java:563) at
> tests.api.javax.crypto.CipherTest.test_doFinal(CipherTest.java:553) at
> java.lang.reflect.AccessibleObject.invokeV(AccessibleObject.java:205)
> 0.011
>
> Geir, for some reason the test failure messages aren't reaching the
> list. They are coming from the same address but have a different
> subject line.
>
> -Mark.
>
> On 4/20/06, smishura@apache.org <sm...@apache.org> wrote:
> > Author: smishura
> > Date: Thu Apr 20 00:44:23 2006
> > New Revision: 395524
> >
> > URL: http://svn.apache.org/viewcvs?rev=395524&view=rev
> > Log:
> > Partial fix for HARMONY-315 (javax.crypto.Cipher.getInstance doesn't
> match RI exception behaviour.)
> >
> > Modified:
> >
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
> >
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
> >
> > Modified:
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
> > URL:
> http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=395524&r1=395523&r2=395524&view=diff
> >
> ==============================================================================
> > ---
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
> (original)
> > +++
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
> Thu Apr 20 00:44:23 2006
> > @@ -109,14 +109,15 @@
> > <!-- public API tests must be separated -->
> > <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}${
> path.separator}../../../../${junit.jar}${path.separator
> }../../../../build/tests"/>
> >
> > + <classpath>
> > + <pathelement path="${hy.crypto.src.test.resources}"/>
> > + </classpath>
> > +
> > <formatter type="xml" />
> >
> > <batchtest todir="${hy.tests.reports}" haltonfailure="no">
> > <fileset dir="${hy.crypto.src.test.java}">
> > <include name="**/*Test.java"/>
> > -
> > - <!-- Harmony exclude list -->
> > - <exclude
> name="tests/api/javax/crypto/CipherTest.java"/>
> > </fileset>
> > </batchtest>
> > </junit>
> >
> > Modified:
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
> > URL:
> http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java?rev=395524&r1=395523&r2=395524&view=diff
> >
> ==============================================================================
> > ---
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
> (original)
> > +++
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
> Thu Apr 20 00:44:23 2006
> > @@ -146,6 +146,11 @@
> > public static final Cipher getInstance(String transformation,
> > String provider) throws NoSuchAlgorithmException,
> > NoSuchProviderException, NoSuchPaddingException {
> > +
> > + if (provider == null) {
> > + throw new IllegalArgumentException("provider is null");
> > + }
> > +
> > Provider p = Security.getProvider(provider);
> > if (p == null) {
> > throw new NoSuchProviderException("Provider " + provider
> >
> >
> >
>
>
> --
> Mark Hindess <ma...@googlemail.com>
> IBM Java Technology Centre, UK.
>
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>
>
--
Thanks,
Stepan Mishura
Intel Middleware Products Division
------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org
Re: svn commit: r395524 - in /incubator/harmony/enhanced/classlib/trunk/modules/crypto: make/common/build.xml src/main/java/javax/crypto/Cipher.java
Posted by Mark Hindess <ma...@googlemail.com>.
Looks like the (unrelated?) change to the classpath broken another test. I get:
Failed to load resource: hyts_des-ede3-cbc.test1.cipherText
junit.framework.AssertionFailedError: Failed to load resource:
hyts_des-ede3-cbc.test1.cipherText at
tests.api.javax.crypto.CipherTest.getStream(CipherTest.java:583) at
tests.api.javax.crypto.CipherTest.loadBytes(CipherTest.java:563) at
tests.api.javax.crypto.CipherTest.test_doFinal(CipherTest.java:553) at
java.lang.reflect.AccessibleObject.invokeV(AccessibleObject.java:205) 0.011
Geir, for some reason the test failure messages aren't reaching the
list. They are coming from the same address but have a different
subject line.
-Mark.
On 4/20/06, smishura@apache.org <sm...@apache.org> wrote:
> Author: smishura
> Date: Thu Apr 20 00:44:23 2006
> New Revision: 395524
>
> URL: http://svn.apache.org/viewcvs?rev=395524&view=rev
> Log:
> Partial fix for HARMONY-315 (javax.crypto.Cipher.getInstance doesn't match RI exception behaviour.)
>
> Modified:
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
> incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
> URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=395524&r1=395523&r2=395524&view=diff
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Thu Apr 20 00:44:23 2006
> @@ -109,14 +109,15 @@
> <!-- public API tests must be separated -->
> <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
>
> + <classpath>
> + <pathelement path="${hy.crypto.src.test.resources}"/>
> + </classpath>
> +
> <formatter type="xml" />
>
> <batchtest todir="${hy.tests.reports}" haltonfailure="no">
> <fileset dir="${hy.crypto.src.test.java}">
> <include name="**/*Test.java"/>
> -
> - <!-- Harmony exclude list -->
> - <exclude name="tests/api/javax/crypto/CipherTest.java"/>
> </fileset>
> </batchtest>
> </junit>
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
> URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java?rev=395524&r1=395523&r2=395524&view=diff
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java Thu Apr 20 00:44:23 2006
> @@ -146,6 +146,11 @@
> public static final Cipher getInstance(String transformation,
> String provider) throws NoSuchAlgorithmException,
> NoSuchProviderException, NoSuchPaddingException {
> +
> + if (provider == null) {
> + throw new IllegalArgumentException("provider is null");
> + }
> +
> Provider p = Security.getProvider(provider);
> if (p == null) {
> throw new NoSuchProviderException("Provider " + provider
>
>
>
--
Mark Hindess <ma...@googlemail.com>
IBM Java Technology Centre, UK.
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org