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/05/16 12:11:52 UTC

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/

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);
     }