Implement generic version of testUnmarshalling

simplesamlphp · Dec 26, 2023 · 9f4acbe · 9f4acbe
1 parent ff512ea
commit 9f4acbe
Show file tree

Hide file tree

Showing 127 changed files with 9 additions and 1,685 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "psr/http-message": "^2.0",
         "psr/log": "^2.0 || ^3.0",
         "simplesamlphp/assert": "^1.0",
-        "simplesamlphp/xml-common": "^1.12",
+        "simplesamlphp/xml-common": "^1.14",
         "simplesamlphp/xml-security": "^1.6",
         "simplesamlphp/xml-soap": "^1.3"
     },

diff --git a/tests/SAML2/XML/alg/DigestMethodTest.php b/tests/SAML2/XML/alg/DigestMethodTest.php
@@ -67,19 +67,6 @@ public function testMarshalling(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $digestMethod = DigestMethod::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($digestMethod),
-        );
-    }
-
-
     /**
      */
     public function testUnmarshallingMissingAlgorithmThrowsException(): void

diff --git a/tests/SAML2/XML/alg/SigningMethodTest.php b/tests/SAML2/XML/alg/SigningMethodTest.php
@@ -69,19 +69,6 @@ public function testMarshalling(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $signingMethod = SigningMethod::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($signingMethod),
-        );
-    }
-
-
     /**
      */
     public function testMissingAlgorithmThrowsException(): void

diff --git a/tests/SAML2/XML/ecp/RelayStateTest.php b/tests/SAML2/XML/ecp/RelayStateTest.php
@@ -59,19 +59,6 @@ public function testMarshalling(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $relayState = RelayState::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($relayState),
-        );
-    }
-
-
     /**
      */
     public function testUnmarshallingWithMissingMustUnderstandThrowsException(): void

diff --git a/tests/SAML2/XML/ecp/RequestAuthenticatedTest.php b/tests/SAML2/XML/ecp/RequestAuthenticatedTest.php
@@ -54,19 +54,6 @@ public function testMarshalling(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $ra = RequestAuthenticated::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($ra),
-        );
-    }
-
-
     /**
      */
     public function testUnmarshallingWithMissingActorThrowsException(): void

diff --git a/tests/SAML2/XML/ecp/RequestTest.php b/tests/SAML2/XML/ecp/RequestTest.php
@@ -75,19 +75,6 @@ public function testMarshalling(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $request = Request::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($request),
-        );
-    }
-
-
     /**
      */
     public function testUnmarshallingWithMissingMustUnderstandThrowsException(): void

diff --git a/tests/SAML2/XML/ecp/ResponseTest.php b/tests/SAML2/XML/ecp/ResponseTest.php
@@ -85,19 +85,6 @@ public function testInvalidACSThrowsException(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $response = Response::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($response),
-        );
-    }
-
-
     /**
      */
     public function testUnmarshallingWithMissingMustUnderstandThrowsException(): void

diff --git a/tests/SAML2/XML/ecp/SubjectConfirmationTest.php b/tests/SAML2/XML/ecp/SubjectConfirmationTest.php
@@ -82,19 +82,6 @@ public function testMarshalling(): void
     }
 
 
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $subjectConfirmation = SubjectConfirmation::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($subjectConfirmation),
-        );
-    }
-
-
     /**
      */
     public function testUnmarshallingWithMissingMustUnderstandThrowsException(): void

diff --git a/tests/SAML2/XML/emd/RepublishRequestTest.php b/tests/SAML2/XML/emd/RepublishRequestTest.php
@@ -62,18 +62,4 @@ public function testMarshalling(): void
             strval($republishRequest),
         );
     }
-
-
-    /**
-     * Unmarshalling
-     */
-    public function testUnmarshalling(): void
-    {
-        $republishRequest = RepublishRequest::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($republishRequest),
-        );
-    }
 }
diff --git a/tests/SAML2/XML/emd/RepublishTargetTest.php b/tests/SAML2/XML/emd/RepublishTargetTest.php
@@ -63,15 +63,4 @@ public function testMarshallingIncorrectValueThrowsException(): void
 
         new RepublishTarget('http://example.org/');
     }
-
-
-    /**
-     * Unmarshalling
-     */
-    public function testUnmarshalling(): void
-    {
-        $republishTarget = RepublishTarget::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals('http://edugain.org/', $republishTarget->getContent());
-    }
 }
diff --git a/tests/SAML2/XML/idpdisc/DiscoveryResponseTest.php b/tests/SAML2/XML/idpdisc/DiscoveryResponseTest.php
@@ -119,20 +119,6 @@ public function testMarshallingWithResponseLocation(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating a DiscoveryResponse from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $discoResponse = DiscoveryResponse::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($discoResponse),
-        );
-    }
-
-
     /**
      * Test that creating a DiscoveryResponse from XML fails when ResponseLocation is present.
      */

