Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 13961 invoked from network); 16 May 2006 10:12:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 May 2006 10:12:21 -0000 Received: (qmail 49370 invoked by uid 500); 16 May 2006 10:12:21 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 49335 invoked by uid 500); 16 May 2006 10:12:21 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 49322 invoked by uid 99); 16 May 2006 10:12:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 May 2006 03:12:20 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 16 May 2006 03:12:19 -0700 Received: (qmail 13862 invoked by uid 65534); 16 May 2006 10:11:59 -0000 Message-ID: <20060516101159.13860.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r406889 - in /incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security: auth/callback/serialization/ auth/login/serialization/ auth/serialization/ sasl/serialization/ Date: Tue, 16 May 2006 10:11:52 -0000 To: harmony-commits@incubator.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smishura Date: Tue May 16 03:11:49 2006 New Revision: 406889 URL: http://svn.apache.org/viewcvs?rev=406889&view=rev Log: Removing assertDeserialized methods - Throwable objects are compared by testing framework's comparator Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java Tue May 16 03:11:49 2006 @@ -42,12 +42,4 @@ protected Object[] getData() { return new Object[] {new UnsupportedCallbackException(nc)}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((UnsupportedCallbackException) golden).getMessage(), - (((UnsupportedCallbackException) test).getMessage())); - assertEquals(((UnsupportedCallbackException) golden).getCause(), - (((UnsupportedCallbackException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java Tue May 16 03:11:49 2006 @@ -40,12 +40,4 @@ protected Object[] getData() { return new Object[] {new AccountException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((AccountException) golden).getMessage(), - (((AccountException) test).getMessage())); - assertEquals(((AccountException) golden).getCause(), - (((AccountException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java Tue May 16 03:11:49 2006 @@ -38,12 +38,4 @@ protected Object[] getData() { return new Object[] {new AccountExpiredException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((AccountExpiredException) golden).getMessage(), - (((AccountExpiredException) test).getMessage())); - assertEquals(((AccountExpiredException) golden).getCause(), - (((AccountExpiredException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java Tue May 16 03:11:49 2006 @@ -40,12 +40,4 @@ protected Object[] getData() { return new Object[] {new AccountLockedException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((AccountLockedException) golden).getMessage(), - (((AccountLockedException) test).getMessage())); - assertEquals(((AccountLockedException) golden).getCause(), - (((AccountLockedException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java Tue May 16 03:11:49 2006 @@ -39,12 +39,4 @@ protected Object[] getData() { return new Object[] {new AccountNotFoundException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((AccountNotFoundException) golden).getMessage(), - (((AccountNotFoundException) test).getMessage())); - assertEquals(((AccountNotFoundException) golden).getCause(), - (((AccountNotFoundException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java Tue May 16 03:11:49 2006 @@ -40,12 +40,4 @@ protected Object[] getData() { return new Object[] {new CredentialException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((CredentialException) golden).getMessage(), - (((CredentialException) test).getMessage())); - assertEquals(((CredentialException) golden).getCause(), - (((CredentialException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java Tue May 16 03:11:49 2006 @@ -39,12 +39,4 @@ protected Object[] getData() { return new Object[] {new CredentialExpiredException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((CredentialExpiredException) golden).getMessage(), - (((CredentialExpiredException) test).getMessage())); - assertEquals(((CredentialExpiredException) golden).getCause(), - (((CredentialExpiredException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java Tue May 16 03:11:49 2006 @@ -39,12 +39,4 @@ protected Object[] getData() { return new Object[] {new CredentialNotFoundException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((CredentialNotFoundException) golden).getMessage(), - (((CredentialNotFoundException) test).getMessage())); - assertEquals(((CredentialNotFoundException) golden).getCause(), - (((CredentialNotFoundException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java Tue May 16 03:11:49 2006 @@ -39,12 +39,4 @@ protected Object[] getData() { return new Object[] {new FailedLoginException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((FailedLoginException) golden).getMessage(), - (((FailedLoginException) test).getMessage())); - assertEquals(((FailedLoginException) golden).getCause(), - (((FailedLoginException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java Tue May 16 03:11:49 2006 @@ -39,12 +39,4 @@ protected Object[] getData() { return new Object[] {new LoginException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((LoginException) golden).getMessage(), - (((LoginException) test).getMessage())); - assertEquals(((LoginException) golden).getCause(), - (((LoginException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java Tue May 16 03:11:49 2006 @@ -39,12 +39,4 @@ protected Object[] getData() { return new Object[] {new DestroyFailedException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((DestroyFailedException) golden).getMessage(), - (((DestroyFailedException) test).getMessage())); - assertEquals(((DestroyFailedException) golden).getCause(), - (((DestroyFailedException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java Tue May 16 03:11:49 2006 @@ -40,12 +40,4 @@ protected Object[] getData() { return new Object[] {new RefreshFailedException("message")}; } - - protected void assertDeserialized(Object golden, Object test) { - assertSame(golden.getClass(), test.getClass()); - assertEquals(((RefreshFailedException) golden).getMessage(), - (((RefreshFailedException) test).getMessage())); - assertEquals(((RefreshFailedException) golden).getCause(), - (((RefreshFailedException) test).getCause())); - } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java Tue May 16 03:11:49 2006 @@ -49,30 +49,6 @@ }; } - protected void assertDeserialized(Object oref, Object otest) { - AuthenticationException ref = (AuthenticationException) oref; - AuthenticationException test = (AuthenticationException) otest; - Throwable th = ref.getCause(); - String s = ref.getMessage(); - if (s == null) { - assertNull(test.getMessage()); - } else { - assertEquals(test.getMessage(), s); - } - if (th == null) { - assertNull(test.getCause()); - } else { - Throwable th1 = test.getCause(); - assertEquals(th1.getClass(), th.getClass()); - String s1 = th.getMessage(); - if (s1 == null) { - assertNull(th1.getMessage()); - } else { - assertEquals(th1.getMessage(), s1); - } - } - } - public static void main(String[] args) { junit.textui.TestRunner.run(AuthenticationExceptionTest.class); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java?rev=406889&r1=406888&r2=406889&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java Tue May 16 03:11:49 2006 @@ -49,30 +49,6 @@ }; } - protected void assertDeserialized(Object oref, Object otest) { - SaslException ref = (SaslException) oref; - SaslException test = (SaslException) otest; - Throwable th = ref.getCause(); - String s = ref.getMessage(); - if (s == null) { - assertNull(test.getMessage()); - } else { - assertEquals(test.getMessage(), s); - } - if (th == null) { - assertNull(test.getCause()); - } else { - Throwable th1 = test.getCause(); - assertEquals(th1.getClass(), th.getClass()); - String s1 = th.getMessage(); - if (s1 == null) { - assertNull(th1.getMessage()); - } else { - assertEquals(th1.getMessage(), s1); - } - } - } - public static void main(String[] args) { junit.textui.TestRunner.run(SaslExceptionTest.class); }