Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 45624 invoked from network); 14 Jun 2006 08:11:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jun 2006 08:11:23 -0000 Received: (qmail 60781 invoked by uid 500); 14 Jun 2006 08:11:22 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 60746 invoked by uid 500); 14 Jun 2006 08:11:22 -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 60735 invoked by uid 99); 14 Jun 2006 08:11:22 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jun 2006 01:11:22 -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-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jun 2006 01:11:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 807BA1A983A; Wed, 14 Jun 2006 01:11:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r414140 - in /incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security: cert/serialization/ serialization/ Date: Wed, 14 Jun 2006 08:11:00 -0000 To: harmony-commits@incubator.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060614081101.807BA1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smishura Date: Wed Jun 14 01:11:00 2006 New Revision: 414140 URL: http://svn.apache.org/viewvc?rev=414140&view=rev Log: Separating common and class specific checks Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathValidatorExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/AccessControlExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/PrivilegedActionExceptionTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathValidatorExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathValidatorExceptionTest.java?rev=414140&r1=414139&r2=414140&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathValidatorExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/serialization/CertPathValidatorExceptionTest.java Wed Jun 14 01:11:00 2006 @@ -56,27 +56,13 @@ } public void assertDeserialized(Serializable oref, Serializable otest) { + + // common checks + THROWABLE_COMPARATOR.assertDeserialized(oref, otest); + + // class specific checks CertPathValidatorException ref = (CertPathValidatorException) oref; CertPathValidatorException test = (CertPathValidatorException) otest; - String s = ref.getMessage(); - Throwable th = ref.getCause(); - 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); - } - } CertPath cp = ref.getCertPath(); int ind = ref.getIndex(); assertEquals("Incorrect index", test.getIndex(), ind); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/AccessControlExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/AccessControlExceptionTest.java?rev=414140&r1=414139&r2=414140&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/AccessControlExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/AccessControlExceptionTest.java Wed Jun 14 01:11:00 2006 @@ -50,15 +50,13 @@ } public void assertDeserialized(Serializable oref, Serializable otest) { + + // common checks + THROWABLE_COMPARATOR.assertDeserialized(oref, otest); + + // class specific checks AccessControlException ref = (AccessControlException) oref; AccessControlException test = (AccessControlException) otest; - String s = ref.getMessage(); - if (s == null) { - assertNull(test.getMessage()); - } else { - assertTrue(s.equals(test.getMessage())); - } - Permission p = ref.getPermission(); if (p == null) { assertNull(test.getPermission()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/PrivilegedActionExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/PrivilegedActionExceptionTest.java?rev=414140&r1=414139&r2=414140&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/PrivilegedActionExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/serialization/PrivilegedActionExceptionTest.java Wed Jun 14 01:11:00 2006 @@ -49,14 +49,18 @@ } public void assertDeserialized(Serializable reference, Serializable otest) { + + // common checks + THROWABLE_COMPARATOR.assertDeserialized(reference, otest); + + // class specific checks PrivilegedActionException ref = (PrivilegedActionException)reference; PrivilegedActionException test = (PrivilegedActionException)otest; if( ref.getException() == null ) { assertNull( test.getException() ); - } - else { - // just be sure we've deserialized the right class - assertSame(ref.getException().getClass(), test.getException().getClass() ); + } else { + THROWABLE_COMPARATOR.assertDeserialized(ref.getException(), test + .getException()); } }