Mv startup test files.

pydio · May 10, 2016 · d14aef3 · d14aef3
1 parent 7c649a8
commit d14aef3
Show file tree

Hide file tree

Showing 27 changed files with 207 additions and 206 deletions.
diff --git a/core/src/core/src/pydio/Core/Utils/Utils.php b/core/src/core/src/pydio/Core/Utils/Utils.php
@@ -27,6 +27,7 @@
 use Pydio\Core\PluginFramework\Plugin;
 use Pydio\Core\PluginFramework\PluginsService;
 use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Tests\AbstractTest;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
@@ -1270,7 +1271,7 @@ public static function testResultsToTable($outputArray, $testedParams, $showSkip
             $ALL_ROWS[$result][$item["name"]] = $item["info"];
         }
 
-        include(AJXP_INSTALL_PATH."/core/tests/startup.phtml");
+        include(AJXP_TESTS_FOLDER . "/startup.phtml");
     }
 
     /**
@@ -1291,9 +1292,10 @@ public static function runTests(&$outputArray, &$testedParams)
         foreach ($files as $file) {
             require_once($file);
             // Then create the test class
-            $testName = "Pydio\\Tests\\".str_replace(".php", "", substr($file, 5));
-            if(!class_exists($testName)) continue;
+            $testName = "Pydio\\Tests\\".str_replace(".php", "", $file);
+            if(!class_exists($testName) || $testName == "Pydio\\Tests\\AbstractTest") continue;
             $class = new $testName();
+            if(!($class instanceof AbstractTest)) continue;
 
             $result = $class->doTest();
             if (!$result && $class->failedLevel != "info") $passed = false;
@@ -1333,6 +1335,7 @@ public static function runTests(&$outputArray, &$testedParams)
             $class = new $testName();
             foreach ($repoList as $repository) {
                 if($repository->isTemplate || $repository->getParentId() != null) continue;
+                if(!($class instanceof AbstractTest)) continue;
                 $result = $class->doRepositoryTest($repository);
                 if ($result === false || $result === true) {
                     if (!$result && $class->failedLevel != "info") {

diff --git a/core/src/core/tests/test.AJXPVersion.php → .../src/core/src/pydio/Tests/AJXPVersion.php b/core/src/core/tests/test.AJXPVersion.php → .../src/core/src/pydio/Tests/AJXPVersion.php
diff --git a/core/src/core/src/pydio/Tests/AbstractTest.php b/core/src/core/src/pydio/Tests/AbstractTest.php
@@ -20,8 +20,6 @@
  */
 namespace Pydio\Tests;
 
-use Pydio\Access\Core\Model\Repository;
-
 defined('AJXP_EXEC') or die( 'Access not allowed');
 
 global $MAIN_testsArray;
@@ -33,7 +31,7 @@
  * @package Pydio
  * @subpackage Core
  */
