Skip to content

Commit d2f1d3c

Browse files
tvdijentvdijen
committed
Fix ds marshalling-tests
1 parent 5b5bfb3 commit d2f1d3c

8 files changed

Lines changed: 70 additions & 41 deletions

‎tests/XML/ds/CanonicalizationMethodTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ protected function setUp(): void
3939
*/
4040
public function testMarshalling(): void
4141
{
42-
$CanonicalizationMethod = new CanonicalizationMethod(Constants::C14N_EXCLUSIVE_WITHOUT_COMMENTS);
42+
$canonicalizationMethod = new CanonicalizationMethod(Constants::C14N_EXCLUSIVE_WITHOUT_COMMENTS);
4343

44-
$this->assertEquals(Constants::C14N_EXCLUSIVE_WITHOUT_COMMENTS, $CanonicalizationMethod->getAlgorithm());
44+
$canonicalizationMethodElement = $canonicalizationMethod->toXML();
45+
$this->assertEquals(Constants::C14N_EXCLUSIVE_WITHOUT_COMMENTS, $canonicalizationMethodElement->getAttribute('Algorithm'));
4546

4647
$this->assertEquals(
4748
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
48-
strval($CanonicalizationMethod)
49+
strval($canonicalizationMethod)
4950
);
5051
}
5152

‎tests/XML/ds/KeyInfoTest.php‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use SimpleSAML\Test\XML\SerializableXMLTestTrait;
1111
use SimpleSAML\XML\DOMDocumentFactory;
1212
use SimpleSAML\XML\Chunk;
13+
use SimpleSAML\XML\Utils as XMLUtils;
1314
use SimpleSAML\XMLSecurity\XML\ds\KeyName;
1415
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1516
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
@@ -94,15 +95,20 @@ public function testMarshalling(): void
9495
'abc123'
9596
);
9697

97-
$info = $keyInfo->getInfo();
98-
$this->assertCount(4, $info);
99-
$this->assertInstanceOf(KeyName::class, $info[0]);
100-
$this->assertInstanceOf(X509Data::class, $info[1]);
101-
$this->assertInstanceOf(Chunk::class, $info[2]);
102-
$this->assertInstanceOf(Chunk::class, $info[3]);
103-
$this->assertEquals('abc123', $keyInfo->getId());
98+
$keyInfoElement = $keyInfo->toXML();
99+
$this->assertCount(4, $keyInfoElement->childNodes);
100+
$this->assertEquals('abc123', $keyInfoElement->getAttribute('Id'));
101+
102+
$keyNameElement = XMLUtils::xpQuery($keyInfoElement, './ds:KeyName');
103+
$this->assertCount(1, $keyNameElement);
104104

105-
$this->assertEquals($this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement), strval($keyInfo));
105+
$x509DataElement = XMLUtils::xpQuery($keyInfoElement, './ds:X509Data');
106+
$this->assertCount(1, $x509DataElement);
107+
108+
$this->assertEquals(
109+
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
110+
strval($keyInfo)
111+
);
106112
}
107113

108114

‎tests/XML/ds/KeyNameTest.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@ public function testMarshalling(): void
4141
{
4242
$keyName = new KeyName('testkey');
4343

44-
$this->assertEquals('testkey', $keyName->getName());
44+
$keyNameElement = $keyName->toXML();
45+
$this->assertEquals('testkey', $keyNameElement->textContent);
4546

46-
$this->assertEquals($this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement), strval($keyName));
47+
$this->assertEquals(
48+
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
49+
strval($keyName)
50+
);
4751
}
4852

4953

‎tests/XML/ds/SignatureMethodTest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ protected function setUp(): void
3939
*/
4040
public function testMarshalling(): void
4141
{
42-
$SignatureMethod = new SignatureMethod(Constants::SIG_RSA_SHA256);
42+
$signatureMethod = new SignatureMethod(Constants::SIG_RSA_SHA256);
4343

44-
$this->assertEquals(Constants::SIG_RSA_SHA256, $SignatureMethod->getAlgorithm());
44+
$signatureMethodElement = $signatureMethod->toXML();
45+
$this->assertEquals(Constants::SIG_RSA_SHA256, $signatureMethodElement->getAttribute('Algorithm'));
4546

4647
$this->assertEquals(
4748
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
48-
strval($SignatureMethod)
49+
strval($signatureMethod)
4950
);
5051
}
5152

@@ -54,8 +55,8 @@ public function testMarshalling(): void
5455
*/
5556
public function testUnmarshalling(): void
5657
{
57-
$SignatureMethod = SignatureMethod::fromXML($this->xmlRepresentation->documentElement);
58+
$signatureMethod = SignatureMethod::fromXML($this->xmlRepresentation->documentElement);
5859

59-
$this->assertEquals(Constants::SIG_RSA_SHA256, $SignatureMethod->getAlgorithm());
60+
$this->assertEquals(Constants::SIG_RSA_SHA256, $signatureMethod->getAlgorithm());
6061
}
6162
}

‎tests/XML/ds/X509CertificateTest.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,23 @@ public function setUp(): void
6363
*/
6464
public function testMarshalling(): void
6565
{
66-
$X509cert = new X509Certificate($this->certificate);
66+
$x509cert = new X509Certificate($this->certificate);
6767

68-
$this->assertEquals($this->certificate, $X509cert->getCertificate());
68+
$x509certElement = $x509cert->toXML();
69+
$this->assertEquals($this->certificate, $x509certElement->textContent);
6970

70-
$this->assertEquals($this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement), strval($X509cert));
71+
$this->assertEquals(
72+
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
73+
strval($x509cert)
74+
);
7175
}
7276

