fix test for Windows

issue #78
Ne-Lexa · May 16, 2021 · 8954da9 · 8954da9
1 parent c352399
commit 8954da9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 48 deletions.
diff --git a/tests/Polyfill/PhpUnit9CompatTrait.php b/tests/Polyfill/PhpUnit9CompatTrait.php
@@ -35,10 +35,13 @@ public static function assertFileDoesNotExist(string $filename, string $message
     /**
      * Asserts that a directory does not exist.
      *
+     * @noinspection PhpDeprecationInspection
+     *
+     * @param string $directory
+     * @param string $message
+     *
      * @throws ExpectationFailedException
      * @throws InvalidArgumentException
-     *
-     * @noinspection PhpDeprecationInspection
      */
     public static function assertDirectoryDoesNotExist(string $directory, string $message = ''): void
     {

diff --git a/tests/SymlinkTest.php b/tests/SymlinkTest.php
@@ -23,9 +23,7 @@ final class SymlinkTest extends ZipTestCase
      */
     public function testSymlink($allowSymlink)
     {
-        if (self::skipTestForWindows()) {
-            return;
-        }
+        self::skipTestForWindows();
 
         if (!is_dir($this->outputDirname)) {
             self::assertTrue(mkdir($this->outputDirname, 0755, true));

diff --git a/tests/ZipFileTest.php b/tests/ZipFileTest.php
@@ -43,13 +43,8 @@ public function testOpenFileCantExists()
      */
     public function testOpenFileCantOpen()
     {
-        if (static::skipTestForWindows()) {
-            return;
-        }
-
-        if (static::skipTestForRootUser()) {
-            return;
-        }
+        static::skipTestForWindows();
+        static::skipTestForRootUser();
 
         $this->expectException(ZipException::class);
         $this->expectExceptionMessage('can\'t open');
@@ -186,9 +181,9 @@ public function testOpenFromStreamInvalidResourceType()
     public function testOpenFromStreamInvalidResourceType2()
     {
         $this->expectException(InvalidArgumentException::class);
-        $exceptionMessage = PHP_VERSION_ID < 80000 ?
-            'Invalid resource type' :
-            'Stream must be a resource';
+        $exceptionMessage = \PHP_VERSION_ID < 80000
+            ? 'Invalid resource type'
+            : 'Stream must be a resource';
         $this->expectExceptionMessage($exceptionMessage);
 
         $zipFile = new ZipFile();
@@ -1194,13 +1189,12 @@ public function testExtractFail2()
      */
     public function testExtractFail3()
     {
+        static::skipTestForWindows();
+        static::skipTestForRootUser();
+
         $this->expectException(ZipException::class);
         $this->expectExceptionMessage('Destination is not writable directory');
 
-        if (static::skipTestForRootUser()) {
-            return;
-        }
-
         $zipFile = new ZipFile();
         $zipFile['file'] = 'content';
         $zipFile->saveAsFile($this->outputFilename);
@@ -1453,13 +1447,8 @@ public function testAddFileUnsupportedMethod()
      */
     public function testAddFileCannotOpen()
     {
-        if (static::skipTestForWindows()) {
-            return;
-        }
-
-        if (static::skipTestForRootUser()) {
-            return;
-        }
+        static::skipTestForWindows();
+        static::skipTestForRootUser();
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('is not readable');
@@ -1801,13 +1790,8 @@ public function testSaveAsStreamBadStream()
      */
     public function testSaveAsFileNotWritable()
     {
-        if (static::skipTestForWindows()) {
-            return;
-        }
-
-        if (static::skipTestForRootUser()) {
-            return;
-        }
+        static::skipTestForWindows();
+        static::skipTestForRootUser();
 
         static::assertTrue(mkdir($this->outputDirname, 0444, true));
         static::assertTrue(chmod($this->outputDirname, 0444));

diff --git a/tests/ZipTestCase.php b/tests/ZipTestCase.php
@@ -192,32 +192,17 @@ public static function assertVerifyZipAlign($filename, $showErrors = false)
         return null;
     }
 
-    /**
-     * @return bool
-     */
     public static function skipTestForRootUser()
     {
-        /** @noinspection PhpComposerExtensionStubsInspection */
         if (\extension_loaded('posix') && posix_getuid() === 0) {
             static::markTestSkipped('Skip the test for a user with root privileges');
-
-            return true;
         }
-
-        return false;
     }
 
-    /**
-     * @return bool
-     */
     public static function skipTestForWindows()
     {
         if (\DIRECTORY_SEPARATOR === '\\') {
             static::markTestSkipped('Skip on Windows');
-
-            return true;
         }
-
-        return false;
     }
 }