Changeset 4776 for trunk/tests

Timestamp:

08/16/08 20:40:59 (5 months ago)

Author:

romanb

Message:

continued refactorings.

Location:

trunk/tests

Files:

• lib/mocks/Doctrine_ConnectionMock.php (modified) (3 diffs)
• models/cms/CmsArticle.php (modified) (1 diff)
• models/cms/CmsUser.php (modified) (1 diff)
• models/forum/ForumAvatar.php (added)
• models/forum/ForumBoard.php (modified) (1 diff)
• models/forum/ForumCategory.php (modified) (1 diff)
• models/forum/ForumUser.php (modified) (2 diffs)
• Orm/AllTests.php (modified) (2 diffs)
• Orm/Associations/OneToOneMappingTest.php (modified) (3 diffs)
• Orm/Component/AccessTest.php (modified) (4 diffs)
• Orm/EntityManagerTest.php (added)
• Orm/EntityPersisterTest.php (added)
• Orm/Hydration/BasicHydrationTest.php (modified) (9 diffs)
• Orm/Query/IdentifierRecognitionTest.php (modified) (3 diffs)

trunk/tests/lib/mocks/Doctrine_ConnectionMock.php

@@ -9 +9 @@
     private $_sequenceModuleMock;
     private $_platformMock;
+    private $_inserts = array();
     
     public function __construct(array $params)
@@ -31 +32 @@
     }
     
+    /**
+     * @override
+     */
+    public function insert($tableName, array $data)
+    {
+        $this->_inserts[$tableName][] = $data;
+    }
+    
     /* Mock API */
     
@@ -42 +51 @@
         $this->_sequenceModuleMock = $seqManager;
     }
+    
+    public function getInserts()
+    {
+        return $this->_inserts;
+    }
+    
+    public function reset()
+    {
+        $this->_inserts = array();
+    }
 }
 

trunk/tests/models/cms/CmsArticle.php

@@ -35 +35 @@
             'length' => 4
         ));
-        $mapping->hasMany('CmsComment as comments', array(
-              'local' => 'id', 'foreign' => 'article_id'));
+        
+        /*$mapping->hasMany('CmsComment as comments', array(
+              'local' => 'id', 'foreign' => 'article_id'));*/
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'comments',
+            'targetEntity' => 'CmsComment',
+        ));
+        
+        /*$mapping->mapManyToOne(array(
+            'fieldName' => 'author',
+            'joinColumns' => array('user_id' => 'id')
+        ));*/
     }
 }

trunk/tests/models/cms/CmsUser.php

@@ -37 +37 @@
         ));
 
-        $mapping->hasMany('CmsPhonenumber as phonenumbers', array(
+        /*$mapping->hasMany('CmsPhonenumber as phonenumbers', array(
               'local' => 'id', 'foreign' => 'user_id'));
         $mapping->hasMany('CmsArticle as articles', array(
-              'local' => 'id', 'foreign' => 'user_id'));
+              'local' => 'id', 'foreign' => 'user_id'));*/
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'phonenumbers',
+            'targetEntity' => 'CmsPhonenumber',
+            
+        ));
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'articles',
+            'targetEntity' => 'CmsArticle',
+        ));
+        
     }
 }

trunk/tests/models/forum/ForumBoard.php

@@ -26 +26 @@
         ));
         
-        $mapping->hasOne('ForumCategory as category',
-                array('local' => 'category_id', 'foreign' => 'id'));
-        /*       
-        $metadata->mapOneToOne(array(
-            'fieldName' => 'category', // optional, defaults to targetEntity
+        /*$mapping->hasOne('ForumCategory as category',
+                array('local' => 'category_id', 'foreign' => 'id'));*/
+               
+        $mapping->mapOneToOne(array(
+            'fieldName' => 'category',
             'targetEntity' => 'ForumCategory',
             'joinColumns' => array('category_id' => 'id')
-            )); 
-        */       
+        ));
     }
 }

trunk/tests/models/forum/ForumCategory.php

@@ -21 +21 @@
         ));
         
-        $mapping->hasMany('ForumBoard as boards', array(
-                'local' => 'id' , 'foreign' => 'category_id')); 
+        /*$mapping->hasMany('ForumBoard as boards', array(
+                'local' => 'id' , 'foreign' => 'category_id'));*/
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'boards',
+            'targetEntity' => 'ForumBoard'
+        ));
     }
 }

trunk/tests/models/forum/ForumUser.php

@@ -7 +7 @@
 class ForumUser extends Doctrine_Entity
 {
-    #protected $dtype;
     #protected $id;
     #protected $username;
+    #protected $avatar;
     
     public static function initMetadata($mapping) 
@@ -43 +43 @@
         ));
         
+        $mapping->mapOneToOne(array(
+            'fieldName' => 'avatar',
+            'targetEntity' => 'ForumAvatar',
+            'joinColumns' => array('avatar_id' => 'id'),
+        ));
+        
     }
     

trunk/tests/Orm/AllTests.php

@@ -16 +16 @@
 require_once 'Orm/UnitOfWorkTest.php';
 require_once 'Orm/EntityManagerFactoryTest.php';
+require_once 'Orm/EntityManagerTest.php';
+require_once 'Orm/EntityPersisterTest.php';
 
 class Orm_AllTests
@@ -30 +32 @@
         $suite->addTestSuite('Orm_UnitOfWorkTest');
         $suite->addTestSuite('Orm_EntityManagerFactoryTest');