7377

7478
/**
7579
*/
7680
public function testUnmarshalling(): void
7781
{
78-
$X509cert = X509Certificate::fromXML($this->xmlRepresentation->documentElement);
79-
$this->assertEquals($this->certificate, $X509cert->getCertificate());
82+
$x509cert = X509Certificate::fromXML($this->xmlRepresentation->documentElement);
83+
$this->assertEquals($this->certificate, $x509cert->getCertificate());
8084
}
8185
}

‎tests/XML/ds/X509DataTest.php‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use SimpleSAML\Test\XML\SerializableXMLTestTrait;
1111
use SimpleSAML\XML\Chunk;
1212
use SimpleSAML\XML\DOMDocumentFactory;
13+
use SimpleSAML\XML\Utils as XMLUtils;
1314
use SimpleSAML\XMLSecurity\Constants;
1415
use SimpleSAML\XMLSecurity\Key;
1516
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
@@ -90,7 +91,7 @@ public function setUp(): void
9091
*/
9192
public function testMarshalling(): void
9293
{
93-
$X509data = new X509Data(
94+
$x509data = new X509Data(
9495
[
9596
new Chunk(
9697
DOMDocumentFactory::fromString('<ds:X509UnknownTag>somevalue</ds:X509UnknownTag>')->documentElement
@@ -102,25 +103,35 @@ public function testMarshalling(): void
102103
]
103104
);
104105

105-
$data = $X509data->getData();
106+
$x509dataElement = $x509data->toXML();
107+
$this->assertCount(5, $x509dataElement->childNodes);
106108

107-
$this->assertInstanceOf(Chunk::class, $data[0]);
108-
$this->assertInstanceOf(X509Certificate::class, $data[1]);
109-
$this->assertInstanceOf(X509Digest::class, $data[2]);
110-
$this->assertInstanceOf(X509SubjectName::class, $data[3]);
111-
$this->assertInstanceOf(Chunk::class, $data[4]);
109+
$x509Certificate = XMLUtils::xpQuery($x509dataElement, './ds:X509Certificate');
110+
$this->assertCount(1, $x509Certificate);
111+
$this->assertEquals($this->certificate, $x509Certificate[0]->textContent);
112+
113+
$x509Digest = XMLUtils::xpQuery($x509dataElement, './ds:X509Digest');
114+
$this->assertCount(1, $x509Digest);
115+
$this->assertEquals($this->digest, $x509Digest[0]->textContent);
112116

113-
$this->assertEquals($this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement), strval($X509data));
117+
$x509SubjectName = XMLUtils::xpQuery($x509dataElement, './ds:X509SubjectName');
118+
$this->assertCount(1, $x509SubjectName);
119+
$this->assertEquals($this->certData['name'], $x509SubjectName[0]->textContent);
120+
121+
$this->assertEquals(
122+
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
123+
strval($x509data)
124+
);
114125
}
115126

116127

117128
/**
118129
*/
119130
public function testUnmarshalling(): void
120131
{
121-
$X509data = X509Data::fromXML($this->xmlRepresentation->documentElement);
132+
$x509data = X509Data::fromXML($this->xmlRepresentation->documentElement);
122133

123-
$data = $X509data->getData();
134+
$data = $x509data->getData();
124135
$this->assertInstanceOf(Chunk::class, $data[0]);
125136
$this->assertInstanceOf(X509Certificate::class, $data[1]);
126137
$this->assertInstanceOf(X509Digest::class, $data[2]);

‎tests/XML/ds/X509DigestTest.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ public function setUp(): void
5353
*/
5454
public function testMarshalling(): void
5555
{
56-
$X509digest = new X509Digest($this->digest, Constants::DIGEST_SHA256);
56+
$x509digest = new X509Digest($this->digest, Constants::DIGEST_SHA256);
5757

58-
$this->assertEquals($this->digest, $X509digest->getDigest());
59-
$this->assertEquals(Constants::DIGEST_SHA256, $X509digest->getAlgorithm());
58+
$x509digestElement = $x509digest->toXML();
59+
$this->assertEquals($this->digest, $x509digestElement->textContent);
60+
$this->assertEquals(Constants::DIGEST_SHA256, $x509digestElement->getAttribute('Algorithm'));
6061

6162
$this->assertEquals(
6263
$this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
63-
strval($X509digest)
64+
strval($x509digest)
6465
);
6566
}
6667

@@ -69,9 +70,9 @@ public function testMarshalling(): void
6970
*/
7071
public function testUnmarshalling(): void
7172
{
72-
$X509digest = X509Digest::fromXML($this->xmlRepresentation->documentElement);
73+
$x509digest = X509Digest::fromXML($this->xmlRepresentation->documentElement);
7374

74-
$this->assertEquals($this->digest, $X509digest->getDigest());
75-
$this->assertEquals(Constants::DIGEST_SHA256, $X509digest->getAlgorithm());
75+
$this->assertEquals($this->digest, $x509digest->getDigest());
76+
$this->assertEquals(Constants::DIGEST_SHA256, $x509digest->getAlgorithm());
7677
}
7778
}

‎tests/XML/ds/X509SubjectNameTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public function testMarshalling(): void
4141
{
4242
$subjectName = new X509SubjectName('some name');
4343

44-
$this->assertEquals('some name', $subjectName->getName());
44+
$subjectNameElement = $subjectName->toXML();
45+
$this->assertEquals('some name', $subjectNameElement->textContent);
4546

4647
$this->assertEquals($this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement), strval($subjectName));
4748
}

0 commit comments

Comments
 (0)