From 74a61c3407e39c40b7db072af770397926702899 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Mon, 15 Jun 2009 22:23:30 -0400 Subject: [PATCH] only enforce needing Suite.php files inside the Adapter/ directory --- framework/Db/test/Horde/Db/AllTests.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/framework/Db/test/Horde/Db/AllTests.php b/framework/Db/test/Horde/Db/AllTests.php index 043ff5611..a5d652de3 100644 --- a/framework/Db/test/Horde/Db/AllTests.php +++ b/framework/Db/test/Horde/Db/AllTests.php @@ -18,7 +18,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) { require_once 'PHPUnit/Framework/TestSuite.php'; require_once 'PHPUnit/TextUI/TestRunner.php'; -require_once dirname(__FILE__).'/Adapter/MissingTest.php'; +require_once dirname(__FILE__) . '/Adapter/MissingTest.php'; /** * @author Mike Naberezny @@ -56,17 +56,31 @@ class Horde_Db_AllTests { $basedir = dirname(__FILE__); $baseregexp = preg_quote($basedir . DIRECTORY_SEPARATOR, '/'); - foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir)) as $file) { + // Handle the Adapter tests + foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir . '/Adapter')) as $file) { if ($file->isFile() && preg_match('/Suite.php$/', $file->getFilename())) { $pathname = $file->getPathname(); require $pathname; $class = str_replace(DIRECTORY_SEPARATOR, '_', preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname)); - $suite->addTestSuite('Horde_Db_'.$class); + $suite->addTestSuite('Horde_Db_' . $class); } } + // Add other tests + foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir)) as $file) { + if ($file->isFile() && !preg_match("/^{$baseregexp}Adapter/", $file->getPathname()) && preg_match('/Test.php$/', $file->getFilename())) { + $pathname = $file->getPathname(); + require $pathname; + + $class = str_replace(DIRECTORY_SEPARATOR, '_', + preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname)); + $suite->addTestSuite('Horde_Db_' . $class); + } + } + + return $suite; } -- 2.11.0