Changeset 4101 for trunk/tests/Orm

Timestamp:

03/23/08 11:30:29 (10 months ago)

Author:

romanb

Message:

refactorings

Location:

trunk/tests/Orm/Component

Files:

• AllTests.php (modified) (1 diff)
• CollectionTest.php (modified) (6 diffs)
• TestTest.php (modified) (1 diff)

trunk/tests/Orm/Component/AllTests.php

@@ -22 +22 @@
         $suite = new Doctrine_TestSuite('Doctrine Orm Component');
 
-        //$suite->addTestSuite('Orm_Component_TestTest');
+        $suite->addTestSuite('Orm_Component_TestTest');
                 $suite->addTestSuite('Orm_Component_AccessTest');
         $suite->addTestSuite('Orm_Component_CollectionTest');

trunk/tests/Orm/Component/CollectionTest.php

@@ -58 +58 @@
     public function shouldHaveBlankAsDefaultKeyColumn()
     {
-        $this->assertEquals('', $this->coll->getKeyColumn());
+        $this->assertEquals('', $this->coll->getKeyField());
     }   
 
@@ -68 +68 @@
     {
         $coll = new Doctrine_Collection('ForumUser', 'id');
-        $this->assertEquals('id', $coll->getKeyColumn());
+        $this->assertEquals('id', $coll->getKeyField());
     }
 
@@ -76 +76 @@
      *
      * @test 
-     * @expectedException Doctrine_Exception
+     * @expectedException Doctrine_Collection_Exception
      */
     public function shouldThrowExceptionIfNonValidFieldSetAsKey()
     {
-        $coll = new Doctrine_Collection('ForumUser', 'rat');
+        $coll = new Doctrine_Collection('ForumUser', 'xxNonValidFieldxx');
     }
 
@@ -88 +88 @@
     public function shouldSerializeEmptyCollection()
     {
-        $serializedFormCollection='C:19:"Doctrine_Collection":158:{a:7:{s:4:"data";a:0:{}s:7:"_mapper";s:9:"ForumUser";s:9:"_snapshot";a:0:{}s:14:"referenceField";N;s:9:"keyColumn";N;s:8:"_locator";N;s:10:"_resources";a:0:{}}}';
-        $this->assertEquals($serializedFormCollection, serialize($this->coll));
+        $serialized = serialize($this->coll);
+        $this->assertTrue(is_string($serialized));
     }
 
@@ -97 +97 @@
     public function shouldUnserializeEmptyCollectionIntoObject()
     {
-        $serializedFormCollection='C:19:"Doctrine_Collection":158:{a:7:{s:4:"data";a:0:{}s:7:"_mapper";s:9:"ForumUser";s:9:"_snapshot";a:0:{}s:14:"referenceField";N;s:9:"keyColumn";N;s:8:"_locator";N;s:10:"_resources";a:0:{}}}';
-        $coll = unserialize($serializedFormCollection);
+        $serialized = serialize($this->coll);
+        $coll = unserialize($serialized);
         $this->assertEquals('Doctrine_Collection', get_class($coll));
     }
@@ -120 +120 @@
         $coll = unserialize($serialized);
 
-        $this->assertEquals('username', $coll->getKeyColumn());
+        $this->assertEquals('username', $coll->getKeyField());
         $this->assertTrue(isset($coll['test']));
         $user = $coll['test'];
         $this->assertTrue($user instanceOf CmsUser);
         $this->assertEquals('test', $user['username']);
-
     }
 

trunk/tests/Orm/Component/TestTest.php

@@ -29 +29 @@
         $this->assertEquals(2, count($forumUsers));
     }
+    
+    public function testFixture3()
+    {
+        $forumAdmins = $this->sharedFixture['connection']->query("FROM ForumAdministrator adm");
+        $this->assertEquals(1, count($forumAdmins));
+        $forumAdmins[0]->delete();
+    }
 }