Migrate a few tests to serialization trait

Author: tvdijen

tests/XML/ds/CanonicalizationMethodTest.php

@@ -6,6 +6,7 @@
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\Test\XML\SerializableXMLTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\Constants;
 use SimpleSAML\XMLSecurity\XML\ds\CanonicalizationMethod;
@@ -20,14 +21,15 @@
  */
 final class CanonicalizationMethodTest extends TestCase
 {
-    /** @var \DOMDocument */
-    private DOMDocument $document;
+    use SerializableXMLTestTrait;
 
     /**
      */
     protected function setUp(): void
     {
-        $this->document = DOMDocumentFactory::fromFile(
+        $this->testedClass = CanonicalizationMethod::class;
+
+        $this->xmlRepresentation = DOMDocumentFactory::fromFile(
             dirname(dirname(dirname(dirname(__FILE__)))) . '/tests/resources/xml/ds_CanonicalizationMethod.xml'
         );
     }
@@ -41,28 +43,19 @@ public function testMarshalling(): void
 
         $this->assertEquals(Constants::C14N_EXCLUSIVE_WITHOUT_COMMENTS, $CanonicalizationMethod->getAlgorithm());
 
-        $this->assertEquals($this->document->saveXML($this->document->documentElement), strval($CanonicalizationMethod));
+        $this->assertEquals(
+            $this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
+            strval($CanonicalizationMethod)
+        );
     }
 
 
     /**
      */
     public function testUnmarshalling(): void
     {
-        $CanonicalizationMethod = CanonicalizationMethod::fromXML($this->document->documentElement);
+        $CanonicalizationMethod = CanonicalizationMethod::fromXML($this->xmlRepresentation->documentElement);
 
         $this->assertEquals(Constants::C14N_EXCLUSIVE_WITHOUT_COMMENTS, $CanonicalizationMethod->getAlgorithm());
     }
-
-
-    /**
-     * Test serialization / unserialization
-     */
-    public function testSerialization(): void
-    {
-        $this->assertEquals(
-            $this->document->saveXML($this->document->documentElement),
-            strval(unserialize(serialize(CanonicalizationMethod::fromXML($this->document->documentElement))))
-        );
-    }
 }

tests/XML/ds/SignatureMethodTest.php

@@ -6,6 +6,7 @@
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\Test\XML\SerializableXMLTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\Constants;
 use SimpleSAML\XMLSecurity\XML\ds\SignatureMethod;
@@ -20,14 +21,15 @@
  */
 final class SignatureMethodTest extends TestCase
 {
-    /** @var \DOMDocument */
-    private DOMDocument $document;
+    use SerializableXMLTestTrait;
 
     /**
      */
     protected function setUp(): void
     {
-        $this->document = DOMDocumentFactory::fromFile(
+        $this->testedClass = SignatureMethod::class;
+
+        $this->xmlRepresentation = DOMDocumentFactory::fromFile(
             dirname(dirname(dirname(dirname(__FILE__)))) . '/tests/resources/xml/ds_SignatureMethod.xml'
         );
     }
@@ -41,28 +43,19 @@ public function testMarshalling(): void
 
         $this->assertEquals(Constants::SIG_RSA_SHA256, $SignatureMethod->getAlgorithm());
 
-        $this->assertEquals($this->document->saveXML($this->document->documentElement), strval($SignatureMethod));
+        $this->assertEquals(
+            $this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
+            strval($SignatureMethod)
+        );
     }
 
 
     /**
      */
     public function testUnmarshalling(): void
     {
-        $SignatureMethod = SignatureMethod::fromXML($this->document->documentElement);
+        $SignatureMethod = SignatureMethod::fromXML($this->xmlRepresentation->documentElement);
 
         $this->assertEquals(Constants::SIG_RSA_SHA256, $SignatureMethod->getAlgorithm());
     }
-
-
-    /**
-     * Test serialization / unserialization
-     */
-    public function testSerialization(): void
-    {
-        $this->assertEquals(
-            $this->document->saveXML($this->document->documentElement),
-            strval(unserialize(serialize(SignatureMethod::fromXML($this->document->documentElement))))
-        );
-    }
 }

tests/XML/ds/X509DigestTest.php

@@ -6,6 +6,7 @@
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\Test\XML\SerializableXMLTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\Constants;
 use SimpleSAML\XMLSecurity\Key;
@@ -22,8 +23,7 @@
  */
 final class X509DigestTest extends TestCase
 {
-    /** @var \DOMDocument */
-    private DOMDocument $document;
+    use SerializableXMLTestTrait;
 
     /** @var \SimpleSAML\XMLSecurity\Key\X509Certificate */
     private Key\X509Certificate $key;
@@ -36,14 +36,16 @@ final class X509DigestTest extends TestCase
      */
     public function setUp(): void
     {
+        $this->testedClass = X509Digest::class;
+
+        $this->xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(dirname(dirname(dirname(__FILE__)))) . '/tests/resources/xml/ds_X509Digest.xml'
+        );
         $this->key = new Key\X509Certificate(
             PEMCertificatesMock::getPlainPublicKey()
         );
-        $this->digest = base64_encode(hex2bin($this->key->getRawThumbprint(Constants::DIGEST_SHA256)));
 
-        $this->document = DOMDocumentFactory::fromFile(
-            dirname(dirname(dirname(dirname(__FILE__)))) . '/tests/resources/xml/ds_X509Digest.xml'
-        );
+        $this->digest = base64_encode(hex2bin($this->key->getRawThumbprint(Constants::DIGEST_SHA256)));
     }
 
 
@@ -56,29 +58,20 @@ public function testMarshalling(): void
         $this->assertEquals($this->digest, $X509digest->getDigest());
         $this->assertEquals(Constants::DIGEST_SHA256, $X509digest->getAlgorithm());
 
-        $this->assertEquals($this->document->saveXML($this->document->documentElement), strval($X509digest));
+        $this->assertEquals(
+            $this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
+            strval($X509digest)
+        );
     }
 
 
     /**
      */
     public function testUnmarshalling(): void
     {
-        $X509digest = X509Digest::fromXML($this->document->documentElement);
+        $X509digest = X509Digest::fromXML($this->xmlRepresentation->documentElement);
 
         $this->assertEquals($this->digest, $X509digest->getDigest());
         $this->assertEquals(Constants::DIGEST_SHA256, $X509digest->getAlgorithm());
     }
-
-
-    /**
-     * Test serialization / unserialization
-     */
-    public function testSerialization(): void
-    {
-        $this->assertEquals(
-            $this->document->saveXML($this->document->documentElement),
-            strval(unserialize(serialize(X509Digest::fromXML($this->document->documentElement))))
-        );
-    }
 }