Doctrine

Timestamp:

06/08/08 17:28:13 (13 months ago)

Author:

jwage

Message:

updating test, removing unneeded fail

Location:

branches/0.11/tests

Files:

• run.php (modified) (1 diff)
• Ticket/1099TestCase.php (modified) (4 diffs)
• Ticket/1116TestCase.php (modified) (2 diffs)

branches/0.11/tests/run.php

@@ -73 +73 @@
 $tickets->addTestCase(new Doctrine_Ticket_1071_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1072_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1099_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1113_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1116_TestCase());
-//$tickets->addTestCase(new Doctrine_Ticket_1099_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1121_TestCase());
+
 $test->addTestCase($tickets);
 

branches/0.11/tests/Ticket/1099TestCase.php

@@ -1 +1 @@
 <?php
-class Doctrine_Ticket_1099_TestCase extends Doctrine_UnitTestCase 
+class Doctrine_Ticket_1099_TestCase extends Doctrine_UnitTestCase
 {
     public function prepareTables()
     {
         $this->tables = array();
-        $this->tables[] = 'T1099_Page';
-        $this->tables[] = 'T1099_SubPage';
+        $this->tables[] = 'T1099_Page';
+        $this->tables[] = 'T1099_SubPage';
 
-        parent::prepareTables();
+        parent::prepareTables();
     }
 
@@ -14 +14 @@
     {
         $page = new T1099_Page();
-        $page->type = 'page';
-        $tree = $page->getTable()->getTree();
-        $tree->createRoot($page);
+        $page->type = 'page';
+        $tree = $page->getTable()->getTree();
+        $tree->createRoot($page);
 
-        $subPage = new T1099_SubPage();
-        $subPage->getNode()->insertAsLastChildOf($page);
+        $subPage = new T1099_SubPage();
+        $subPage->getNode()->insertAsLastChildOf($page);
     }
 
@@ -25 +25 @@
     {
         $child = Doctrine_Query::create()
-               ->from('T1099_Page p')
-               ->where('p.type = \'subpage\'')
-               ->fetchOne();
+           ->from('T1099_Page p')
+           ->where('p.type = \'subpage\'')
+           ->fetchOne();
 
-        $this->assertEqual('T1099_SubPage', get_class($child));
-        $this->assertNotEqual(false, $child->getNode()->getParent());
+        $this->assertEqual('T1099_SubPage', get_class($child));
+        $this->assertNotEqual(false, $child->getNode()->getParent());
     }
 }
@@ -39 +39 @@
     {
         $this->setTableName('pages');
-            $this->hasColumn('id', 'integer', 15, array('autoincrement' => true, 'primary' => true, 'notnull' => true));
-            $this->hasColumn('type', 'string', 10);
+        $this->hasColumn('id', 'integer', 15, array('autoincrement' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('type', 'string', 10);
     }
 
     public function setUp()
     {
-        $this->actAs('Doctrine_Template_NestedSet');
-        $this->setSubclasses(array(
-                'T1099_SubPage' => array('type' => 'subpage')
-        ));
-        parent::setUp();
+        $this->actAs('Doctrine_Template_NestedSet');
+        $this->setSubclasses(array(
+        'T1099_SubPage' => array('type' => 'subpage')
+        ));
+        parent::setUp();
     }
 }

branches/0.11/tests/Ticket/1116TestCase.php

@@ -17 +17 @@
                   ->from('Ticket_1116_User s')
                   ->where('s.username = ?', array('test'));
-                
-                $params = $q->getParams();      // there should be array('test',null) but we only have 'test'
-                          
-                $this->assertEqual(count($params),2);     
-                
-                                  
+                  
                 // to see the error switch dbh to a real db, the next line will trigger the error
                 $test = $q->fetchOne();  //will only fail with "real" mysql 
@@ -51 +46 @@
                 $this->actAs($softdelete0);
         }
-
 }