Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A41B10ADF for ; Mon, 11 Nov 2013 16:49:06 +0000 (UTC) Received: (qmail 76410 invoked by uid 500); 11 Nov 2013 16:49:04 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 76339 invoked by uid 500); 11 Nov 2013 16:49:04 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 76308 invoked by uid 99); 11 Nov 2013 16:49:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Nov 2013 16:49:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Nov 2013 16:48:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DD553238889B; Mon, 11 Nov 2013 16:48:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1540768 - in /commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4: ./ bidimap/ collection/ list/ map/ queue/ set/ Date: Mon, 11 Nov 2013 16:48:36 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131111164836.DD553238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tn Date: Mon Nov 11 16:48:35 2013 New Revision: 1540768 URL: http://svn.apache.org/r1540768 Log: Added tests for the unmodifiable factory methods. Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BagUtilsTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BagUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BagUtilsTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BagUtilsTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BagUtilsTest.java Mon Nov 11 16:48:35 2013 @@ -76,6 +76,8 @@ public class BagUtilsTest extends BulkTe } catch (final IllegalArgumentException ex) { // expected } + + assertSame("UnmodifiableBag shall not be decorated", bag, BagUtils.unmodifiableBag(bag)); } public void testPredicatedBag() { @@ -127,7 +129,7 @@ public class BagUtilsTest extends BulkTe } public void testUnmodifiableSortedBag() { - Bag bag = BagUtils.unmodifiableSortedBag(new TreeBag()); + SortedBag bag = BagUtils.unmodifiableSortedBag(new TreeBag()); assertTrue("Returned object should be an UnmodifiableSortedBag.", bag instanceof UnmodifiableSortedBag); try { @@ -136,6 +138,8 @@ public class BagUtilsTest extends BulkTe } catch (final IllegalArgumentException ex) { // expected } + + assertSame("UnmodifiableSortedBag shall not be decorated", bag, BagUtils.unmodifiableSortedBag(bag)); } public void testPredicatedSortedBag() { Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java Mon Nov 11 16:48:35 2013 @@ -58,6 +58,8 @@ public class QueueUtilsTest extends Bulk } catch (final IllegalArgumentException ex) { // expected } + + assertSame("UnmodifiableQueue shall not be decorated", queue, QueueUtils.unmodifiableQueue(queue)); } public void testPredicatedQueue() { Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java Mon Nov 11 16:48:35 2013 @@ -20,8 +20,10 @@ import java.util.HashMap; import java.util.Map; import junit.framework.Test; + import org.apache.commons.collections4.BidiMap; import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.Unmodifiable; /** * JUnit tests. @@ -78,4 +80,21 @@ public class UnmodifiableBidiMapTest map = makeFullMap(); + assertSame(map, UnmodifiableBidiMap.unmodifiableBidiMap(map)); + + try { + UnmodifiableBidiMap.unmodifiableBidiMap(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + } Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java Mon Nov 11 16:48:35 2013 @@ -20,9 +20,10 @@ import java.util.Map; import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections4.BidiMap; + import org.apache.commons.collections4.BulkTest; import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.Unmodifiable; /** * JUnit tests. @@ -45,7 +46,7 @@ public class UnmodifiableOrderedBidiMapT } @Override - public BidiMap makeFullMap() { + public OrderedBidiMap makeFullMap() { final OrderedBidiMap bidi = new TreeBidiMap(); addSampleMappings(bidi); return UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(bidi); @@ -89,4 +90,20 @@ public class UnmodifiableOrderedBidiMapT return false; } + //----------------------------------------------------------------------- + + public void testUnmodifiable() { + assertTrue(makeObject() instanceof Unmodifiable); + assertTrue(makeFullMap() instanceof Unmodifiable); + } + + public void testDecorateFactory() { + final OrderedBidiMap map = makeFullMap(); + assertSame(map, UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(map)); + + try { + UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } } Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java Mon Nov 11 16:48:35 2013 @@ -23,6 +23,7 @@ import junit.framework.Test; import org.apache.commons.collections4.BulkTest; import org.apache.commons.collections4.SortedBidiMap; +import org.apache.commons.collections4.Unmodifiable; /** * JUnit tests. @@ -95,4 +96,21 @@ public class UnmodifiableSortedBidiMapTe return false; } + //----------------------------------------------------------------------- + + public void testUnmodifiable() { + assertTrue(makeObject() instanceof Unmodifiable); + assertTrue(makeFullMap() instanceof Unmodifiable); + } + + public void testDecorateFactory() { + final SortedBidiMap map = makeFullMap(); + assertSame(map, UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(map)); + + try { + UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + } Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java Mon Nov 11 16:48:35 2013 @@ -21,6 +21,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.apache.commons.collections4.Unmodifiable; + /** * Extension of {@link AbstractCollectionTest} for exercising the * {@link UnmodifiableCollection} implementation. @@ -69,6 +71,25 @@ public class UnmodifiableCollectionTest< return false; } + //----------------------------------------------------------------------- + + public void testUnmodifiable() { + assertTrue(makeObject() instanceof Unmodifiable); + assertTrue(makeFullCollection() instanceof Unmodifiable); + } + + public void testDecorateFactory() { + final Collection coll = makeFullCollection(); + assertSame(coll, UnmodifiableCollection.unmodifiableCollection(coll)); + + try { + UnmodifiableCollection.unmodifiableCollection(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + + //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "4"; Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java Mon Nov 11 16:48:35 2013 @@ -82,6 +82,16 @@ public class UnmodifiableListTest ext verifyUnmodifiable(list.subList(0, 2)); } + public void testDecorateFactory() { + final List list = makeObject(); + assertSame(list, UnmodifiableList.unmodifiableList(list)); + + try { + UnmodifiableList.unmodifiableList(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + @SuppressWarnings("unchecked") protected void verifyUnmodifiable(final List list) { try { @@ -161,6 +171,8 @@ public class UnmodifiableListTest ext } } + //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "4"; Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java Mon Nov 11 16:48:35 2013 @@ -65,6 +65,7 @@ public class UnmodifiableMapTest e } //----------------------------------------------------------------------- + public void testUnmodifiable() { assertTrue(makeObject() instanceof Unmodifiable); assertTrue(makeFullMap() instanceof Unmodifiable); @@ -80,6 +81,8 @@ public class UnmodifiableMapTest e } catch (final IllegalArgumentException ex) {} } + //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "4"; Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java Mon Nov 11 16:48:35 2013 @@ -64,6 +64,7 @@ public class UnmodifiableOrderedMapTest< } //----------------------------------------------------------------------- + public void testUnmodifiable() { assertTrue(makeObject() instanceof Unmodifiable); assertTrue(makeFullMap() instanceof Unmodifiable); @@ -79,6 +80,8 @@ public class UnmodifiableOrderedMapTest< } catch (final IllegalArgumentException ex) {} } + //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "4"; Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java Mon Nov 11 16:48:35 2013 @@ -64,6 +64,7 @@ public class UnmodifiableSortedMapTest ex } @Override + public Queue getCollection() { + return super.getCollection(); + } + + @Override public boolean isAddSupported() { return false; } @@ -76,6 +82,7 @@ public class UnmodifiableQueueTest ex return false; } + //----------------------------------------------------------------------- public void testQueueRemove() { resetEmpty(); try { @@ -84,6 +91,23 @@ public class UnmodifiableQueueTest ex } catch (final UnsupportedOperationException ex) {} } + public void testUnmodifiable() { + assertTrue(makeObject() instanceof Unmodifiable); + assertTrue(makeFullCollection() instanceof Unmodifiable); + } + + public void testDecorateFactory() { + final Queue queue = makeFullCollection(); + assertSame(queue, UnmodifiableQueue.unmodifiableQueue(queue)); + + try { + UnmodifiableQueue.unmodifiableQueue(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + + //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "4"; @@ -96,11 +120,4 @@ public class UnmodifiableQueueTest ex // writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj"); // } - /** - * {@inheritDoc} - */ - @Override - public Queue getCollection() { - return super.getCollection(); - } } Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java Mon Nov 11 16:48:35 2013 @@ -23,6 +23,7 @@ import java.util.Set; import junit.framework.Test; import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.Unmodifiable; /** * Extension of {@link AbstractSetTest} for exercising the @@ -64,6 +65,25 @@ public class UnmodifiableSetTest exte return false; } + //----------------------------------------------------------------------- + + public void testUnmodifiable() { + assertTrue(makeObject() instanceof Unmodifiable); + assertTrue(makeFullCollection() instanceof Unmodifiable); + } + + public void testDecorateFactory() { + final Set set = makeFullCollection(); + assertSame(set, UnmodifiableSet.unmodifiableSet(set)); + + try { + UnmodifiableSet.unmodifiableSet(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + + //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "4"; Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java?rev=1540768&r1=1540767&r2=1540768&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java Mon Nov 11 16:48:35 2013 @@ -89,6 +89,16 @@ public class UnmodifiableSortedSetTest set = makeFullCollection(); + assertSame(set, UnmodifiableSortedSet.unmodifiableSortedSet(set)); + + try { + UnmodifiableSortedSet.unmodifiableSortedSet(null); + fail(); + } catch (final IllegalArgumentException ex) {} + } + /** * Verifies that a set is not modifiable */ @@ -138,6 +148,8 @@ public class UnmodifiableSortedSetTest