Skip to content

Commit 9ffc8a5

Browse files
Slamdunktvdijen
Slamdunk
and
tvdijen
authored
Mangle base64 test assets with spaces and new-lines like production ones (#20)
* Mangle test assets with spaces and new-lines like production ones * Standardize base64 XML content for test assertions * Nitpick Co-authored-by: Tim van Dijen <tvdijen@gmail.com>
1 parent 107e7da commit 9ffc8a5

9 files changed

Lines changed: 57 additions & 8 deletions

‎tests/XML/XMLDumper.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace SimpleSAML\XMLSecurity\Test\XML;
6+
7+
use DOMDocument;
8+
9+
/**
10+
* Class \SimpleSAML\XMLSecurity\Test\XML\XMLDumper
11+
*
12+
* @package simplesamlphp/xml-security
13+
*/
14+
final class XMLDumper
15+
{
16+
public static function dumpDOMDocumentXMLWithBase64Content(DOMDocument $document): string
17+
{
18+
$dump = $document->saveXML($document->documentElement);
19+
return preg_replace('/ *[\\r\\n] */', '', $dump);
20+
}
21+
}

‎tests/XML/ds/DigestValueTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use SimpleSAML\Assert\AssertionFailedException;
1010
use SimpleSAML\Test\XML\SerializableXMLTestTrait;
1111
use SimpleSAML\XML\DOMDocumentFactory;
12+
use SimpleSAML\XMLSecurity\Test\XML\XMLDumper;
1213
use SimpleSAML\XMLSecurity\XML\ds\DigestValue;
1314
use SimpleSAML\XMLSecurity\XMLSecurityDSig;
1415

@@ -43,7 +44,7 @@ public function testMarshalling(): void
4344
$digestValue = new DigestValue('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=');
4445

4546
$this->assertEquals(
46-
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
47+
XMLDumper::dumpDOMDocumentXMLWithBase64Content($this->xmlRepresentation),
4748
strval($digestValue)
4849
);
4950
}

‎tests/XML/ds/SignatureValueTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use SimpleSAML\Assert\AssertionFailedException;
99
use SimpleSAML\Test\XML\SerializableXMLTestTrait;
1010
use SimpleSAML\XML\DOMDocumentFactory;
11+
use SimpleSAML\XMLSecurity\Test\XML\XMLDumper;
1112
use SimpleSAML\XMLSecurity\XML\ds\SignatureValue;
1213

