Merge pull request #1 from open-source-contributions/test_enhancement

Test enhancement

Author: eldadfux

.gitignore

@@ -1,3 +1,3 @@
 composer.lock
 /vendor/
-/.idea/
+/.idea/

.travis.yml

@@ -14,8 +14,9 @@ services:
 
 before_install:
 - docker-compose up -d
+- sleep 60
 
 before_script: composer install
 
 script:
-- vendor/bin/phpunit --configuration phpunit.xml
+- vendor/bin/phpunit

composer.json

@@ -13,11 +13,14 @@
     "autoload": {
         "psr-4": {"Appwrite\\ClamAV\\": "src/ClamAV"}
     },
+    "autoload-dev": {
+        "psr-4": {"Utopia\\Tests\\": "tests/ClamAV"}
+    },
     "require": {
         "php": ">=7.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0"
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "stable"
 }

docker-compose.yml

@@ -2,9 +2,9 @@ version: '3'
 
 services:
   clamav:
-    image: appwrite/clamav:v1.0.2
+    image: appwrite/clamav:v1.0.3
     restart: unless-stopped
     ports:
     - "3310:3310"
     volumes:
-    - ./tests/data:/home:rw
+    - ./tests/data:/home:rw

phpunit.xml

@@ -1,6 +1,5 @@
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -10,7 +9,12 @@
         >
     <testsuites>
         <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
+            <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">>./src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/ClamAV/ClamAV.php

@@ -41,7 +41,7 @@ private function sendCommand($command)
     public function ping()
     {
         $return = $this->sendCommand('PING');
-        return strcmp($return, 'PONG') ? true : false;
+        return trim($return) === 'PONG';
     }
 
     /**
@@ -101,11 +101,11 @@ public function fileScan(string $file)
      */
     public function continueScan(string $file)
     {
-        $return = array();
+        $return = [];
 
         foreach(explode("\n", trim($this->sendCommand('CONTSCAN ' .  $file))) as $results ) {
             list($file, $stats) = explode(':', $results);
-            array_push($return, array( 'file' => $file, 'stats' => trim($stats) ));
+            array_push($return, [ 'file' => $file, 'stats' => trim($stats) ]);
         }
 
         return $return;

src/ClamAV/Network.php

@@ -45,4 +45,4 @@ protected function getSocket()
         }
         return $socket;
     }
-}
+}

src/ClamAV/Pipe.php

@@ -33,4 +33,4 @@ protected function getSocket()
         socket_connect($socket, $this->pip);
         return $socket;
     }
-}
+}

tests/ClamAV/ClamAVTest.php

@@ -29,13 +29,13 @@ class ClamAVTest extends TestCase
      */
     protected $pipe = null;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->network = new Network('localhost', 3310);
         $this->pipe = new Pipe();
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         $this->network = null;
         $this->pipe= null;
@@ -48,12 +48,12 @@ public function testVersion()
 
     public function testPing()
     {
-        $this->assertEquals(true, $this->network->ping());
+        $this->assertTrue($this->network->ping());
     }
 
     public function testFileScan()
     {
-        $this->assertEquals(true, $this->network->fileScan('/home/NoVirus.txt'));
-        $this->assertEquals(false, $this->network->fileScan('/home/Virus.txt'));
+        $this->assertTrue($this->network->fileScan('/home/NoVirus.txt'));
+        $this->assertFalse($this->network->fileScan('/home/Virus.txt'));
     }
-}
+}