Changeset 3701 for trunk/tests/DoctrineTest

Timestamp:

02/03/08 21:29:57 (11 months ago)

Author:

romanb

Message:

Merged r3518:r3700 from branch to trunk. Branch to be deleted, soon. Development continues in trunk.

Files:

• trunk/tests/DoctrineTest/Doctrine_UnitTestCase.php (modified) (10 diffs)

trunk/tests/DoctrineTest/Doctrine_UnitTestCase.php

@@ -66 +66 @@
         $this->_name = get_class($this);
 
-        $this->manager   = Doctrine_Manager::getInstance();
+        $this->manager = Doctrine_Manager::getInstance();
         $this->manager->setAttribute(Doctrine::ATTR_EXPORT, Doctrine::EXPORT_ALL);
 
         $this->tables = array_merge($this->tables, 
-                        array('entity',
-                              'entityReference',
-                              'email',
-                              'phonenumber',
-                              'groupuser',
-                              'album',
-                              'song',
-                              'element',
-                              'error',
-                              'description',
-                              'address',
-                              'account',
-                              'task',
-                              'resource',
-                              'assignment',
-                              'resourceType',
-                              'resourceReference')
+                        array('Entity',
+                              'EntityReference',
+                              'Email',
+                              'Phonenumber',
+                              'Groupuser',
+                              'Album',
+                              'Book',
+                              'Song',
+                              'Element',
+                              'Error',
+                              'Description',
+                              'Address',
+                              'Account',
+                              'Task',
+                              'Resource',
+                              'Assignment',
+                              'ResourceType',
+                              'ResourceReference')
                               );
 
 
         $class = get_class($this);
-        $e     = explode('_', $class);
+        $e = explode('_', $class);
 
 
@@ -135 +136 @@
             $this->manager->setAttribute(Doctrine::ATTR_LISTENER, $this->listener);
 
-        } catch(Doctrine_Manager_Exception $e) {
+        } catch (Doctrine_Manager_Exception $e) {
             if($this->driverName == 'main') {
                 $this->dbh = new PDO('sqlite::memory:');
@@ -145 +146 @@
             $this->conn = $this->connection = $this->manager->openConnection($this->dbh, $this->driverName);
 
-            if($this->driverName !== 'main') {
+            if ($this->driverName !== 'main') {
                 $exc  = 'Doctrine_Connection_' . ucwords($this->driverName) . '_Exception';
 
@@ -156 +157 @@
             $this->manager->setAttribute(Doctrine::ATTR_LISTENER, $this->listener);
         }
+        
         if ($this->driverName !== 'main') {
-
             if (isset($module)) {
                 switch($module) {
@@ -175 +176 @@
             }
         }
+        
         $this->unitOfWork = $this->connection->unitOfWork;
         $this->connection->setListener(new Doctrine_EventListener());
         $this->query = new Doctrine_Query($this->connection);
-
+        
         if ($this->driverName === 'main') {
             $this->prepareTables();
@@ -184 +186 @@
         }
     }
+    
     public function prepareTables() {
-        foreach($this->tables as $name) {
-            $name = ucwords($name);
-            $table = $this->connection->getTable($name);
+        foreach ($this->tables as $name) {
+            $table = $this->connection->getMetadata($name);
             $query = 'DROP TABLE ' . $table->getTableName();
             try {
                 $this->conn->exec($query);
-            } catch(Doctrine_Connection_Exception $e) {
-
-            }
-        }
+            } catch (Doctrine_Connection_Exception $e) {}
+        }
+        //echo "exporting : " . var_dump($this->tables);
+        //echo "<br /><br />";
         $this->conn->export->exportClasses($this->tables);
         $this->objTable = $this->connection->getMapper('User');
     }
+    
     public function prepareData() 
     {
@@ -256 +259 @@
         $this->users->save(); 
     }
+    
     public function getConnection() 
     {
         return $this->connection;
     }
+    
     public function assertDeclarationType($type, $type2) 
     {
@@ -270 +275 @@
         $this->assertEqual($dec['type'], $type2);
     }
+    
     public function getDeclaration($type) 
     {
         return $this->dataDict->getPortableDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 1, 'fixed' => true));
     }
+    
     public function clearCache() 
     {
@@ -281 +288 @@
         }
     }
+    
     public function setUp()
     {
@@ -286 +294 @@
             $this->init();
         }
+        
         if (isset($this->objTable)) {
             $this->objTable->clear();