From 6825767cbaffd7949a711d678e8704ff9e8bb983 Mon Sep 17 00:00:00 2001 From: zYne Date: Thu, 18 Oct 2007 19:36:54 +0000 Subject: [PATCH] removed deprecated schema test case --- tests/SchemaTestCase.php | 202 --------------------------------------- tests/SearchTestCase.php | 4 +- tests/run.php | 4 +- 3 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 tests/SchemaTestCase.php diff --git a/tests/SchemaTestCase.php b/tests/SchemaTestCase.php deleted file mode 100644 index d802587ba..000000000 --- a/tests/SchemaTestCase.php +++ /dev/null @@ -1,202 +0,0 @@ - - * @version $Id$ - * @package Doctrine - */ -class Doctrine_Schema_TestCase extends Doctrine_UnitTestCase -{ - - public function testEverySchemaObjectIsThrowingExceptionOnNonPropertyAssignment() - { - $isException = false; - $obj = new Doctrine_Schema(); - try { - $obj->no_such_property = 'this should throw an exception'; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Database(); - try { - $obj->no_such_property = 'this should throw an exception'; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Table(); - try { - $obj->no_such_property = 'this should throw an exception'; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Column(); - try { - $obj->no_such_property = 'this should throw an exception'; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Relation(); - try { - $obj->no_such_property = 'this should throw an exception'; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - } - - public function testEverySchemaObjectIsThrowingExceptionOnNonPropertyAccess() - { - $isException = false; - $obj = new Doctrine_Schema(); - try { - $value = $obj->no_such_property; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Database(); - try { - $value = $obj->no_such_property; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Table(); - try { - $value = $obj->no_such_property; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Column(); - try { - $value = $obj->no_such_property; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - - $isException = false; - $obj = new Doctrine_Schema_Relation(); - try { - $value = $obj->no_such_property; - } catch (Doctrine_Schema_Exception $e) - { - $isException = true; - } - $this->assertTrue($isException); - } - - public function testSchemaDatabasePropertiesAreAssignableAndAccessible() - { - $obj = new Doctrine_Schema_Database(); - $vars = array( - 'name' => 'mydatabase', - 'type' => 'MySQL', - 'version' => '5.0', - 'engine' => 'InnoDB', - 'charset' => 'UTF-8' - ); - - foreach ($vars as $key => $val) - { - $obj->$key = $val; - $this->assertEqual($obj->$key, $val); - } - - - } - - public function testSchemaTablePropertiesAreAssignableAndAccessible() - { - $obj = new Doctrine_Schema_Table(); - $vars = array( - 'name' => 'User', - 'check' => '(col1 < col2)', - 'charset' => 'UTF-8', - 'description' => 'User data' - ); - - foreach ($vars as $key => $val) - { - $obj->$key = $val; - $this->assertEqual($obj->$key, $val); - } - } - - public function testSchemaColumnPropertiesAreAssignableAndAccessible() - { - $obj = new Doctrine_Schema_Column(); - $vars = array( - 'name' => 'id', - 'type' => 'int', - 'length' => 10, - 'autoinc' => true, - 'default' => null, - 'notnull' => true, - // 'description' => 'user id', - // 'check' => 'id > 0', - // 'charset' => 'UTF-8' - ); - - foreach ($vars as $key => $val) - { - $obj->$key = $val; - $this->assertEqual($obj->$key, $val); - } - } - - public function testSchemaDatabaseIsCloneable() - { - } - - - public function testSchemaIsTraversable() - { - /* @todo complete - - $schema = new Doctrine_Schema(); - - foreach($schema as $key => $db) - { - $this->assertEqual($db->name, $key); - foreach($db as $key => $table) - { - $this->assertEqual($table->name, $key); - foreach($table as $key => $col) - { - $this->assertEqual($col->name, $key); - } - } - } - */ - } -} diff --git a/tests/SearchTestCase.php b/tests/SearchTestCase.php index dcc8c1822..a7c5e60ca 100644 --- a/tests/SearchTestCase.php +++ b/tests/SearchTestCase.php @@ -145,9 +145,7 @@ class Doctrine_Search_TestCase extends Doctrine_UnitTestCase public function testBatchUpdatesUpdateAllPendingEntries() { $e = new SearchTest(); - $tpl = $e->getTable()->getTemplate('Doctrine_Template_Searchable'); - - $tpl->getPlugin()->processPending(); + $e->batchUpdateIndex(); $coll = Doctrine_Query::create() ->from('SearchTestIndex s') diff --git a/tests/run.php b/tests/run.php index 989a1f425..2cda0609d 100644 --- a/tests/run.php +++ b/tests/run.php @@ -211,9 +211,6 @@ $record->addTestCase(new Doctrine_Record_ZeroValues_TestCase()); //$record->addTestCase(new Doctrine_Record_SaveBlankRecord_TestCase()); $test->addTestCase($record); - -$test->addTestCase(new Doctrine_Schema_TestCase()); - $test->addTestCase(new Doctrine_CustomPrimaryKey_TestCase()); $test->addTestCase(new Doctrine_CustomResultSetOrder_TestCase()); @@ -240,6 +237,7 @@ $test->addTestCase(new Doctrine_NestedSet_SingleRoot_TestCase()); $search = new GroupTest('Search tests','search'); $search->addTestCase(new Doctrine_Search_TestCase()); $search->addTestCase(new Doctrine_Search_Query_TestCase()); +$search->addTestCase(new Doctrine_Search_File_TestCase()); $test->addTestCase($search);