From d17c724f2323d16a38c2cbd4cdbb271f0febb1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Reker=20=E2=9A=A1=EF=B8=8F?= Date: Wed, 22 Jun 2022 14:20:08 +0200 Subject: [PATCH] Php unit dedicate assert (#10881) Co-authored-by: Jordi Boggiano --- .../Test/Autoload/AutoloadGeneratorTest.php | 2 +- tests/Composer/Test/IO/NullIOTest.php | 2 +- .../Repository/CompositeRepositoryTest.php | 2 +- tests/Composer/Test/Util/FilesystemTest.php | 32 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php index f74f2d6b0..9129b9e68 100644 --- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php +++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php @@ -1820,7 +1820,7 @@ EOF; $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', true, '_1'); if (null === $expectedFixture) { - $this->assertFalse(file_exists($this->vendorDir . '/composer/platform_check.php')); + $this->assertFileDoesNotExist($this->vendorDir . '/composer/platform_check.php'); $this->assertStringNotContainsString("require __DIR__ . '/platform_check.php';", (string) file_get_contents($this->vendorDir.'/composer/autoload_real.php')); } else { $this->assertFileContentEquals(__DIR__ . '/Fixtures/platform/' . $expectedFixture . '.php', $this->vendorDir . '/composer/platform_check.php'); diff --git a/tests/Composer/Test/IO/NullIOTest.php b/tests/Composer/Test/IO/NullIOTest.php index d43c891fe..c9e02af37 100644 --- a/tests/Composer/Test/IO/NullIOTest.php +++ b/tests/Composer/Test/IO/NullIOTest.php @@ -42,7 +42,7 @@ class NullIOTest extends TestCase { $io = new NullIO(); - $this->assertTrue(is_array($io->getAuthentications())); // @phpstan-ignore-line + $this->assertIsArray($io->getAuthentications()); // @phpstan-ignore-line $this->assertEmpty($io->getAuthentications()); $this->assertEquals(array('username' => null, 'password' => null), $io->getAuthentication('foo')); } diff --git a/tests/Composer/Test/Repository/CompositeRepositoryTest.php b/tests/Composer/Test/Repository/CompositeRepositoryTest.php index ca123a3b3..949a9234e 100644 --- a/tests/Composer/Test/Repository/CompositeRepositoryTest.php +++ b/tests/Composer/Test/Repository/CompositeRepositoryTest.php @@ -123,7 +123,7 @@ class CompositeRepositoryTest extends TestCase $repo = new CompositeRepository(array($arrayRepoOne, $arrayRepoTwo)); - $this->assertEquals(2, count($repo), "Should return '2' for count(\$repo)"); + $this->assertCount(2, $repo, "Should return '2' for count(\$repo)"); } /** diff --git a/tests/Composer/Test/Util/FilesystemTest.php b/tests/Composer/Test/Util/FilesystemTest.php index abb5d1b48..dc34eccae 100644 --- a/tests/Composer/Test/Util/FilesystemTest.php +++ b/tests/Composer/Test/Util/FilesystemTest.php @@ -324,9 +324,9 @@ class FilesystemTest extends TestCase $this->assertTrue($fs->isJunction($junction . '/../junction'), $junction . '/../junction: is a junction'); // Remove junction - $this->assertTrue(is_dir($junction), $junction . ' is a directory'); + $this->assertDirectoryExists($junction, $junction . ' is a directory'); $this->assertTrue($fs->removeJunction($junction), $junction . ' has been removed'); - $this->assertFalse(is_dir($junction), $junction . ' is not a directory'); + $this->assertDirectoryDoesNotExist($junction, $junction . ' is not a directory'); } public function testCopy(): void @@ -342,16 +342,16 @@ class FilesystemTest extends TestCase $result1 = $fs->copy($this->workingDir . '/foo', $this->workingDir . '/foop'); $this->assertTrue($result1, 'Copying directory failed.'); - $this->assertTrue(is_dir($this->workingDir . '/foop'), 'Not a directory: ' . $this->workingDir . '/foop'); - $this->assertTrue(is_dir($this->workingDir . '/foop/bar'), 'Not a directory: ' . $this->workingDir . '/foop/bar'); - $this->assertTrue(is_dir($this->workingDir . '/foop/baz'), 'Not a directory: ' . $this->workingDir . '/foop/baz'); - $this->assertTrue(is_file($this->workingDir . '/foop/foo.file'), 'Not a file: ' . $this->workingDir . '/foop/foo.file'); - $this->assertTrue(is_file($this->workingDir . '/foop/bar/foobar.file'), 'Not a file: ' . $this->workingDir . '/foop/bar/foobar.file'); - $this->assertTrue(is_file($this->workingDir . '/foop/baz/foobaz.file'), 'Not a file: ' . $this->workingDir . '/foop/baz/foobaz.file'); + $this->assertDirectoryExists($this->workingDir . '/foop', 'Not a directory: ' . $this->workingDir . '/foop'); + $this->assertDirectoryExists($this->workingDir . '/foop/bar', 'Not a directory: ' . $this->workingDir . '/foop/bar'); + $this->assertDirectoryExists($this->workingDir . '/foop/baz', 'Not a directory: ' . $this->workingDir . '/foop/baz'); + $this->assertFileExists($this->workingDir . '/foop/foo.file', 'Not a file: ' . $this->workingDir . '/foop/foo.file'); + $this->assertFileExists($this->workingDir . '/foop/bar/foobar.file', 'Not a file: ' . $this->workingDir . '/foop/bar/foobar.file'); + $this->assertFileExists($this->workingDir . '/foop/baz/foobaz.file', 'Not a file: ' . $this->workingDir . '/foop/baz/foobaz.file'); $result2 = $fs->copy($this->testFile, $this->workingDir . '/testfile.file'); $this->assertTrue($result2); - $this->assertTrue(is_file($this->workingDir . '/testfile.file')); + $this->assertFileExists($this->workingDir . '/testfile.file'); } public function testCopyThenRemove(): void @@ -366,14 +366,14 @@ class FilesystemTest extends TestCase $fs = new Filesystem(); $fs->copyThenRemove($this->testFile, $this->workingDir . '/testfile.file'); - $this->assertFalse(is_file($this->testFile), 'Still a file: ' . $this->testFile); + $this->assertFileDoesNotExist($this->testFile, 'Still a file: ' . $this->testFile); $fs->copyThenRemove($this->workingDir . '/foo', $this->workingDir . '/foop'); - $this->assertFalse(is_file($this->workingDir . '/foo/baz/foobaz.file'), 'Still a file: ' . $this->workingDir . '/foo/baz/foobaz.file'); - $this->assertFalse(is_file($this->workingDir . '/foo/bar/foobar.file'), 'Still a file: ' . $this->workingDir . '/foo/bar/foobar.file'); - $this->assertFalse(is_file($this->workingDir . '/foo/foo.file'), 'Still a file: ' . $this->workingDir . '/foo/foo.file'); - $this->assertFalse(is_dir($this->workingDir . '/foo/baz'), 'Still a directory: ' . $this->workingDir . '/foo/baz'); - $this->assertFalse(is_dir($this->workingDir . '/foo/bar'), 'Still a directory: ' . $this->workingDir . '/foo/bar'); - $this->assertFalse(is_dir($this->workingDir . '/foo'), 'Still a directory: ' . $this->workingDir . '/foo'); + $this->assertFileDoesNotExist($this->workingDir . '/foo/baz/foobaz.file', 'Still a file: ' . $this->workingDir . '/foo/baz/foobaz.file'); + $this->assertFileDoesNotExist($this->workingDir . '/foo/bar/foobar.file', 'Still a file: ' . $this->workingDir . '/foo/bar/foobar.file'); + $this->assertFileDoesNotExist($this->workingDir . '/foo/foo.file', 'Still a file: ' . $this->workingDir . '/foo/foo.file'); + $this->assertDirectoryDoesNotExist($this->workingDir . '/foo/baz', 'Still a directory: ' . $this->workingDir . '/foo/baz'); + $this->assertDirectoryDoesNotExist($this->workingDir . '/foo/bar', 'Still a directory: ' . $this->workingDir . '/foo/bar'); + $this->assertDirectoryDoesNotExist($this->workingDir . '/foo', 'Still a directory: ' . $this->workingDir . '/foo'); } }