Merge pull request #91 from alchemy-fr/yosmanyga-patch-2

Added empty folder to test

Author: aztech-dev

.gitignore

@@ -5,3 +5,5 @@
 composer.phar
 composer.lock
 /tests/node_server.pid
+node_modules/
+tests/Tests/Resource/Teleporter/plop-badge/

.travis.yml

@@ -2,33 +2,27 @@ language: php
 
 sudo: required
 
-env:
-  - ZIPPY_ADAPTER=ZipAdapter
-  - ZIPPY_ADAPTER=ZipExtensionAdapter
-  - ZIPPY_ADAPTER=GNUTar\\TarGNUTarAdapter
-  - ZIPPY_ADAPTER=GNUTar\\TarGzGNUTarAdapter
-  - ZIPPY_ADAPTER=GNUTar\\TarBz2GNUTarAdapter
-  - ZIPPY_ADAPTER=BSDTar\\TarBSDTarAdapter
-  - ZIPPY_ADAPTER=BSDTar\\TarGzBSDTarAdapter
-  - ZIPPY_ADAPTER=BSDTar\\TarBz2BSDTarAdapter
-
 php:
   - 5.3.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
 
+env:
+  PREFER_LOWEST=""
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.3.3
+      env: PREFER_LOWEST="--prefer-lowest"
+
 before_script:
   - sudo apt-get install bsdtar zip
   - npm install connect serve-static
-  - ./tests/bootstrap.sh start
-  - composer update --prefer-source --no-interaction
-  - composer require phpunit/phpunit --update-with-dependencies --prefer-source --no-interaction
+  - composer update --prefer-source --no-interaction $PREFER_LOWEST
+  - if [ -n "$PREFER_LOWEST" ];then composer update phpunit/phpunit --prefer-source --no-interaction --with-dependencies;fi
 
 script:
-  - ./vendor/bin/phpunit -v
-  - ./vendor/bin/phpunit -v -c phpunit-functional.xml.dist
-
-after_script:
-  - ./tests/bootstrap.sh stop
+  - make test

Makefile

@@ -0,0 +1,17 @@
+adapters:="ZipAdapter" "ZipExtensionAdapter" "GNUTar\\TarGNUTarAdapter" "GNUTar\\TarGzGNUTarAdapter" "GNUTar\\TarBz2GNUTarAdapter" "BSDTar\\TarBSDTarAdapter" "BSDTar\\TarGzBSDTarAdapter" "BSDTar\\TarBz2BSDTarAdapter"
+
+.PHONY: test clean
+
+test: node_modules
+	-./tests/bootstrap.sh stop
+	./tests/bootstrap.sh start
+	sleep 1
+	./vendor/bin/phpunit
+	FAILURES="";$(foreach adapter,$(adapters),ZIPPY_ADAPTER=$(adapter) ./vendor/bin/phpunit -c phpunit-functional.xml.dist || FAILURES=1;)test -z "$$FAILURES"
+	-./tests/bootstrap.sh stop
+
+node_modules:
+	npm install connect serve-static
+
+clean:
+	rm -rf node_modules

composer.json

@@ -15,14 +15,14 @@
         "php": ">=5.3.3",
         "doctrine/collections": "~1.0",
         "pimple/pimple": "~1.0",
-        "symfony/filesystem": "~2.0|^3.0",
-        "symfony/process": "~2.0|^3.0"
+        "symfony/filesystem": "^2.0.5|^3.0",
+        "symfony/process": "^2.1|^3.0"
     },
     "require-dev": {
         "ext-zip": "*",
         "guzzle/guzzle": "~3.0",
-        "sami/sami": "~1.0",
-        "symfony/finder": "~2.0|^3.0"
+        "phpunit/phpunit": "^4.0|^5.0",
+        "symfony/finder": "^2.0.5|^3.0"
     },
     "suggest": {
         "ext-zip": "To use the ZipExtensionAdapter",

phpunit-functional.xml.dist

@@ -21,10 +21,9 @@
         </testsuite>
     </testsuites>
     <filter>
-      <blacklist>
-        <directory>vendor</directory>
-        <directory>tests</directory>
-      </blacklist>
+      <whitelist>
+        <directory>src</directory>
+      </whitelist>
     </filter>
 
 </phpunit>

tests/Functional/Add2ArchiveTest.php

@@ -23,13 +23,18 @@ public static function tearDownAfterClass()
      */
     private function create()
     {
+        $directory = __DIR__ . '/samples/directory';
+        $emptyDirectory = __DIR__ . '/samples/directory/empty';
         $adapter = $this->getAdapter();
         $extension = $this->getArchiveExtensionForAdapter($adapter);
 
         self::$file = __DIR__ . '/samples/create-archive.' . $extension;
 
+        if (! file_exists($emptyDirectory)) {
+            mkdir($emptyDirectory);
+        }
         $archive = $adapter->create(self::$file, array(
-            'directory' => __DIR__ . '/samples/directory',
+            'directory' => $directory,
         ), true);
 
         return $archive;
@@ -58,19 +63,21 @@ public function testAdd()
 
         $finder = new Finder();
         $finder
-            ->files()
             ->in($target);
 
         $files2find = array(
+            '/directory',
+            '/directory/empty',
             '/directory/README.md',
             '/directory/photo.jpg',
+            '/somemorefiles',
             '/somemorefiles/nicephoto.jpg',
         );
 
         foreach ($finder as $file) {
             $this->assertEquals(0, strpos($file->getPathname(), $target));
             $member = substr($file->getPathname(), strlen($target));
-            $this->assertTrue(in_array($member, $files2find), "looking for $member in files2find");
+            $this->assertContains($member, $files2find, "looking for $member in files2find");
             unset($files2find[array_search($member, $files2find)]);
         }
 

tests/bootstrap.sh

@@ -11,6 +11,7 @@ case $1 in
     test -r $NODE_SERVER_PIDFILE && echo "Previously registered pid: $(cat $NODE_SERVER_PIDFILE)"
     $NODE "$DIR/static-file-server.js" &
     echo $! > "${NODE_SERVER_PIDFILE}"
+    echo "Server new pid: $(cat $NODE_SERVER_PIDFILE)"
     ;;
   stop)
     test -r $NODE_SERVER_PIDFILE && kill $(cat $NODE_SERVER_PIDFILE)