[Tests] Improved quality of tests

Co-Authored-By: Paweł Niedzielski <Steveb-p@users.noreply.github.com>
ibexa · Dec 22, 2022 · 4a3690f · 4a3690f
1 parent ec2feae
commit 4a3690f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/tests/lib/IO/Flysystem/Adapter/LocalSiteAccessAwareFilesystemAdapterTest.php b/tests/lib/IO/Flysystem/Adapter/LocalSiteAccessAwareFilesystemAdapterTest.php
@@ -47,6 +47,7 @@ final class LocalSiteAccessAwareFilesystemAdapterTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         self::$fileSystem = new Filesystem(new LocalFilesystemAdapter(self::FLYSYSTEM_TEST_DIR));
+        self::$fileSystem->deleteDirectory('.');
         self::$fileSystem->createDirectory('.');
     }
 
@@ -112,7 +113,7 @@ public function testWriteStream($sourceRelativeFilePath): void
      */
     public function testFileSize(string $relativeFilePath): void
     {
-        self::assertEquals(
+        self::assertSame(
             filesize($this->buildAbsolutePath($relativeFilePath)),
             $this->adapter->fileSize($relativeFilePath)->fileSize()
         );
@@ -135,7 +136,7 @@ public function testFileExists(string $relativeFilePath): void
      */
     public function testLastModified(string $relativeFilePath): void
     {
-        self::assertEquals(
+        self::assertSame(
             filemtime($this->buildAbsolutePath($relativeFilePath)),
             $this->adapter->lastModified($relativeFilePath)->lastModified()
         );

diff --git a/tests/lib/IO/Flysystem/PathPrefixer/BaseSiteAccessAwarePathPrefixerTest.php b/tests/lib/IO/Flysystem/PathPrefixer/BaseSiteAccessAwarePathPrefixerTest.php
@@ -18,12 +18,24 @@ abstract class BaseSiteAccessAwarePathPrefixerTest extends TestCase
 {
     abstract protected function getPrefixer(): PathPrefixerInterface;
 
+    /**
+     * @return iterable<string, array{string, string}>
+     */
     abstract public function getDataForTestPrefixPath(): iterable;
 
+    /**
+     * @return iterable<string, array{string, string}>
+     */
     abstract public function getDataForTestPrefixDirectoryPath(): iterable;
 
+    /**
+     * @return iterable<string, array{string, string}>
+     */
     abstract public function getDataForTestStripPrefixPath(): iterable;
 
+    /**
+     * @return iterable<string, array{string, string}>
+     */
     public function getDataForTestStripDirectoryPrefix(): iterable
     {
         // treat file names as directories
@@ -33,7 +45,7 @@ public function getDataForTestStripDirectoryPrefix(): iterable
     /**
      * @dataProvider getDataForTestPrefixPath
      */
-    public function testPrefixPath(string $expectedPrefixedPath, string $path): void
+    final public function testPrefixPath(string $expectedPrefixedPath, string $path): void
     {
         self::assertSame(
             $expectedPrefixedPath,
@@ -44,7 +56,7 @@ public function testPrefixPath(string $expectedPrefixedPath, string $path): void
     /**
      * @dataProvider getDataForTestPrefixDirectoryPath
      */
-    public function testPrefixDirectoryPath(string $expectedPrefixedPath, string $path): void
+    final public function testPrefixDirectoryPath(string $expectedPrefixedPath, string $path): void
     {
         self::assertSame(
             $expectedPrefixedPath,
@@ -55,7 +67,7 @@ public function testPrefixDirectoryPath(string $expectedPrefixedPath, string $pa
     /**
      * @dataProvider getDataForTestStripPrefixPath
      */
-    public function testStripPrefix(string $expectedStrippedPath, string $path): void
+    final public function testStripPrefix(string $expectedStrippedPath, string $path): void
     {
         self::assertSame(
             $expectedStrippedPath,
@@ -66,7 +78,7 @@ public function testStripPrefix(string $expectedStrippedPath, string $path): voi
     /**
      * @dataProvider getDataForTestStripDirectoryPrefix
      */
-    public function testStripDirectoryPrefix(string $expectedStrippedPath, string $path): void
+    final public function testStripDirectoryPrefix(string $expectedStrippedPath, string $path): void
     {
         self::assertSame(
             $expectedStrippedPath,

diff --git a/tests/lib/IO/Flysystem/VisibilityConverter/BaseVisibilityConverterTest.php b/tests/lib/IO/Flysystem/VisibilityConverter/BaseVisibilityConverterTest.php
@@ -38,7 +38,7 @@ abstract public function getDataForTestInverseForFile(): iterable;
 
     abstract public function getDataForTestInverseForDirectory(): iterable;
 
-    protected function setUp(): void
+    final protected function setUp(): void
     {
         $this->innerVisibilityConverterMock = $this->createMock(FlysystemVisibilityConverter::class);
         $this->innerVisibilityConverterMock
@@ -56,7 +56,7 @@ protected function setUp(): void
     /**
      * @dataProvider getDataForTestForFile
      */
-    public function testForFile(string $visibility, int $expectedVisibilityFlags): void
+    final public function testForFile(string $visibility, int $expectedVisibilityFlags): void
     {
         self::assertSame(
             $expectedVisibilityFlags,
@@ -67,7 +67,7 @@ public function testForFile(string $visibility, int $expectedVisibilityFlags): v
     /**
      * @dataProvider getDataForTestForDirectory
      */
-    public function testForDirectory(string $visibility, int $expectedVisibilityFlags): void
+    final public function testForDirectory(string $visibility, int $expectedVisibilityFlags): void
     {
         self::assertSame(
             $expectedVisibilityFlags,
@@ -78,7 +78,7 @@ public function testForDirectory(string $visibility, int $expectedVisibilityFlag
     /**
      * @dataProvider getDataForTestInverseForFile
      */
-    public function testInverseForFile(int $fileVisibilityFlags, string $expectedVisibility): void
+    final public function testInverseForFile(int $fileVisibilityFlags, string $expectedVisibility): void
     {
         self::assertSame(
             $expectedVisibility,
@@ -89,7 +89,7 @@ public function testInverseForFile(int $fileVisibilityFlags, string $expectedVis
     /**
      * @dataProvider getDataForTestInverseForDirectory
      */
-    public function testInverseForDirectory(
+    final public function testInverseForDirectory(
         int $directoryVisibilityFlags,
         string $expectedVisibility
     ): void {
@@ -99,7 +99,7 @@ public function testInverseForDirectory(
         );
     }
 
-    public function testDefaultForDirectories(): void
+    final public function testDefaultForDirectories(): void
     {
         $this->innerVisibilityConverterMock
             ->expects(self::once())