assertEquals -> assertEqualsRN

BrianHenryIE · Feb 22, 2024 · 3cb3317 · 3cb3317
1 parent 51a4cdf
commit 3cb3317
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 105 deletions.
diff --git a/tests/Issues/MozartIssue129Test.php b/tests/Issues/MozartIssue129Test.php
@@ -42,7 +42,7 @@ public function test_test($phpString, $expected)
 
         $result = $replacer->replaceNamespace($phpString, $original, $replacement);
 
-        self::assertEquals($expected, $result);
+        self::assertEqualsRN($expected, $result);
     }
 
     public static function pairTestDataProvider()

diff --git a/tests/Issues/MozartIssue48Test.php b/tests/Issues/MozartIssue48Test.php
@@ -49,7 +49,7 @@ public function testRubixTensorBothPathsPersist()
 
         $result = $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         // EigenvalueDecomposition.php
         // assert file exists somewhere in the tree

diff --git a/tests/Issues/MozartIssue89Test.php b/tests/Issues/MozartIssue89Test.php
@@ -98,7 +98,7 @@ public function it_moves_each_file_once_per_namespace()
         }
 
         // On the failing test, an exception was thrown and this line was not reached.
-        self::assertEquals(0, $result, 'Failed running under PHP ' . phpversion());
+        self::assertEqualsRN(0, $result, 'Failed running under PHP ' . phpversion());
 
         self::assertNull($exception);
     }

diff --git a/tests/Issues/MozartIssue90Test.php b/tests/Issues/MozartIssue90Test.php
@@ -54,7 +54,7 @@ public function testLibpdfmergeSucceeds()
 
         $result = $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         // This test would only fail on Windows?
         self::assertDirectoryDoesNotExist($this->testsWorkingDir .'strauss/iio/libmergepdf/vendor/iio/libmergepdf/tcpdi');

diff --git a/tests/Issues/MozartIssue97Test.php b/tests/Issues/MozartIssue97Test.php
@@ -55,6 +55,6 @@ public function testCrewlabsUnsplashSucceeds()
 
         $result = $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
     }
 }
diff --git a/tests/Issues/StraussIssue11Test.php b/tests/Issues/StraussIssue11Test.php
@@ -69,9 +69,9 @@ public function test_migrate_mozart_config()
         $input = $this->createMock(InputInterface::class);
         $straussConfig = new StraussConfig($composer, $input);
 
-        self::assertEquals('src/Mozart/', $straussConfig->getTargetDirectory());
+        self::assertEqualsRN('src/Mozart/', $straussConfig->getTargetDirectory());
 
-        self::assertEquals("MZoo\\MBO_Sandbox\\Dependencies", $straussConfig->getNamespacePrefix());
+        self::assertEqualsRN("MZoo\\MBO_Sandbox\\Dependencies", $straussConfig->getNamespacePrefix());
     }
 
 

