Fix broken tests for Windows due to mismatching newline characters

Author: tvdijen

lib/Cas/Protocol/Cas20.php

@@ -244,7 +244,7 @@ public function getProxyFailureResponse(string $errorCode, string $explanation):
     private function workAroundForBuggyJasigXmlParser(string $xmlString): string
     {
         // when will people stop hand coding xml handling....?
-        return str_replace('><', '>' . PHP_EOL . '<', str_replace(PHP_EOL, '', $xmlString));
+        return rtrim(str_replace('><', '>' . PHP_EOL . '<', str_replace(PHP_EOL, '', $xmlString)));
     }
 
 

tests/lib/Cas/Protocol/Cas20Test.php

@@ -2,11 +2,29 @@
 
 namespace Simplesamlphp\Casserver;
 
+use DOMDocument;
+use PHPUnit\Framework\TestCase;
+use SAML2\DOMDocumentFactory;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\casserver\Cas\Protocol\Cas20;
+//use SimpleSAML\XML\DOMDocumentFactory;
 
-class Cas20Test extends \PHPUnit\Framework\TestCase
+final class Cas20Test extends TestCase
 {
+    /** @var \DOMDocument */
+    protected DOMDocument $document;
+
+
+    /**
+     */
+    protected function setUp(): void
+    {
+        $this->document = DOMDocumentFactory::fromFile(
+            dirname(dirname(dirname(dirname(__FILE__)))) . '/resources/xml/testAttributeToXmlConversion.xml'
+        );
+    }
+
+
     /**
      */
     public function testAttributeToXmlConversion(): void
@@ -35,22 +53,6 @@ public function testAttributeToXmlConversion(): void
 
         $xml = $casProtocol->getValidateSuccessResponse('myUser');
 
-        $expectedXml = <<<'EOD'
-<?xml version="1.0"?>
-<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
-<cas:authenticationSuccess>
-<cas:user>myUser</cas:user>
-<cas:attributes>
-<cas:lastName>lasty</cas:lastName>
-<cas:valuesAreEscaped>&gt;abc&lt;blah&gt;</cas:valuesAreEscaped>
-<cas:urn_oid_0.9.2342.19200300.100.1.1>someValue</cas:urn_oid_0.9.2342.19200300.100.1.1>
-<cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>CN=Some-Service,OU=Non-Privileged,OU=Groups,DC=exmple,DC=com</cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>
-<cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>CN=Other Servics,OU=Non-Privileged,OU=Groups,DC=example,DC=com</cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>
-</cas:attributes>
-</cas:authenticationSuccess>
-</cas:serviceResponse>
-EOD;
-
-        $this->assertEquals($expectedXml, $xml);
+        $this->assertEquals($this->document->saveXML(), $xml);
     }
 }

tests/resources/xml/testAttributeToXmlConversion.xml

@@ -0,0 +1,12 @@
+<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
+<cas:authenticationSuccess>
+<cas:user>myUser</cas:user>
+<cas:attributes>
+<cas:lastName>lasty</cas:lastName>
+<cas:valuesAreEscaped>&gt;abc&lt;blah&gt;</cas:valuesAreEscaped>
+<cas:urn_oid_0.9.2342.19200300.100.1.1>someValue</cas:urn_oid_0.9.2342.19200300.100.1.1>
+<cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>CN=Some-Service,OU=Non-Privileged,OU=Groups,DC=exmple,DC=com</cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>
+<cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>CN=Other Servics,OU=Non-Privileged,OU=Groups,DC=example,DC=com</cas:urn_oid_1.3.6.1.4.1.34199.1.7.1.5.2>
+</cas:attributes>
+</cas:authenticationSuccess>
+</cas:serviceResponse>

tests/resources/xml/testValidServiceUrl.xml

@@ -0,0 +1,9 @@
+<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
+<cas:authenticationSuccess>
+<cas:user>[email protected]</cas:user>
+<cas:attributes>
+<cas:eduPersonPrincipalName>[email protected]</cas:eduPersonPrincipalName>
+<cas:base64Attributes>false</cas:base64Attributes>
+</cas:attributes>
+</cas:authenticationSuccess>
+</cas:serviceResponse>

tests/www/LoginIntegrationTest.php

@@ -4,8 +4,10 @@
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
+use SAML2\DOMDocumentFactory;
 use SimpleSAML\Logger;
 use SimpleSAML\TestUtils\BuiltInServer;
+//use SimpleSAML\XML\DOMDocumentFactory;
 
 /**
  *
@@ -198,16 +200,11 @@ public function testValidServiceUrl(string $serviceParam, string $ticketParam)
                 CURLOPT_COOKIEFILE => $this->cookies_file
             ]
         );
-        $expectedResponse = '<?xml version="1.0"?>
-<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
-<cas:authenticationSuccess>
-<cas:user>[email protected]</cas:user>
-<cas:attributes>
-<cas:eduPersonPrincipalName>[email protected]</cas:eduPersonPrincipalName>
-<cas:base64Attributes>false</cas:base64Attributes>
-</cas:attributes>
-</cas:authenticationSuccess>
-</cas:serviceResponse>';
+
+        $expectedResponse = DOMDocumentFactory::fromFile(
+            dirname(dirname(__FILE__)) . '/resources/xml/testValidServiceUrl.xml'
+        )->saveXML();
+
         $this->assertEquals(200, $resp['code']);
         $this->assertEquals($expectedResponse, $resp['body']);
     }