-class AbstractTest
+abstract class AbstractTest
 {
     /** The test name */
     public $name;

diff --git a/core/src/core/tests/test.Client.php → core/src/core/src/pydio/Tests/Client.php b/core/src/core/tests/test.Client.php → core/src/core/src/pydio/Tests/Client.php
diff --git a/core/src/core/tests/test.PHPCLI.php → core/src/core/src/pydio/Tests/PHPCLI.php b/core/src/core/tests/test.PHPCLI.php → core/src/core/src/pydio/Tests/PHPCLI.php
diff --git a/core/src/core/tests/test.PHPDomXML.php → core/src/core/src/pydio/Tests/PHPDomXML.php b/core/src/core/tests/test.PHPDomXML.php → core/src/core/src/pydio/Tests/PHPDomXML.php
diff --git a/core/src/core/tests/test.PHPErrorLevel.php → ...rc/core/src/pydio/Tests/PHPErrorLevel.php b/core/src/core/tests/test.PHPErrorLevel.php → ...rc/core/src/pydio/Tests/PHPErrorLevel.php
diff --git a/core/src/core/tests/test.PHPExif.php → core/src/core/src/pydio/Tests/PHPExif.php b/core/src/core/tests/test.PHPExif.php → core/src/core/src/pydio/Tests/PHPExif.php
diff --git a/core/src/core/tests/test.PHPGDVersion.php → ...src/core/src/pydio/Tests/PHPGDVersion.php b/core/src/core/tests/test.PHPGDVersion.php → ...src/core/src/pydio/Tests/PHPGDVersion.php
diff --git a/core/src/core/tests/test.PHPLimits.php → core/src/core/src/pydio/Tests/PHPLimits.php b/core/src/core/tests/test.PHPLimits.php → core/src/core/src/pydio/Tests/PHPLimits.php
diff --git a/core/src/core/tests/test.PHPMCrypt.php → core/src/core/src/pydio/Tests/PHPMCrypt.php b/core/src/core/tests/test.PHPMCrypt.php → core/src/core/src/pydio/Tests/PHPMCrypt.php
diff --git a/core/src/core/tests/test.PHPOS.php → core/src/core/src/pydio/Tests/PHPOS.php b/core/src/core/tests/test.PHPOS.php → core/src/core/src/pydio/Tests/PHPOS.php
diff --git a/core/src/core/tests/test.PHPSession.php → core/src/core/src/pydio/Tests/PHPSession.php b/core/src/core/tests/test.PHPSession.php → core/src/core/src/pydio/Tests/PHPSession.php
diff --git a/core/src/core/tests/test.PHPVersion.php → core/src/core/src/pydio/Tests/PHPVersion.php b/core/src/core/tests/test.PHPVersion.php → core/src/core/src/pydio/Tests/PHPVersion.php
diff --git a/core/src/core/tests/test.PHP_APC.php → core/src/core/src/pydio/Tests/PHP_APC.php b/core/src/core/tests/test.PHP_APC.php → core/src/core/src/pydio/Tests/PHP_APC.php
diff --git a/core/src/core/tests/test.PHP_OB.php → core/src/core/src/pydio/Tests/PHP_OB.php b/core/src/core/tests/test.PHP_OB.php → core/src/core/src/pydio/Tests/PHP_OB.php
diff --git a/.../src/core/tests/test.PHP_file_uploads.php → ...core/src/pydio/Tests/PHP_file_uploads.php b/.../src/core/tests/test.PHP_file_uploads.php → ...core/src/pydio/Tests/PHP_file_uploads.php
diff --git a/.../src/core/tests/test.PHP_magic_quotes.php → ...core/src/pydio/Tests/PHP_magic_quotes.php b/.../src/core/tests/test.PHP_magic_quotes.php → ...core/src/pydio/Tests/PHP_magic_quotes.php
diff --git a/core/src/core/tests/test.SSLEncryption.php → ...rc/core/src/pydio/Tests/SSLEncryption.php b/core/src/core/tests/test.SSLEncryption.php → ...rc/core/src/pydio/Tests/SSLEncryption.php
diff --git a/core/src/core/tests/test.ServerEncoding.php → ...c/core/src/pydio/Tests/ServerEncoding.php b/core/src/core/tests/test.ServerEncoding.php → ...c/core/src/pydio/Tests/ServerEncoding.php
diff --git a/core/src/core/tests/test.Upload.php → core/src/core/src/pydio/Tests/Upload.php b/core/src/core/tests/test.Upload.php → core/src/core/src/pydio/Tests/Upload.php
diff --git a/core/src/core/tests/test.UsersConfig.php → .../src/core/src/pydio/Tests/UsersConfig.php b/core/src/core/tests/test.UsersConfig.php → .../src/core/src/pydio/Tests/UsersConfig.php
diff --git a/core/src/core/tests/test.Writeability.php → ...src/core/src/pydio/Tests/Writeability.php b/core/src/core/tests/test.Writeability.php → ...src/core/src/pydio/Tests/Writeability.php
diff --git a/core/src/core/tests/test.Zlib.php → core/src/core/src/pydio/Tests/Zlib.php b/core/src/core/tests/test.Zlib.php → core/src/core/src/pydio/Tests/Zlib.php
diff --git a/core/src/core/tests/api_test.phtml → core/src/core/src/pydio/Tests/api_test.phtml b/core/src/core/tests/api_test.phtml → core/src/core/src/pydio/Tests/api_test.phtml