Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 48136 invoked from network); 10 Aug 2006 08:34:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Aug 2006 08:34:54 -0000 Received: (qmail 50266 invoked by uid 500); 10 Aug 2006 08:34:53 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 50164 invoked by uid 500); 10 Aug 2006 08:34:53 -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 50153 invoked by uid 99); 10 Aug 2006 08:34:53 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 01:34:53 -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; Thu, 10 Aug 2006 01:34:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 739C01A981A; Thu, 10 Aug 2006 01:34:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r430310 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test: api/java/org/apache/harmony/luni/tests/java/util/ resources/serialization/java/util/ resources/serialization/org/apache/harmony/luni/tests/java/util/ Date: Thu, 10 Aug 2006 08:34:31 -0000 To: harmony-commits@incubator.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060810083432.739C01A981A@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: Thu Aug 10 01:34:26 2006 New Revision: 430310 URL: http://svn.apache.org/viewvc?rev=430310&view=rev Log: Refactoring MissingFormatWidthExceptionTest serialization tests to use new framework Added: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.golden.ser - copied unchanged from r430209, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/java/util/MissingFormatWidthException.ser Removed: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/java/util/MissingFormatWidthException.ser Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java?rev=430310&r1=430309&r2=430310&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java Thu Aug 10 01:34:26 2006 @@ -14,15 +14,15 @@ */ package org.apache.harmony.luni.tests.java.util; +import java.io.Serializable; import java.util.MissingFormatWidthException; -import tests.util.SerializationTester; - import junit.framework.TestCase; -public class MissingFormatWidthExceptionTest extends TestCase { +import org.apache.harmony.testframework.serialization.SerializationTest; +import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert; - private static final String SERIALIZATION_FILE_NAME = "serialization/java/util/MissingFormatWidthException.ser"; +public class MissingFormatWidthExceptionTest extends TestCase { /** * @tests java.util.MissingFormatWidthException#MissingFormatWidthException(String) @@ -58,33 +58,37 @@ } - /** - * @tests serialization/deserilazation. - */ - public void test_serialization() throws Exception { - String s = "MYTESTSTRING"; - MissingFormatWidthException srcMissingFormatWidthException = new MissingFormatWidthException( - s); - MissingFormatWidthException destMissingFormatWidthException = (MissingFormatWidthException) SerializationTester - .getDeserilizedObject(srcMissingFormatWidthException); - assertEquals(srcMissingFormatWidthException.getFormatSpecifier(), - destMissingFormatWidthException.getFormatSpecifier()); - - } - - /** - * @tests serialization/deserilazation compatibility with RI. - */ - public void test_serializationCompatibility() throws Exception { - String s = "MYTESTSTRING"; - MissingFormatWidthException srcMissingFormatWidthException = new MissingFormatWidthException( - s); - MissingFormatWidthException destMissingFormatWidthException = (MissingFormatWidthException) SerializationTester - .readObject(srcMissingFormatWidthException, - SERIALIZATION_FILE_NAME); - assertEquals(srcMissingFormatWidthException.getFormatSpecifier(), - destMissingFormatWidthException.getFormatSpecifier()); - - } - + // comparator for comparing UnknownFormatConversionException objects + private static final SerializableAssert exComparator = new SerializableAssert() { + public void assertDeserialized(Serializable initial, + Serializable deserialized) { + + SerializationTest.THROWABLE_COMPARATOR.assertDeserialized(initial, + deserialized); + + MissingFormatWidthException initEx = (MissingFormatWidthException) initial; + MissingFormatWidthException desrEx = (MissingFormatWidthException) deserialized; + + assertEquals("FormatSpecifier", initEx.getFormatSpecifier(), desrEx + .getFormatSpecifier()); + } + }; + + /** + * @tests serialization/deserialization. + */ + public void testSerializationSelf() throws Exception { + + SerializationTest.verifySelf(new MissingFormatWidthException( + "MYTESTSTRING"), exComparator); + } + + /** + * @tests serialization/deserialization compatibility with RI. + */ + public void testSerializationCompatibility() throws Exception { + + SerializationTest.verifyGolden(this, new MissingFormatWidthException( + "MYTESTSTRING"), exComparator); + } }