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

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Apr  3 12:49:22 2012
New Revision: 215

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=215&view=rev
Log:
Fix up some unit tests
Correct name of unit test

Added:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java   (contents, props changed)
      - copied, changed from r210, trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullCacheDurationStageTest.java
Removed:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullCacheDurationStageTest.java
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DomFilesystemSourceTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DomFilesystemSourceTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DomFilesystemSourceTest.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DomFilesystemSourceTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DomFilesystemSourceTest.java Tue Apr  3 12:49:22 2012
@@ -129,6 +129,7 @@
         source.setId("test");
         source.setParserPool(parserPool);
         source.setSource(sourceFile);
+        source.setNoSourceFilesAnError(true);
 
         try {
             source.initialize();

Copied: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java (from r210, trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullCacheDurationStageTest.java)
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java?p2=trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java&p1=trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullCacheDurationStageTest.java&r1=210&r2=215&rev=215&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullCacheDurationStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java Tue Apr  3 12:49:22 2012
@@ -31,7 +31,7 @@
 import org.w3c.dom.Element;
 
 /** Unit test for {@link PullUpCacheDurationStage}. */
-public class PullCacheDurationStageTest extends BaseDomTest {
+public class PullUpCacheDurationStageTest extends BaseDomTest {
 
     /** Test that the shortest duration (1 hour) is pulled up to the EntitiesDescriptor. */
     @Test

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java Tue Apr  3 12:49:22 2012
@@ -76,10 +76,10 @@
         for (Item<?> metadata : metadataCollection) {
             if ("one".equals(metadata.unwrap())) {
                 md1CloneMatch = true;
-                Assert.assertFalse(metadata != md1);
+                Assert.assertFalse(metadata == md1);
             } else if ("two".equals(metadata.unwrap())) {
                 md2CloneMatch = true;
-                Assert.assertFalse(metadata != md2);
+                Assert.assertFalse(metadata == md2);
             }
             // two ComponentInfo: one from the pipeline, one from the static inject stage, one from the join stage
             Assert.assertEquals(metadata.getItemMetadata().values().size(), 3);

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java Tue Apr  3 12:49:22 2012
@@ -109,17 +109,6 @@
         } catch (ComponentInitializationException e) {

[... 17 lines stripped ...]