[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata: dom/ElementFor...

[noreply at shibboleth.net]

Author: iay
Date: Tue Oct 22 17:18:35 2013
New Revision: 286

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=286&view=rev
Log:
MDA-113 make generic types more consistent in unit tests

Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java?rev=286&r1=285&r2=286&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java Tue Oct 22 17:18:35 2013
@@ -191,8 +191,8 @@
         stage.setLineSeparator(null);
         stage.initialize();
 
-        ArrayList<Item<Element>> itemCollection =
-                Lists.newArrayList((Item<Element>)new DOMElementItem(unformattedElement));
+        ArrayList<Item<Element>> itemCollection = new ArrayList<>();
+        itemCollection.add(new DOMElementItem(unformattedElement));
         stage.execute(itemCollection);
         Assert.assertEquals(itemCollection.size(), 1);
 
@@ -210,8 +210,8 @@
         stage.setIndentSize(4);
         stage.initialize();
 
-        ArrayList<Item<Element>> itemCollection =
-                Lists.newArrayList((Item<Element>)new DOMElementItem(unformattedElement));
+        ArrayList<Item<Element>> itemCollection = new ArrayList<>();
+        itemCollection.add(new DOMElementItem(unformattedElement));
         stage.execute(itemCollection);
         Assert.assertEquals(itemCollection.size(), 1);
 

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java?rev=286&r1=285&r2=286&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java Tue Oct 22 17:18:35 2013
@@ -35,19 +35,19 @@
 public class ItemMetadataFilterStageTest {
 
     /** Unmodifiable, prototype, collection of metadata elements. */
-    private Collection<Item<?>> metadataCollectionPrototype;
+    private Collection<Item<String>> metadataCollectionPrototype;
 
     /** Metadata element which contains no {@link net.shibboleth.metadata.StatusMetadata} items. */
-    private Item<?> md1;
+    private Item<String> md1;
 
     /** Metadata element which contains a {@link WarningStatus} item. */
-    private Item<?> md2;
+    private Item<String> md2;
 
     /** Metadata element which contains no {@link net.shibboleth.metadata.StatusMetadata} items. */
-    private Item<?> md3;
+    private Item<String> md3;
 
     /** Metadata element which contains a {@link WarningStatus} and {@link ErrorStatus} item. */
-    private Item<?> md4;
+    private Item<String> md4;
 
     /** Unit test setup, initializes {@link #metadataCollectionPrototype} and metadata elements. */
     @BeforeTest
@@ -73,9 +73,9 @@
     /** Tests a {@link ItemMetadataFilterStage} without any filter requirements. */
     @Test
     public void testNoFilterRequirements() throws Exception {
-        final Collection<Item<?>> metadataCollection = new ArrayList<>(metadataCollectionPrototype);
+        final Collection<Item<String>> metadataCollection = new ArrayList<>(metadataCollectionPrototype);
 
-        ItemMetadataFilterStage stage = new ItemMetadataFilterStage();
+        ItemMetadataFilterStage<String> stage = new ItemMetadataFilterStage<>();
         stage.setId("test");
         stage.initialize();
         stage.execute(metadataCollection);
@@ -90,12 +90,12 @@
     /** Tests a {@link ItemMetadataFilterStage} containing one filter requirement. */
     @Test
     public void testSingleFilterRequirement() throws Exception {
-        final Collection<Item<?>> metadataCollection = new ArrayList<>(metadataCollectionPrototype);

[... 638 lines stripped ...]