From 79f3006917b71d30cb604c4d8a527f0a55b108b0 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Sat, 19 Jun 2021 13:21:53 +0200 Subject: [PATCH] Stop using `DIRECTORY_SEPARATOR` in the tests In the affected cases, we are already using forward slashes, and hence can use them all the time. --- tests/ParserTest.php | 4 ++-- tests/RuleSet/LenientParsingTest.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/ParserTest.php b/tests/ParserTest.php index bf40f410..42f876af 100644 --- a/tests/ParserTest.php +++ b/tests/ParserTest.php @@ -37,7 +37,7 @@ public function testFiles() // or a future test of a as-of-now missing feature continue; } - $oParser = new Parser(file_get_contents($sDirectory . DIRECTORY_SEPARATOR . $sFileName)); + $oParser = new Parser(file_get_contents($sDirectory . '/' . $sFileName)); try { $this->assertNotEquals('', $oParser->parse()->render()); } catch (\Exception $e) { @@ -807,7 +807,7 @@ public function testMissingPropertyValueLenient() */ private function parsedStructureForFile($sFileName, $oSettings = null) { - $sFile = __DIR__ . '/fixtures' . DIRECTORY_SEPARATOR . "$sFileName.css"; + $sFile = __DIR__ . "/fixtures/$sFileName.css"; $oParser = new Parser(file_get_contents($sFile), $oSettings); return $oParser->parse(); } diff --git a/tests/RuleSet/LenientParsingTest.php b/tests/RuleSet/LenientParsingTest.php index 01f204f8..7b51521f 100644 --- a/tests/RuleSet/LenientParsingTest.php +++ b/tests/RuleSet/LenientParsingTest.php @@ -13,14 +13,14 @@ class LenientParsingTest extends \PHPUnit\Framework\TestCase */ public function testFaultToleranceOff() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css"; + $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict()); $oParser->parse(); } public function testFaultToleranceOn() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css"; + $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true)); $oResult = $oParser->parse(); $this->assertSame( @@ -35,7 +35,7 @@ public function testFaultToleranceOn() */ public function testEndToken() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css"; + $sFile = __DIR__ . '/../fixtures/-end-token.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict()); $oParser->parse(); } @@ -45,14 +45,14 @@ public function testEndToken() */ public function testEndToken2() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css"; + $sFile = __DIR__ . '/../fixtures/-end-token-2.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict()); $oParser->parse(); } public function testEndTokenPositive() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css"; + $sFile = __DIR__ . '/../fixtures/-end-token.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true)); $oResult = $oParser->parse(); $this->assertSame("", $oResult->render()); @@ -60,7 +60,7 @@ public function testEndTokenPositive() public function testEndToken2Positive() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css"; + $sFile = __DIR__ . '/../fixtures/-end-token-2.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true)); $oResult = $oParser->parse(); $this->assertSame( @@ -72,7 +72,7 @@ public function testEndToken2Positive() public function testLocaleTrap() { setlocale(LC_ALL, "pt_PT", "no"); - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css"; + $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css'; $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true)); $oResult = $oParser->parse(); $this->assertSame( @@ -84,7 +84,7 @@ public function testLocaleTrap() public function testCaseInsensitivity() { - $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "case-insensitivity.css"; + $sFile = __DIR__ . '/../fixtures/case-insensitivity.css'; $oParser = new Parser(file_get_contents($sFile)); $oResult = $oParser->parse();