Add directory separator agnostic assertPathEquals() to tests (#1021)

RetroAchievements · Jun 6, 2022 · a272408 · a272408
1 parent 3c115e4
commit a272408
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@ nbproject
 .php_cs.cache
 .php-cs-fixer.cache
 .phpunit.result.cache
-test*.php
 
 /public/Badge
 /public/Images

diff --git a/tests/src/ShortcodeTest.php b/tests/src/ShortcodeTest.php
@@ -2,7 +2,6 @@
 
 namespace Test;
 
-use PHPUnit\Framework\TestCase;
 use RA\Shortcode;
 
 final class ShortcodeTest extends TestCase

diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Test;
+
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+class TestCase extends BaseTestCase
+{
+    protected function assertPathEquals(string $expected, string $actual, string $message = ''): void
+    {
+        $this->assertEquals(str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $expected), $actual, $message);
+    }
+}
diff --git a/tests/src/Util/PathTest.php b/tests/src/Util/PathTest.php
@@ -4,14 +4,15 @@
 
 namespace Test\Util;
 
-use PHPUnit\Framework\TestCase;
+use Test\TestCase;
 
 final class PathTest extends TestCase
 {
     public function testPaths()
     {
         $this->assertStringStartsWith(base_path(), public_path());
-        $this->assertEquals(base_path() . '/public/index.php', public_path('index.php'));
-        $this->assertEquals(base_path() . '/public', base_path('public'));
+
+        $this->assertPathEquals(base_path() . '\public\index.php', public_path('index.php'));
+        $this->assertPathEquals(base_path() . '/public', base_path('public'));
     }
 }
diff --git a/tests/src/Util/StringTest.php b/tests/src/Util/StringTest.php
@@ -4,7 +4,7 @@
 
 namespace Test\Util;
 
-use PHPUnit\Framework\TestCase;
+use Test\TestCase;
 
 final class StringTest extends TestCase
 {

diff --git a/tests/src/Util/UrlTest.php b/tests/src/Util/UrlTest.php
@@ -4,7 +4,7 @@
 
 namespace Test\Util;
 
-use PHPUnit\Framework\TestCase;
+use Test\TestCase;
 
 final class UrlTest extends TestCase
 {