Test install function : Fix check directory and remove debug

bfw-systems · Sep 5, 2016 · 1aaa8aa · 1aaa8aa
1 parent f676be2
commit 1aaa8aa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/test/bin/functions.php b/test/bin/functions.php
@@ -1,11 +1,11 @@
 <?php
 
-function testDirectoryOrFile($dir)
+function testDirectoryOrFile($installDir, $dir)
 {
     echo ' > '.$dir."\n";
 
     echo ' >> Exists ';
-    if (file_exists($dir)) {
+    if (!file_exists($installDir.'/'.$dir)) {
         echo "\033[1;31m[Fail]\033[0m\n";
         exit(1);
 
@@ -14,7 +14,7 @@ function testDirectoryOrFile($dir)
     echo "\033[1;32m[OK]\033[0m\n";
 
     echo ' >> Readable ';
-    if (is_readable($dir)) {
+    if (!is_readable($installDir.'/'.$dir)) {
         echo "\033[1;31m[Fail]\033[0m\n";
         exit(1);
 
@@ -23,7 +23,7 @@ function testDirectoryOrFile($dir)
     echo "\033[1;32m[OK]\033[0m\n";
 
     echo ' >> Writable ';
-    if (is_writable($dir)) {
+    if (!is_writable($installDir.'/'.$dir)) {
         echo "\033[1;31m[Fail]\033[0m\n";
         exit(1);
 

diff --git a/test/bin/installFwk.php b/test/bin/installFwk.php
@@ -79,7 +79,8 @@
 
     echo $installOutput;
 
-    echo `cd $installDir && ls -al`;
+    //echo "\n";
+    //echo `cd $installDir && ls -al *`;
 
     echo 'Test output returned by script : ';
     if ($installOutput !== $exceptedOutput[$installIndex]) {
@@ -92,22 +93,22 @@
 
     echo 'Test structure :'."\n";
 
-    testDirectoryOrFile('app');
-    testDirectoryOrFile('app/config');
-    testDirectoryOrFile('app/config/bfw');
-    testDirectoryOrFile('app/modules');
+    testDirectoryOrFile($installDir, 'app');
+    testDirectoryOrFile($installDir, 'app/config');
+    testDirectoryOrFile($installDir, 'app/config/bfw');
+    testDirectoryOrFile($installDir, 'app/modules');
 
-    testDirectoryOrFile('src');
-    testDirectoryOrFile('src/cli');
-    testDirectoryOrFile('src/controllers');
-    testDirectoryOrFile('src/modeles');
-    testDirectoryOrFile('src/view');
+    testDirectoryOrFile($installDir, 'src');
+    testDirectoryOrFile($installDir, 'src/cli');
+    testDirectoryOrFile($installDir, 'src/controllers');
+    testDirectoryOrFile($installDir, 'src/modeles');
+    testDirectoryOrFile($installDir, 'src/view');
 
-    testDirectoryOrFile('web');
+    testDirectoryOrFile($installDir, 'web');
 
-    testDirectoryOrFile('app/config/bfw/config.php');
-    testDirectoryOrFile('src/cli/exemple.php');
-    testDirectoryOrFile('web/index.php');
-    testDirectoryOrFile('.htaccess');
-    testDirectoryOrFile('cli.php');
+    testDirectoryOrFile($installDir, 'app/config/bfw/config.php');
+    testDirectoryOrFile($installDir, 'src/cli/exemple.php');
+    testDirectoryOrFile($installDir, 'web/index.php');
+    testDirectoryOrFile($installDir, '.htaccess');
+    testDirectoryOrFile($installDir, 'cli.php');
 }