From 64c1bc3bb0466682ed85b4de224378c191e04c63 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Fri, 9 Apr 2004 15:17:11 +0000 Subject: [PATCH] Disable sub map serializable tests git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131647 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/AbstractTestObject.java | 4 ++-- .../bidimap/TestUnmodifiableSortedBidiMap.java | 14 +++++++++----- .../collections/map/AbstractTestSortedMap.java | 6 +++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/test/org/apache/commons/collections/AbstractTestObject.java b/src/test/org/apache/commons/collections/AbstractTestObject.java index f1cd71993..9f3bc2581 100644 --- a/src/test/org/apache/commons/collections/AbstractTestObject.java +++ b/src/test/org/apache/commons/collections/AbstractTestObject.java @@ -37,7 +37,7 @@ import java.io.Serializable; * you may still use this base set of cases. Simply override the * test case (method) your {@link Object} fails. * - * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:35 $ + * @version $Revision: 1.5 $ $Date: 2004/04/09 15:17:11 $ * * @author Rodney Waldhoff * @author Stephen Colebourne @@ -144,7 +144,7 @@ public abstract class AbstractTestObject extends BulkTest { * @throws IOException * @throws ClassNotFoundException */ - public void testSimpleSerialization() throws IOException, ClassNotFoundException { + public void testSimpleSerialization() throws Exception { Object o = makeObject(); if (o instanceof Serializable) { byte[] objekt = writeExternalFormToBytes((Serializable) o); diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java index 002c0965e..a0c106dde 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java @@ -28,7 +28,7 @@ import org.apache.commons.collections.SortedBidiMap; /** * JUnit tests. * - * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:39 $ + * @version $Revision: 1.4 $ $Date: 2004/04/09 15:15:18 $ * * @author Stephen Colebourne */ @@ -46,6 +46,7 @@ public class TestUnmodifiableSortedBidiMap extends AbstractTestSortedBidiMap { super(testName); } + //----------------------------------------------------------------------- public BidiMap makeEmptyBidiMap() { return UnmodifiableSortedBidiMap.decorate(new DualTreeBidiMap()); } @@ -66,13 +67,16 @@ public class TestUnmodifiableSortedBidiMap extends AbstractTestSortedBidiMap { return new TreeMap(); } - /** - * Override to prevent infinite recursion of tests. - */ + public boolean isSubMapViewsSerializable() { + // TreeMap sub map views have a bug in deserialization. + return false; + } public String[] ignoredTests() { + // Override to prevent infinite recursion of tests. return new String[] {"TestUnmodifiableSortedBidiMap.bulkTestInverseMap.bulkTestInverseMap"}; } - + + //----------------------------------------------------------------------- public boolean isAllowNullKey() { return false; } diff --git a/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java index b1c00e935..0abd7e342 100644 --- a/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java +++ b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java @@ -28,7 +28,7 @@ import org.apache.commons.collections.BulkTest; /** * Abstract test class for {@link java.util.SortedMap} methods and contracts. * - * @version $Revision: 1.7 $ $Date: 2004/04/09 15:04:29 $ + * @version $Revision: 1.8 $ $Date: 2004/04/09 15:17:11 $ * * @author Stephen Colebourne */ @@ -161,6 +161,10 @@ public abstract class AbstractTestSortedMap extends AbstractTestMap { public boolean supportsFullCollections() { return false; } + public void testSimpleSerialization() throws Exception { + if (main.isSubMapViewsSerializable() == false) return; + super.testSimpleSerialization(); + } public void testSerializeDeserializeThenCompare() throws Exception { if (main.isSubMapViewsSerializable() == false) return; super.testSerializeDeserializeThenCompare();