diff --git a/tests/SAML2/XML/init/RequestInitiatorTest.php b/tests/SAML2/XML/init/RequestInitiatorTest.php
@@ -75,20 +75,6 @@ public function testMarshalling(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating a RequestInitiator from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $requestInitiator = RequestInitiator::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($requestInitiator),
-        );
-    }
-
-
     /**
      * Test that creating a RequestInitiator from XML with an invalid Binding fails.
      */

diff --git a/tests/SAML2/XML/md/AdditionalMetadataLocationTest.php b/tests/SAML2/XML/md/AdditionalMetadataLocationTest.php
@@ -75,20 +75,6 @@ public function testMarshallingWithEmptyNamespace(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating an AdditionalMetadataLocation object from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $additionalMetadataLocation = AdditionalMetadataLocation::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($additionalMetadataLocation),
-        );
-    }
-
-
     /**
      * Test that creating an AdditionalMetadataLocation from XML fails if "namespace" is missing.
      */

diff --git a/tests/SAML2/XML/md/AffiliateMemberTest.php b/tests/SAML2/XML/md/AffiliateMemberTest.php
@@ -84,21 +84,4 @@ public function testMarshallingTooLongContentThrowsException(): void
 
         new AffiliateMember(str_pad('https://some.entity.org/id', C::ENTITYID_MAX_LENGTH + 1, 'a'));
     }
-
-
-    // test unmarshalling
-
-
-    /**
-     * Test creating a AffiliateMember from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $affiliateMember = AffiliateMember::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($affiliateMember),
-        );
-    }
 }
diff --git a/tests/SAML2/XML/md/AffiliationDescriptorTest.php b/tests/SAML2/XML/md/AffiliationDescriptorTest.php
@@ -120,20 +120,6 @@ public function testMarshallingWithEmptyMemberList(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating an AffiliationDescriptor from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $affiliationDescriptor = AffiliationDescriptor::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($affiliationDescriptor),
-        );
-    }
-
-
     /**
      * Test failure to create an AffiliationDescriptor from XML when there's no affiliation members.
      */

diff --git a/tests/SAML2/XML/md/ArtifactResolutionServiceTest.php b/tests/SAML2/XML/md/ArtifactResolutionServiceTest.php
@@ -111,20 +111,6 @@ public function testMarshallingWithResponseLocation(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating a ArtifactResolutionService from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $ars = ArtifactResolutionService::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($ars),
-        );
-    }
-
-
     /**
      * Test that creating a ArtifactResolutionService from XML fails when ResponseLocation is present.
      */

diff --git a/tests/SAML2/XML/md/AssertionConsumerServiceTest.php b/tests/SAML2/XML/md/AssertionConsumerServiceTest.php
@@ -94,21 +94,4 @@ public function testMarshalling(): void
             strval($idxep),
         );
     }
-
-
-    // test unmarshalling
-
-
-    /**
-     * Test creating an IndexedEndpointType from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $idxep = AssertionConsumerService::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($idxep),
-        );
-    }
 }
diff --git a/tests/SAML2/XML/md/AttributeAuthorityDescriptorTest.php b/tests/SAML2/XML/md/AttributeAuthorityDescriptorTest.php
@@ -275,20 +275,6 @@ public function testMarshallingWithWrongAttribute(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating an AttributeAuthorityDescriptor from XML
-     */
-    public function testUnmarshalling(): void
-    {
-        $aad = AttributeAuthorityDescriptor::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($aad),
-        );
-    }
-
-
     /**
      * Test that creating an AttributeAuthorityDescriptor without any optional element works.
      */

diff --git a/tests/SAML2/XML/md/AttributeConsumingServiceTest.php b/tests/SAML2/XML/md/AttributeConsumingServiceTest.php
@@ -171,20 +171,6 @@ public function testMarshallingWithEmptyRequestedAttributes(): void
     // test unmarshalling
 
 
-    /**
-     * Test creating an AssertionConsumerService from XML.
-     */
-    public function testUnmarshalling(): void
-    {
-        $acs = AttributeConsumingService::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($acs),
-        );
-    }
-
-
     /**
      * Test that creating an AssertionConsumerService from XML fails if index is missing.
      */

diff --git a/tests/SAML2/XML/md/AttributeProfileTest.php b/tests/SAML2/XML/md/AttributeProfileTest.php
@@ -58,20 +58,4 @@ public function testMarshalling(): void
             strval($attributeProfile),
         );
     }
-
-
-    // unmarshalling
-
-
-    /**
-     */
-    public function testUnmarshalling(): void
-    {
-        $attributeProfile = AttributeProfile::fromXML(self::$xmlRepresentation->documentElement);
-
-        $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
-            strval($attributeProfile),
-        );
-    }
 }