1314
/**
@@ -42,7 +43,7 @@ protected function setUp(): void
4243
public function testMarshalling(): void
4344
{
4445
$this->assertEquals(
45-
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
46+
XMLDumper::dumpDOMDocumentXMLWithBase64Content($this->xmlRepresentation),
4647
strval(new SignatureValue(
4748
'j14G9v6AnsOiEJYgkTg864DG3e/KLqoGpuybPGSGblVTn7ST6M/BsvP7YiVZjLqJEuEvWmf2mW4DPb+pbArzzDcsLWEtNveMrw+F' .
4849
'kWehDUQV9oe20iepo+W46wmj7zB/eWL+Z8MrGvlycoTndJU6CVwHTLsB+dq2FDa7JV4pAPjMY32JZTbiwKhzqw3nEi/eVrujJE4Y' .

‎tests/XML/ds/X509CertificateTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use SimpleSAML\Assert\AssertionFailedException;
1010
use SimpleSAML\Test\XML\SerializableXMLTestTrait;
1111
use SimpleSAML\XML\DOMDocumentFactory;
12+
use SimpleSAML\XMLSecurity\Test\XML\XMLDumper;
1213
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1314
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1415

@@ -67,7 +68,7 @@ public function testMarshalling(): void
6768
$x509cert = new X509Certificate($this->certificate);
6869

6970
$this->assertEquals(
70-
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
71+
XMLDumper::dumpDOMDocumentXMLWithBase64Content($this->xmlRepresentation),
7172
strval($x509cert)
7273
);
7374
}

‎tests/XML/ds/X509DigestTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use SimpleSAML\XML\DOMDocumentFactory;
1111
use SimpleSAML\XMLSecurity\Constants;
1212
use SimpleSAML\XMLSecurity\Key;
13+
use SimpleSAML\XMLSecurity\Test\XML\XMLDumper;
1314
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1415
use SimpleSAML\XMLSecurity\XML\ds\X509Digest;
1516

@@ -56,7 +57,7 @@ public function testMarshalling(): void
5657
$x509digest = new X509Digest($this->digest, Constants::DIGEST_SHA256);
5758

5859
$this->assertEquals(
59-
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
60+
XMLDumper::dumpDOMDocumentXMLWithBase64Content($this->xmlRepresentation),
6061
strval($x509digest)
6162
);
6263
}

‎tests/resources/xml/ds_DigestValue.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
<ds:DigestValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</ds:DigestValue>
1+
<ds:DigestValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
2+
/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=
3+
</ds:DigestValue>

‎tests/resources/xml/ds_SignatureValue.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
<ds:SignatureValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">j14G9v6AnsOiEJYgkTg864DG3e/KLqoGpuybPGSGblVTn7ST6M/BsvP7YiVZjLqJEuEvWmf2mW4DPb+pbArzzDcsLWEtNveMrw+FkWehDUQV9oe20iepo+W46wmj7zB/eWL+Z8MrGvlycoTndJU6CVwHTLsB+dq2FDa7JV4pAPjMY32JZTbiwKhzqw3nEi/eVrujJE4YRrlW28D+rXhITfoUAGGvsqPzcwGzp02lnMe2SmXADY1u9lbVjOhUrJpgvWfn9YuiCR+wjvaGMwIwzfJxChLJZOBV+1ad1CyNTiu6qAblxZ4F8cWlMWJ7f0KkWvtw66HOf2VNR6Qan2Ra7Q==</ds:SignatureValue>
1+
<ds:SignatureValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
2+
j14G9v6AnsOiEJYgkTg864DG3e/KLqoGpuybPGSGblVTn7ST6M/BsvP7YiVZjLqJEuEvWmf2mW4D
3+
Pb+pbArzzDcsLWEtNveMrw+FkWehDUQV9oe20iepo+W46wmj7zB/eWL+Z8MrGvlycoTndJU6CVwH
4+
TLsB+dq2FDa7JV4pAPjMY32JZTbiwKhzqw3nEi/eVrujJE4YRrlW28D+rXhITfoUAGGvsqPzcwGz
5+
p02lnMe2SmXADY1u9lbVjOhUrJpgvWfn9YuiCR+wjvaGMwIwzfJxChLJZOBV+1ad1CyNTiu6qAbl
6+
xZ4F8cWlMWJ7f0KkWvtw66HOf2VNR6Qan2Ra7Q==
7+
</ds:SignatureValue>

‎tests/resources/xml/ds_X509Certificate.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
<ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICxDCCAi2gAwIBAgIUCJ8EYI/BrvQnHt9QFGfdqgaxDmowDQYJKoZIhvcNAQELBQAwczElMCMGA1UEAwwcc2VsZnNpZ25lZC5zaW1wbGVzYW1scGhwLm9yZzEZMBcGA1UECgwQU2ltcGxlU0FNTHBocCBIUTERMA8GA1UEBwwISG9ub2x1bHUxDzANBgNVBAgMBkhhd2FpaTELMAkGA1UEBhMCVVMwIBcNMjAwNjIzMjEwMTEyWhgPMjEyMDA1MzAyMTAxMTJaMHMxJTAjBgNVBAMMHHNlbGZzaWduZWQuc2ltcGxlc2FtbHBocC5vcmcxGTAXBgNVBAoMEFNpbXBsZVNBTUxwaHAgSFExETAPBgNVBAcMCEhvbm9sdWx1MQ8wDQYDVQQIDAZIYXdhaWkxCzAJBgNVBAYTAlVTMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZ3ztmRqrJm6zSJ2jNUjbxdlX3WLadthHvDkdfQDWuFIUjMkCfO8+OWYdFP4cQWKBVnWyO+/LXFl9p9fwcSJmhmkgz5blUw0cjv8jccHw+yfVnGxGCK2Up/Si4HE/WStgjTKr3ivAqyc0Kc/97EoIXmb96SEEb4Lat9xt6mFSbWQIDAQABo1MwUTAdBgNVHQ4EFgQUHhB/tFwoDOT8V1nLi5XY4CJgTTQwHwYDVR0jBBgwFoAUHhB/tFwoDOT8V1nLi5XY4CJgTTQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQBVqkGuiwyYMx0FH3j/qirZ2nKrjUU+p0ganzEA7kVZ97RivW5SFLHkRjcfqDXVyqOzmr4iR8rfxI2rUjYQI1SsKacPhitiArMk2IQ+uvxZ5eNtU2yFzW4arQ+a2ttlZI/GF9nLvgUNFIUwaDc+PQD2rOk+ACklbAS3jkf+L3DpQg==</ds:X509Certificate>
1+
<ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
2+
MIICxDCCAi2gAwIBAgIUCJ8EYI/BrvQnHt9QFGfdqgaxDmowDQYJKoZIhvcNAQELBQAwczElMCMG
3+
A1UEAwwcc2VsZnNpZ25lZC5zaW1wbGVzYW1scGhwLm9yZzEZMBcGA1UECgwQU2ltcGxlU0FNTHBo
4+
cCBIUTERMA8GA1UEBwwISG9ub2x1bHUxDzANBgNVBAgMBkhhd2FpaTELMAkGA1UEBhMCVVMwIBcN
5+
MjAwNjIzMjEwMTEyWhgPMjEyMDA1MzAyMTAxMTJaMHMxJTAjBgNVBAMMHHNlbGZzaWduZWQuc2lt
6+
cGxlc2FtbHBocC5vcmcxGTAXBgNVBAoMEFNpbXBsZVNBTUxwaHAgSFExETAPBgNVBAcMCEhvbm9s
7+
dWx1MQ8wDQYDVQQIDAZIYXdhaWkxCzAJBgNVBAYTAlVTMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
8+
iQKBgQDZ3ztmRqrJm6zSJ2jNUjbxdlX3WLadthHvDkdfQDWuFIUjMkCfO8+OWYdFP4cQWKBVnWyO
9+
+/LXFl9p9fwcSJmhmkgz5blUw0cjv8jccHw+yfVnGxGCK2Up/Si4HE/WStgjTKr3ivAqyc0Kc/97
10+
EoIXmb96SEEb4Lat9xt6mFSbWQIDAQABo1MwUTAdBgNVHQ4EFgQUHhB/tFwoDOT8V1nLi5XY4CJg
11+
TTQwHwYDVR0jBBgwFoAUHhB/tFwoDOT8V1nLi5XY4CJgTTQwDwYDVR0TAQH/BAUwAwEB/zANBgkq
12+
hkiG9w0BAQsFAAOBgQBVqkGuiwyYMx0FH3j/qirZ2nKrjUU+p0ganzEA7kVZ97RivW5SFLHkRjcf
13+
qDXVyqOzmr4iR8rfxI2rUjYQI1SsKacPhitiArMk2IQ+uvxZ5eNtU2yFzW4arQ+a2ttlZI/GF9nL
14+
vgUNFIUwaDc+PQD2rOk+ACklbAS3jkf+L3DpQg==
15+
</ds:X509Certificate>

‎tests/resources/xml/ds_X509Digest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
<ds:X509Digest xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256">NllYUDA9XclmzMa84vOTdA3aunzwxBIqYjktnHBPcso=</ds:X509Digest>
1+
<ds:X509Digest xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256">
2+
NllYUDA9XclmzMa84vOTdA3aunzwxBIqYjktnHBPcso=
3+
</ds:X509Digest>

0 commit comments

Comments
 (0)