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

[noreply at shibboleth.net]

Author: iay
Date: Fri Mar 15 13:38:11 2013
New Revision: 227

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=227&view=rev
Log:
MDA-81 fix some failing EntitiesDescriptorAssemblerStage tests

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/entitiesDescriptor2.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/entitiesDescriptor2Name.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/entitiesDescriptor2Reversed.xml   (with props)
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java?rev=227&r1=226&r2=227&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java Fri Mar 15 13:38:11 2013
@@ -27,7 +27,6 @@
 import net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage.ItemOrderingStrategy;
 
 import org.testng.annotations.Test;
-import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 /** Unit test for the {@link EntitiesDescriptorAssemblerStage} class. */
@@ -46,9 +45,10 @@
         stage.initialize();
         stage.execute(metadataCollection);
 
-        Document result = metadataCollection.iterator().next().unwrap().getOwnerDocument();
+        Element result = metadataCollection.iterator().next().unwrap();
         
-        assertXmlIdentical(readXmlData("samlMetadata/entitiesDescriptor2.xml"), result);
+        assertXmlIdentical(readTestRelativeXmlData(EntitiesDescriptorAssemblerStage.class,
+                "entitiesDescriptor2.xml"), result);
     }
 
     /**
@@ -65,9 +65,10 @@
         stage.initialize();
         stage.execute(metadataCollection);
 
-        Document result = metadataCollection.iterator().next().unwrap().getOwnerDocument();
+        Element result = metadataCollection.iterator().next().unwrap();
 
-        assertXmlIdentical(readXmlData("samlMetadata/entitiesDescriptor2Name.xml"), result);
+        assertXmlIdentical(readTestRelativeXmlData(EntitiesDescriptorAssemblerStage.class,
+                "entitiesDescriptor2Name.xml"), result);
     }
     
     /**
@@ -97,9 +98,10 @@
         stage.initialize();
         stage.execute(metadataCollection);
 
-        Document result = metadataCollection.iterator().next().unwrap().getOwnerDocument();
+        Element result = metadataCollection.iterator().next().unwrap();
 
-        assertXmlIdentical(readXmlData("samlMetadata/entitiesDescriptor2Reversed.xml"), result);
+        assertXmlIdentical(readTestRelativeXmlData(EntitiesDescriptorAssemblerStage.class,
+                "entitiesDescriptor2Reversed.xml"), result);
     }
 
     protected Collection<DomElementItem> buildMetadataCollection() throws Exception {