-        //$suite->addTestSuite('Orm_ConfigurableTestCase');
+        $suite->addTestSuite('Orm_EntityManagerTest');
+        $suite->addTestSuite('Orm_EntityPersisterTest');
         
         $suite->addTest(Orm_Component_AllTests::suite());

trunk/tests/Orm/Associations/OneToOneMappingTest.php

@@ -10 +10 @@
             'targetEntity' => 'Address',
             'joinColumns' => array('address_id' => 'id'),
-            'sourceEntity' => 'Person' // This is normally filled by ClassMetadata
+            'sourceEntity' => 'Person', // This is normally filled by ClassMetadata
         );
         
@@ -24 +24 @@
         
         $inverseSideMapping = array(
+            'fieldName' => 'person',
+            'sourceEntity' => 'Address',
+            'targetEntity' => 'Person',
             'mappedBy' => 'address'
         );
@@ -29 +32 @@
         $oneToOneMapping = new Doctrine_Association_OneToOne($inverseSideMapping);
         $this->assertEquals('address', $oneToOneMapping->getMappedByFieldName());
+        $this->assertEquals('Address', $oneToOneMapping->getSourceEntityName());
+        $this->assertEquals('Person', $oneToOneMapping->getTargetEntityName());
         $this->assertTrue($oneToOneMapping->isInverseSide());
         

trunk/tests/Orm/Component/AccessTest.php

@@ -27 +27 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision: 3754 $
  */
@@ -98 +98 @@
     /**
      * @test 
-     */
-    public function shouldSetArrayOfValusInRecord()
-    {
-        $this->user->setArray(array(
-            'username' => 'meus',
-            'id'       => 22));
-
-        $this->assertEquals('meus', $this->user->username);
-        $this->assertEquals('meus', $this->user['username']);
-
-        $this->assertEquals(22, $this->user->id);
-        $this->assertEquals(22, $this->user['id']);
-    }
-
-
-    /**
-     * @test 
      * @expectedException Doctrine_Entity_Exception
      */
@@ -129 +112 @@
     {
         $this->user['rat'] = 'meus';
-    }
-
-    /**
-     * @test 
-     * @expectedException Doctrine_Entity_Exception
-     */
-    public function shouldNotBeAbleToSetNonExistantFieldAsPartInSetArray()
-    {
-        $this->user->setArray(array(
-            'rat' => 'meus',
-            'id'  => 22));
     }
 
@@ -175 +147 @@
         unset($col->test);
         $this->assertFalse(isset($col->test));
-    }
-
-
-    /**
-     *  
-     * @test
-     * @expectedException Doctrine_Exception
-     */
-    public function shouldNotBeAbleToSetNullFieldInRecord()
-    {
-        $this->user->offsetSet(null, 'test');
-
     }
 

trunk/tests/Orm/Hydration/BasicHydrationTest.php

@@ -124 +124 @@
                 'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
                 'map' => null
                 )
@@ -227 +227 @@
                 'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
                 'map' => null,
                 'agg' => array('0' => 'numPhones')
@@ -312 +312 @@
                 'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
                 'map' => 'phonenumber'
                 )
@@ -416 +416 @@
                 'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
                 'map' => null
                 ),
@@ -422 +422 @@
                 'metadata' => $this->_em->getClassMetadata('CmsArticle'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('articles'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('articles'),
                 'map' => null
                 ),
@@ -572 +572 @@
                 'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
                 'map' => null
                 ),
@@ -578 +578 @@
                 'metadata' => $this->_em->getClassMetadata('CmsArticle'),
                 'parent' => 'u',
-                'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('articles'),
+                'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('articles'),
                 'map' => null
                 ),
@@ -584 +584 @@
                 'metadata' => $this->_em->getClassMetadata('CmsComment'),
                 'parent' => 'a',
-                'relation' => $this->_em->getClassMetadata('CmsArticle')->getRelation('comments'),
+                'relation' => $this->_em->getClassMetadata('CmsArticle')->getAssociationMapping('comments'),
                 'map' => null
                 ),
@@ -780 +780 @@
                 'metadata' => $this->_em->getClassMetadata('ForumBoard'),
                 'parent' => 'c',
-                'relation' => $this->_em->getClassMetadata('ForumCategory')->getRelation('boards'),
+                'relation' => $this->_em->getClassMetadata('ForumCategory')->getAssociationMapping('boards'),
                 'map' => null
                 ),

trunk/tests/Orm/Query/IdentifierRecognitionTest.php

@@ -85 +85 @@
 
         $this->assertTrue($decl['metadata'] instanceof Doctrine_ClassMetadata);
-        $this->assertTrue($decl['relation'] instanceof Doctrine_Relation);
+        $this->assertTrue($decl['relation'] instanceof Doctrine_Association);
         $this->assertEquals('u', $decl['parent']);
         $this->assertEquals(null, $decl['scalar']);
@@ -109 +109 @@
 
         $this->assertTrue($decl['metadata'] instanceof Doctrine_ClassMetadata);
-        $this->assertTrue($decl['relation'] instanceof Doctrine_Relation);
+        $this->assertTrue($decl['relation'] instanceof Doctrine_Association);
         $this->assertEquals('u', $decl['parent']);
         $this->assertEquals(null, $decl['scalar']);
@@ -117 +117 @@
 
         $this->assertTrue($decl['metadata'] instanceof Doctrine_ClassMetadata);
-        $this->assertTrue($decl['relation'] instanceof Doctrine_Relation);
+        $this->assertTrue($decl['relation'] instanceof Doctrine_Association);
         $this->assertEquals('u', $decl['parent']);
         $this->assertEquals(null, $decl['scalar']);