first pass on migration tests

diff --git a/framework/Db/test/Horde/Db/AllTests.php b/framework/Db/test/Horde/Db/AllTests.php
index 043ff56..af7d2b7 100644 (file)
--- a/framework/Db/test/Horde/Db/AllTests.php
+++ b/framework/Db/test/Horde/Db/AllTests.php
@@ -57,13 +57,21 @@ class Horde_Db_AllTests {
         $baseregexp = preg_quote($basedir . DIRECTORY_SEPARATOR, '/');
 
         foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir)) as $file) {
-            if ($file->isFile() && preg_match('/Suite.php$/', $file->getFilename())) {
-                $pathname = $file->getPathname();
-                require $pathname;
+            if (!$file->isFile()) {
+                continue;
+            }
+
+            $filename = $file->getFilename();
+            $pathname = $file->getPathname();
+            $class = str_replace(DIRECTORY_SEPARATOR, '_',
+                                 preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname));
 
-                $class = str_replace(DIRECTORY_SEPARATOR, '_',
-                                     preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname));
-                $suite->addTestSuite('Horde_Db_'.$class);
+            if (preg_match('/Suite.php$/', $filename)) {
+                require $pathname;
+                $suite->addTestSuite('Horde_Db_' . $class);
+            } elseif (strpos($class, 'Adapter_') === false && preg_match('/Test.php$/', $filename)) {
+                require $pathname;
+                $suite->addTestSuite('Horde_Db_' . $class);
             }
         }
 

diff --git a/framework/Db/test/Horde/Db/Migration/BaseTest.php b/framework/Db/test/Horde/Db/Migration/BaseTest.php
index 0a7db70..bc1c871 100644 (file)
--- a/framework/Db/test/Horde/Db/Migration/BaseTest.php
+++ b/framework/Db/test/Horde/Db/Migration/BaseTest.php
@@ -12,9 +12,9 @@
  * @subpackage UnitTests
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/fixtures/migrations/1_users_have_last_names1.php';
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/fixtures/migrations/2_we_need_reminders1.php';
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/fixtures/migrations_with_decimal/1_give_me_big_numbers.php';
+require_once dirname(dirname(__FILE__)) . '/fixtures/migrations/1_users_have_last_names1.php';
+require_once dirname(dirname(__FILE__)) . '/fixtures/migrations/2_we_need_reminders1.php';
+require_once dirname(dirname(__FILE__)) . '/fixtures/migrations_with_decimal/1_give_me_big_numbers.php';
 
 /**
  * @author     Mike Naberezny <mike@maintainable.com>
@@ -30,6 +30,11 @@ class Horde_Db_Migration_BaseTest extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        $this->_conn = Horde_Db_Adapter::factory(array(
+            'adapter' => 'pdo_sqlite',
+            'dbname' => ':memory:',
+        ));
+
         Horde_Db_Migration_Base::$verbose = false;
     }
 
@@ -79,7 +84,7 @@ class Horde_Db_Migration_BaseTest extends PHPUnit_Framework_TestCase
         $this->_conn->addIndex('users', array('last_name', 'first_name'));
         $this->_conn->removeIndex('users', 'last_name_and_first_name');
 
-        // # quoting
+        // quoting
 
         $this->_conn->addIndex('users', array('key'), array('name' => 'key_idx', 'unique' => true));
         $this->_conn->removeIndex('users', array('name' => 'key_idx', 'unique' => true));

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations/1_users_have_last_names1.php b/framework/Db/test/Horde/Db/fixtures/migrations/1_users_have_last_names1.php
index fd389e5..24ca48b 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations/1_users_have_last_names1.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations/1_users_have_last_names1.php
@@ -1,6 +1,6 @@
 <?php
 
-class UsersHaveLastNames1 extends Mad_Model_Migration_Base 
+class UsersHaveLastNames1 extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations/2_we_need_reminders1.php b/framework/Db/test/Horde/Db/fixtures/migrations/2_we_need_reminders1.php
index 9c54859..4d749ac 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations/2_we_need_reminders1.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations/2_we_need_reminders1.php
@@ -1,6 +1,6 @@
 <?php
 
-class WeNeedReminders1 extends Mad_Model_Migration_Base 
+class WeNeedReminders1 extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations/3_innocent_jointable1.php b/framework/Db/test/Horde/Db/fixtures/migrations/3_innocent_jointable1.php
index 71106db..910de8b 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations/3_innocent_jointable1.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations/3_innocent_jointable1.php
@@ -1,6 +1,6 @@
 <?php
 
-class InnocentJointable1 extends Mad_Model_Migration_Base 
+class InnocentJointable1 extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_decimal/1_give_me_big_numbers.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_decimal/1_give_me_big_numbers.php
index dc74170..6f0568b 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_decimal/1_give_me_big_numbers.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_decimal/1_give_me_big_numbers.php
@@ -1,6 +1,6 @@
 <?php
 
-class GiveMeBigNumbers extends Mad_Model_Migration_Base 
+class GiveMeBigNumbers extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/1_users_have_last_names2.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/1_users_have_last_names2.php
index b35c794..5f57f30 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/1_users_have_last_names2.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/1_users_have_last_names2.php
@@ -1,6 +1,6 @@
 <?php
 
-class UsersHaveLastNames2 extends Mad_Model_Migration_Base 
+class UsersHaveLastNames2 extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/2_we_need_reminders2.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/2_we_need_reminders2.php
index 94d2811..8b21c2b 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/2_we_need_reminders2.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/2_we_need_reminders2.php
@@ -1,6 +1,6 @@
 <?php
 
-class WeNeedReminders2 extends Mad_Model_Migration_Base 
+class WeNeedReminders2 extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_foo.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_foo.php
index 99eb234..f02bd18 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_foo.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_foo.php
@@ -1,11 +1,11 @@
 <?php
 
-class Foo extends Mad_Model_Migration_Base 
+class Foo extends Horde_Db_Migration_Base
 {
     public function up()
     {
     }
-    
+
     public function down()
     {
     }

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_innocent_jointable2.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_innocent_jointable2.php
index d9b01c7..a607d81 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_innocent_jointable2.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_duplicate/3_innocent_jointable2.php
@@ -1,6 +1,6 @@
 <?php
 
-class InnocentJointable2 extends Mad_Model_Migration_Base 
+class InnocentJointable2 extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1000_users_have_middle_names.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1000_users_have_middle_names.php
index a74310b..fbe8a2e 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1000_users_have_middle_names.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1000_users_have_middle_names.php
@@ -1,6 +1,6 @@
 <?php
 
-class UsersHaveMiddleNames extends Mad_Model_Migration_Base 
+class UsersHaveMiddleNames extends Horde_Db_Migration_Base
 {
     public function up()
     {

diff --git a/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1_users_have_last_names3.php b/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1_users_have_last_names3.php
index ba494e2..77fc260 100644 (file)
--- a/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1_users_have_last_names3.php
+++ b/framework/Db/test/Horde/Db/fixtures/migrations_with_missing_versions/1_users_have_last_names3.php
@@ -1,6 +1,6 @@
 <?php
 
-class UsersHaveLastNames3 extends Mad_Model_Migration_Base 
+class UsersHaveLastNames3 extends Horde_Db_Migration_Base
 {
     public function up()
     {