wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix running test cases in multiply app dirs

Browse source
This commit is contained in:
Robin Appelman 2012-09-02 15:26:32 +02:00
parent aa8cee1afa
commit 9f1c76beef
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/index.php
View file

@ -20,6 +20,8 @@
* *
*/ */
//to run only specific tests, use the test parameter to specify an app or 'lib'. e.g. http://localhost/owncloud/tests/?test=user_external
require_once '../lib/base.php'; require_once '../lib/base.php';
require_once 'simpletest/unit_tester.php'; require_once 'simpletest/unit_tester.php';
require_once 'simpletest/mock_objects.php'; require_once 'simpletest/mock_objects.php';
@ -49,7 +51,7 @@ if(OC::$CLI){
$testSuite=new TestSuite($testSuiteName); $testSuite=new TestSuite($testSuiteName);
//load core test cases //load core test cases
loadTests(dirname(__FILE__), $testSuite, $test); loadTests(dirname(__FILE__), $testSuite, $test, 'lib');
//load app test cases //load app test cases
@ -59,8 +61,9 @@ loadTests(dirname(__FILE__), $testSuite, $test);
$apps=OC_App::getEnabledApps(); $apps=OC_App::getEnabledApps();
foreach($apps as $app){ foreach($apps as $app){
if(is_dir(OC::$SERVERROOT.'/apps/'.$app.'/tests')){ $testDir=OC_App::getAppPath($app).'/tests';
loadTests(OC::$SERVERROOT.'/apps/'.$app.'/tests', $testSuite, $test); if(is_dir($testDir)){
loadTests($testDir, $testSuite, $test, $app);
} }
} }
@ -70,15 +73,16 @@ if($testSuite->getSize()>0){
} }
// helper below // helper below
function loadTests($dir,$testSuite, $test){ function loadTests($dir,$testSuite, $test, $app){
$root=($app=='lib')?OC::$SERVERROOT.'/tests/lib/':OC_App::getAppPath($app).'/tests/';
if($dh=opendir($dir)){ if($dh=opendir($dir)){
while($name=readdir($dh)){ while($name=readdir($dh)){
if($name[0]!='.'){//no hidden files, '.' or '..' if($name[0]!='.'){//no hidden files, '.' or '..'
$file=$dir.'/'.$name; $file=$dir.'/'.$name;
if(is_dir($file)){ if(is_dir($file)){
loadTests($file, $testSuite, $test); loadTests($file, $testSuite, $test, $app);
}elseif(substr($file,-4)=='.php' and $file!=__FILE__){ }elseif(substr($file,-4)=='.php' and $file!=__FILE__){
$name=getTestName($file); $name=$app.'/'.getTestName($file,$root);
if($test===false or $test==$name or substr($name,0,strlen($test))==$test){ if($test===false or $test==$name or substr($name,0,strlen($test))==$test){
$extractor = new SimpleFileLoader(); $extractor = new SimpleFileLoader();
$loadedSuite=$extractor->load($file); $loadedSuite=$extractor->load($file);
@ -91,8 +95,8 @@ function loadTests($dir,$testSuite, $test){
} }
} }
function getTestName($file){ function getTestName($file,$root){
// //TODO: get better test names // //TODO: get better test names
$file=substr($file,strlen(OC::$SERVERROOT)); $file=substr($file,strlen($root));
return substr($file,0,-4);//strip .php return substr($file,0,-4);//strip .php
} }