Fix unit tests

Author: tvdijen

tests/SAML2/Binding/HTTPArtifactTest.php

@@ -47,26 +47,6 @@ public function testArtifactMissingUrlParamThrowsException(): void
     }
 
 
-    /**
-     * Distinguish the legacy and the new signature-validation APIs:
-     * - Legacy messages: validate(XMLSecurityKey $key)
-     * - New XML model: verify($verifier) returning a verified instance
-     */
-    public function testLegacyVsNewSignatureApiIsDifferent(): void
-    {
-        $legacyClass = \SAML2\Message::class;
-        $newClass = \SimpleSAML\SAML2\XML\samlp\AbstractMessage::class;
-
-        /** @phpstan-ignore-next-line */
-        $this->assertTrue(method_exists($legacyClass, 'validate'));
-        $this->assertFalse(method_exists($legacyClass, 'verify'));
-
-        /** @phpstan-ignore-next-line */
-        $this->assertTrue(method_exists($newClass, 'verify'));
-        $this->assertFalse(method_exists($newClass, 'validate'));
-    }
-
-
     /**
      * @return array<
      *     string,

tests/SAML2/XML/saml/EncryptedAttributeTest.php

@@ -91,12 +91,6 @@ public function testMarshalling(): void
         $encryptedData = $encryptedAttribute->getEncryptedData();
 
         $this->assertEquals(C::XMLENC_ELEMENT, $encryptedData->getType());
-
-        $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement);
-        $this->assertNotFalse($expectedXml);
-        $actualXml = strval($encryptedAttribute);
-
-        $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
     }
 
 

tests/SAML2/XML/saml/SubjectTest.php

@@ -51,6 +51,9 @@ final class SubjectTest extends TestCase
     use SerializableElementTestTrait;
 
 
+    /** @var \Dom\XMLDocument */
+    private static Dom\XMLDocument $xmlRepresentationBaseId;
+
     /** @var \Dom\XMLDocument */
     private static Dom\XMLDocument $subject;
 
@@ -72,6 +75,10 @@ public function setup(): void
             dirname(__FILE__, 4) . '/resources/xml/saml_Subject.xml',
         );
 
+        self::$xmlRepresentationBaseId = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 4) . '/resources/xml/saml_Subject_BaseID.xml',
+        );
+
         self::$subject = DOMDocumentFactory::fromString(
             <<<XML
 <saml:Subject xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"></saml:Subject>
@@ -245,7 +252,7 @@ public function testMarshallingBaseID(): void
                 new SubjectConfirmation(
                     SAMLAnyURIValue::fromString('urn:oasis:names:tc:SAML:2.0:cm:bearer'),
                     new NameID(
-                        value: SAMLStringValue::fromString('SomeNameIDValue'),
+                        value: SAMLStringValue::fromString('SomeOtherNameIDValue'),
                         SPNameQualifier: SAMLStringValue::fromString(
                             'https://sp.example.org/authentication/sp/metadata',
                         ),
@@ -267,7 +274,7 @@ public function testMarshallingBaseID(): void
         SubjectConfirmation::fromXML(self::$subjectConfirmation->documentElement)->toXML($document->documentElement);
 
         $this->assertEquals(
-            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            self::$xmlRepresentationBaseId->saveXML(self::$xmlRepresentationBaseId->documentElement),
             strval($subject),
         );
     }

tests/resources/xml/saml_Subject_BaseID.xml

@@ -0,0 +1,14 @@
+<saml:Subject xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:test="urn:test:something" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+  <saml:BaseID NameQualifier="urn:x-simplesamlphp:namequalifier" SPNameQualifier="urn:x-simplesamlphp:spnamequalifier" xsi:type="ssp:CustomBaseIDType">
+    <saml:Audience>urn:some:audience</saml:Audience>
+  </saml:BaseID>
+  <saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
+    <saml:NameID SPNameQualifier="https://sp.example.org/authentication/sp/metadata" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">SomeOtherNameIDValue</saml:NameID>
+    <saml:SubjectConfirmationData NotBefore="2001-04-19T04:25:21Z" NotOnOrAfter="2009-02-13T23:31:30Z" Recipient="https://simplesamlphp.org/sp/metadata" InResponseTo="SomeRequestID" Address="127.0.0.1" test:attr1="testval1" test:attr2="testval2">
+      <ds:KeyInfo>
+        <ds:KeyName>SomeKey</ds:KeyName>
+      </ds:KeyInfo>
+      <some>Arbitrary Element</some>
+    </saml:SubjectConfirmationData>
+  </saml:SubjectConfirmation>
+</saml:Subject>