diff --git a/test/AllTests.php b/test/AllTests.php index 95e65bd4a..7c58b8fc4 100644 --- a/test/AllTests.php +++ b/test/AllTests.php @@ -18,16 +18,22 @@ if (! defined('PMA_MAIN_METHOD')) { */ require_once 'PHPUnit/Framework.php'; require_once 'PHPUnit/TextUI/TestRunner.php'; +//require_once 'PHPUnit/Util/TestDox/ResultPrinter.php.'; require_once './test/FailTest.php'; require_once './test/PMA_get_real_size_test.php'; require_once './test/PMA_sanitize_test.php'; require_once './test/PMA_pow_test.php'; +require_once './test/Environment_test.php'; class AllTests { public static function main() { - PHPUnit_TextUI_TestRunner::run(self::suite()); + $parameters = array(); + //$parameters['testdoxHTMLFile'] = true; + //$parameters['printer'] = PHPUnit_Util_TestDox_ResultPrinter::factory('HTML'); + //$parameters['printer'] = PHPUnit_Util_TestDox_ResultPrinter::factory('Text'); + PHPUnit_TextUI_TestRunner::run(self::suite(), $parameters); } public static function suite() @@ -35,6 +41,7 @@ class AllTests $suite = new PHPUnit_Framework_TestSuite('phpMyAdmin'); //$suite->addTestSuite('FailTest'); + $suite->addTestSuite('Environment_test'); $suite->addTestSuite('PMA_get_real_size_test'); $suite->addTestSuite('PMA_sanitize_test'); $suite->addTestSuite('PMA_pow_test'); @@ -43,6 +50,8 @@ class AllTests } if (PMA_MAIN_METHOD == 'AllTests::main') { + echo '
';
     AllTests::main();
+    echo '
'; } ?> \ No newline at end of file diff --git a/test/Environment_test.php b/test/Environment_test.php new file mode 100644 index 000000000..25b265b70 --- /dev/null +++ b/test/Environment_test.php @@ -0,0 +1,33 @@ +assertTrue(version_compare('4.1', phpversion(), '<='), + 'phpMyAdmin requires PHP 4.1 or above'); + } + + public function testMySQL() + { + $this->markTestIncomplete(); + } + + public function testSession() + { + $this->markTestIncomplete(); + } +} +?> \ No newline at end of file