diff --git a/tests/Issues/StraussIssue22Test.php b/tests/Issues/StraussIssue22Test.php
@@ -68,7 +68,7 @@ public function test_virtual_package()
 
         $result = $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
     }
 
     /**

diff --git a/tests/Issues/StraussIssue76Test.php b/tests/Issues/StraussIssue76Test.php
@@ -59,6 +59,6 @@ public function test_psr4_array()
 
         $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
     }
 }
diff --git a/tests/Issues/StraussIssue79Test.php b/tests/Issues/StraussIssue79Test.php
@@ -54,7 +54,7 @@ public function test_namespace_keyword_on_opening_line()
 
         $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         $php_string = file_get_contents($this->testsWorkingDir . '/vendor-prefixed/json-mapper/json-mapper/src/JsonMapper.php');
         self::assertStringNotContainsString('throw new \BH_Strauss_Issue79_JsonException(json_last_error_msg()', $php_string);

diff --git a/tests/Issues/StraussIssue80Test.php b/tests/Issues/StraussIssue80Test.php
@@ -52,7 +52,7 @@ public function test_namespace_keyword_on_opening_line()
 
         $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         $php_string = file_get_contents($this->testsWorkingDir . 'vendor-prefixed/league/oauth2-linkedin/src/Provider/LinkedInResourceOwner.php');
         self::assertStringNotContainsString('class Issue_80_LinkedInResourceOwner extends GenericResourceOwner', $php_string);
@@ -122,7 +122,7 @@ public function test_google_api_single_backslash_in_string(): void
 
         $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         $php_string = file_get_contents($this->testsWorkingDir . 'vendor-prefixed/google/apiclient/src/aliases.php');
         self::assertStringNotContainsString("'Company\\Project\\\Google\\\\Client' => 'Prefix_Google_Client',", $php_string);

diff --git a/tests/Issues/StraussIssue83Test.php b/tests/Issues/StraussIssue83Test.php
@@ -54,7 +54,7 @@ public function test_namespace_keyword_on_opening_line()
 
         $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         $php_string = file_get_contents($this->testsWorkingDir . '/vendor-prefixed/aws/aws-sdk-php/src/ClientResolver.php');
 

diff --git a/tests/Issues/StraussIssue8Test.php b/tests/Issues/StraussIssue8Test.php
@@ -50,7 +50,7 @@ public function test_delete_vendor_files()
 
         $result = $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
 
-        self::assertEquals(0, $result);
+        self::assertEqualsRN(0, $result);
 
         self::assertFileDoesNotExist($this->testsWorkingDir. 'vendor/htmlburger/carbon-fields/core/Carbon_Fields.php');
     }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -4,13 +4,13 @@
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-    public static function assertEquals($expected, $actual, string $message = ''): void
+    public static function assertEqualsRN($expected, $actual, string $message = ''): void
     {
         if (is_string($expected) && is_string($actual)) {
             $expected = str_replace("\r\n", "\n", $expected);
             $actual = str_replace("\r\n", "\n", $actual);
         }
 
-        parent::assertEquals($expected, $actual, $message);
+        self::assertEquals($expected, $actual, $message);
     }
 }
diff --git a/tests/Unit/Composer/ComposerPackageTest.php b/tests/Unit/Composer/ComposerPackageTest.php
@@ -21,7 +21,7 @@ public function testParseJson()
 
         $composer = ComposerPackage::fromFile($testFile);
 
-        self::assertEquals('iio/libmergepdf', $composer->getPackageName());
+        self::assertEqualsRN('iio/libmergepdf', $composer->getPackageName());
 
         self::assertIsArray($composer->getAutoload());
 

diff --git a/tests/Unit/Composer/Extra/StraussConfigTest.php b/tests/Unit/Composer/Extra/StraussConfigTest.php
@@ -63,11 +63,11 @@ public function testGetters()
 
         self::assertContains('pimple/pimple', $sut->getPackages());
 
-        self::assertEquals('target_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
+        self::assertEqualsRN( 'target_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
 
-        self::assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
+        self::assertEqualsRN("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
 
-        self::assertEquals('BrianHenryIE_Strauss_', $sut->getClassmapPrefix());
+        self::assertEqualsRN('BrianHenryIE_Strauss_', $sut->getClassmapPrefix());
 
         self::assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
 
@@ -171,7 +171,7 @@ public function testDefaultTargetDir()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals('vendor-prefixed'. DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
+        self::assertEqualsRN( 'vendor-prefixed' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
     }
 
     /**
@@ -202,7 +202,7 @@ public function testDefaultNamespacePrefixFromAutoloaderPsr4()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
+        self::assertEqualsRN("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
     }
 
     /**
@@ -232,7 +232,7 @@ public function testDefaultNamespacePrefixFromAutoloaderPsr0()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
+        self::assertEqualsRN("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
     }
 
     /**
@@ -259,7 +259,7 @@ public function testDefaultNamespacePrefixWithNoAutoloader()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("Brianhenryie\\Strauss_Config_Test", $sut->getNamespacePrefix());
+        self::assertEqualsRN("Brianhenryie\\Strauss_Config_Test", $sut->getNamespacePrefix());
     }
 
     /**
@@ -290,7 +290,7 @@ public function testDefaultClassmapPrefixFromAutoloaderPsr4()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
+        self::assertEqualsRN("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
     }
 
     /**
@@ -321,7 +321,7 @@ public function testDefaultClassmapPrefixFromAutoloaderPsr0()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
+        self::assertEqualsRN("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
     }
 
     /**
@@ -348,7 +348,7 @@ public function testDefaultClassmapPrefixWithNoAutoloader()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("Brianhenryie_Strauss_Config_Test", $sut->getClassmapPrefix());
+        self::assertEqualsRN("Brianhenryie_Strauss_Config_Test", $sut->getClassmapPrefix());
     }
 
     /**
@@ -589,11 +589,11 @@ public function testMapMozartConfig()
 
         self::assertContains('pimple/pimple', $sut->getPackages());
 
-        self::assertEquals('dep_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
+        self::assertEqualsRN( 'dep_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
 
-        self::assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
+        self::assertEqualsRN("My_Mozart_Config", $sut->getNamespacePrefix());
 
-        self::assertEquals('My_Mozart_Config_', $sut->getClassmapPrefix());
+        self::assertEqualsRN('My_Mozart_Config_', $sut->getClassmapPrefix());
 
         self::assertContains('psr/container', $sut->getExcludePackagesFromPrefixing());
 
@@ -630,7 +630,7 @@ public function testNamespacePrefixHasNoSlash()
 
         $sut = new StraussConfig($composer, $this->createMock(InputInterface::class));
 
-        self::assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
+        self::assertEqualsRN("My_Mozart_Config", $sut->getNamespacePrefix());
     }
 
     public function testIncludeModifiedDateDefaultTrue()

diff --git a/tests/Unit/Composer/ProjectComposerPackageTest.php b/tests/Unit/Composer/ProjectComposerPackageTest.php
@@ -43,6 +43,6 @@ public function testGetFlatAutoloadKey()
 
         $expected = ["src","includes","classes","functions.php"];
 
-        self::assertEquals($expected, $phpFiles);
+        self::assertEqualsRN($expected, $phpFiles);
     }
 }
diff --git a/tests/Unit/LicenserTest.php b/tests/Unit/LicenserTest.php
@@ -110,7 +110,7 @@ public function testAppendHeaderCommentInformationNoHeader()
             'proprietary'
         );
 
-        self::assertEquals($expected, $actual);
+        self::assertEqualsRN($expected, $actual);
     }
 
 
@@ -159,7 +159,7 @@ public function testAppendHeaderCommentNoDate()
             'proprietary'
         );
 
-        self::assertEquals($expected, $actual);
+        self::assertEqualsRN($expected, $actual);
     }
 
     /**
@@ -199,7 +199,7 @@ public function testAppendHeaderCommentNoAuthor()
             'proprietary'
         );
 
-        self::assertEquals($expected, $actual);
+        self::assertEqualsRN($expected, $actual);
     }
 
     /**
@@ -254,7 +254,7 @@ public function testWithLicenceAlreadyInHeader(): void
             'GPL-2.0-or-later'
         );
 
-        self::assertEquals($expected, $actual);
+        self::assertEqualsRN($expected, $actual);
     }
 
 
@@ -326,7 +326,7 @@ public function testWithTwoCommentsBeforeFirstCode()
             );
         }
 
-        self::assertEquals($expected, $contents);
+        self::assertEqualsRN($expected, $contents);
     }
 
     /**
@@ -380,7 +380,7 @@ public function testUnusualHeaderCommentStyle()
             );
         }
 
-        self::assertEquals($expected, $contents);
+        self::assertEqualsRN($expected, $contents);
     }
 
     /**
@@ -443,7 +443,7 @@ public function testCommentWithLicenseWord()
             );
         }
 
-        self::assertEquals($expected, $contents);
+        self::assertEqualsRN($expected, $contents);
     }
 
     /**
@@ -524,7 +524,7 @@ public function testIncorrectlyMatching()
             'MIT'
         );
 
-        self::assertEquals($expected, $actual);
+        self::assertEqualsRN($expected, $actual);
     }
 
     /**
@@ -573,6 +573,6 @@ public function testLicenseDetailsOnlyInsertedOncePerFile()
             );
         }
 
-        self::assertEquals($expected, $contents);
+        self::assertEqualsRN($expected, $contents);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ public function test_virtual_package() @@
             $result = $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
-            self::assertEquals(0, $result);
+            self::assertEqualsRN(0, $result);
         }
         /**
@@ Expand Down @@