From cab7c8ea454eefced66b97593f4b609c17377caa Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 5 Jun 2007 19:33:09 +0000
Subject: [PATCH] New test case for one-one relation fetching.

---
 tests/CustomResultSetOrderTestCase.php |   5 +-
 tests/EventListenerTestCase.php        | 426 ++++++++++++-------------
 tests/classes.php                      |  31 +-
 tests/run.php                          |   2 +-
 4 files changed, 244 insertions(+), 220 deletions(-)

diff --git a/tests/CustomResultSetOrderTestCase.php b/tests/CustomResultSetOrderTestCase.php
index 917fca2dc..43fc2de78 100644
--- a/tests/CustomResultSetOrderTestCase.php
+++ b/tests/CustomResultSetOrderTestCase.php
@@ -158,13 +158,12 @@ class Doctrine_CustomResultSetOrder_TestCase extends Doctrine_UnitTestCase {
             
             switch ($category->name) {
                 case 'First':
-                    // The first category should have 3 boards, right?
-                    // It has only 1! The other two slipped to the 2nd category!
+                    // The first category should have 3 boards
 
                     $this->assertEqual(3, $category->Boards->count());
                 break;
                 case 'Second':
-                    // The second category should have 1 board, but it got 3 now
+                    // The second category should have 1 board
 
                     $this->assertEqual(1, $category->Boards->count());
                 break;
diff --git a/tests/EventListenerTestCase.php b/tests/EventListenerTestCase.php
index fffff20ad..b98092f58 100644
--- a/tests/EventListenerTestCase.php
+++ b/tests/EventListenerTestCase.php
@@ -1,213 +1,213 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-
-/**
- * Doctrine_EventListener_TestCase
- *
- * @package     Doctrine
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- */
-class EventListenerTest extends Doctrine_Record {
-    public function setTableDefinition() {
-        $this->hasColumn("name", "string", 100);
-        $this->hasColumn("password", "string", 8);
-    }
-    public function setUp() {
-        $this->attribute(Doctrine::ATTR_LISTENER, new Doctrine_EventListener_AccessorInvoker());
-    }
-    public function getName($name) {
-        return strtoupper($name);
-    }
-    public function setPassword($password) {
-        return md5($password);
-    }
-}
-class Doctrine_EventListener_TestLogger implements Doctrine_Overloadable, Countable {
-    private $messages = array();
-
-    public function __call($m, $a) {
-
-        $this->messages[] = $m;
-    }
-    public function pop() {
-        return array_pop($this->messages);
-    }
-    public function clear() {
-        $this->messages = array();
-    }
-    public function getAll() {
-        return $this->messages;
-    }
-    public function count() {
-        return count($this->messages);
-    }
-}
-
-class Doctrine_EventListener_TestCase extends Doctrine_UnitTestCase {
-    private $logger;
-
-
-    public function testSetListener() {
-        $this->logger = new Doctrine_EventListener_TestLogger();
-    
-        $e = new EventListenerTest;
-        
-        $e->getTable()->setListener($this->logger);
-
-        $e->name = 'listener';
-        $e->save();
-
-        $this->assertEqual($e->getTable()->getListener(), $this->logger);
-    }
-    public function testOnLoad() {
-        $this->logger->clear();
-        $this->assertEqual($this->connection->getTable('EventListenerTest')->getListener(), $this->logger);
-        $this->connection->clear();
-
-        $e = $this->connection->getTable('EventListenerTest')->find(1);
-
-
-        $this->assertEqual($e->getTable()->getListener(), $this->logger);
-
-        $this->assertEqual($this->logger->pop(), 'onLoad');
-        $this->assertEqual($this->logger->pop(), 'onPreLoad');
-    }
-
-    public function testOnCreate() {
-        $e = new EventListenerTest;
-        
-
-        $e->setListener($this->logger);
-        $this->logger->clear();
-        $e = new EventListenerTest;
-
-        $this->assertEqual($this->logger->pop(), 'onCreate');
-        $this->assertEqual($this->logger->pop(), 'onPreCreate');
-        $this->assertEqual($this->logger->count(), 0);
-    }
-    public function testOnSleepAndOnWakeUp() {
-        $e = new EventListenerTest;
-
-        $this->logger->clear();
-
-        $s = serialize($e);
-
-        $this->assertEqual($this->logger->pop(), 'onSleep');
-        $this->assertEqual($this->logger->count(), 0);
-
-        $e = unserialize($s);
-
-        $this->assertEqual($this->logger->pop(), 'onWakeUp');
-        $this->assertEqual($this->logger->count(), 0);
-    }
-    public function testTransaction() {
-        $e = new EventListenerTest();
-        $e->name = "test 1";
-        
-        $this->logger->clear();
-
-        $e->save();
-
-        $this->assertEqual($this->logger->pop(), 'onSave');
-        $this->assertEqual($this->logger->pop(), 'onInsert');
-        $this->assertEqual($this->logger->pop(), 'onPreInsert');
-        $this->assertEqual($this->logger->pop(), 'onPreSave');
-        
-        $e->name = "test 2";
-
-        $e->save();
-
-        $this->assertEqual($this->logger->pop(), 'onSave');
-        $this->assertEqual($this->logger->pop(), 'onUpdate');
-        $this->assertEqual($this->logger->pop(), 'onPreUpdate');
-        $this->assertEqual($this->logger->pop(), 'onPreSave');
-        
-        $this->logger->clear();
-
-        $e->delete();
-
-        $this->assertEqual($this->logger->pop(), 'onDelete');
-        $this->assertEqual($this->logger->pop(), 'onPreDelete');
-    }
-    public function testTransactionWithConnectionListener() {
-        $e = new EventListenerTest();
-        $e->getTable()->getConnection()->setListener($this->logger);
-        
-        $e->name = "test 2";
-        
-        $this->logger->clear();
-        
-        $e->save();
-
-        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
-        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
-        $this->assertEqual($this->logger->pop(), 'onSave');
-        $this->assertEqual($this->logger->pop(), 'onInsert');
-        $this->assertEqual($this->logger->pop(), 'onPreInsert');
-        $this->assertEqual($this->logger->pop(), 'onPreSave');
-
-        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
-        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
-
-        $e->name = "test 1";
-
-        $e->save();
-
-        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
-        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
-        $this->assertEqual($this->logger->pop(), 'onSave');
-        $this->assertEqual($this->logger->pop(), 'onUpdate');
-        $this->assertEqual($this->logger->pop(), 'onPreUpdate');
-        $this->assertEqual($this->logger->pop(), 'onPreSave');
-
-        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
-        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
-
-        $this->logger->clear();
-
-        $e->delete();
-
-        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
-        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
-        $this->assertEqual($this->logger->pop(), 'onDelete');
-
-        $this->assertEqual($this->logger->pop(), 'onPreDelete');
-        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
-        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
-    
-        $this->connection->setListener(new Doctrine_EventListener());
-    }
-
-
-
-    public function prepareData() { }
-    public function prepareTables() {
-        $this->tables = array('EventListenerTest');
-        parent::prepareTables();
-    }
-
-}
-?>
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_EventListener_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class EventListenerTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn("name", "string", 100);
+        $this->hasColumn("password", "string", 8);
+    }
+    public function setUp() {
+        //$this->attribute(Doctrine::ATTR_LISTENER, new Doctrine_EventListener_AccessorInvoker());
+    }
+    public function getName($name) {
+        return strtoupper($name);
+    }
+    public function setPassword($password) {
+        return md5($password);
+    }
+}
+class Doctrine_EventListener_TestLogger implements Doctrine_Overloadable, Countable {
+    private $messages = array();
+
+    public function __call($m, $a) {
+
+        $this->messages[] = $m;
+    }
+    public function pop() {
+        return array_pop($this->messages);
+    }
+    public function clear() {
+        $this->messages = array();
+    }
+    public function getAll() {
+        return $this->messages;
+    }
+    public function count() {
+        return count($this->messages);
+    }
+}
+
+class Doctrine_EventListener_TestCase extends Doctrine_UnitTestCase {
+    private $logger;
+
+
+    public function testSetListener() {
+        $this->logger = new Doctrine_EventListener_TestLogger();
+    
+        $e = new EventListenerTest;
+        
+        $e->getTable()->setListener($this->logger);
+
+        $e->name = 'listener';
+        $e->save();
+
+        $this->assertEqual($e->getTable()->getListener(), $this->logger);
+    }
+    public function testOnLoad() {
+        $this->logger->clear();
+        $this->assertEqual($this->connection->getTable('EventListenerTest')->getListener(), $this->logger);
+        $this->connection->clear();
+
+        $e = $this->connection->getTable('EventListenerTest')->find(1);
+
+
+        $this->assertEqual($e->getTable()->getListener(), $this->logger);
+
+        $this->assertEqual($this->logger->pop(), 'onLoad');
+        $this->assertEqual($this->logger->pop(), 'onPreLoad');
+    }
+
+    public function testOnCreate() {
+        $e = new EventListenerTest;
+        
+
+        $e->setListener($this->logger);
+        $this->logger->clear();
+        $e = new EventListenerTest;
+
+        $this->assertEqual($this->logger->pop(), 'onCreate');
+        $this->assertEqual($this->logger->pop(), 'onPreCreate');
+        $this->assertEqual($this->logger->count(), 0);
+    }
+    public function testOnSleepAndOnWakeUp() {
+        $e = new EventListenerTest;
+
+        $this->logger->clear();
+
+        $s = serialize($e);
+
+        $this->assertEqual($this->logger->pop(), 'onSleep');
+        $this->assertEqual($this->logger->count(), 0);
+
+        $e = unserialize($s);
+
+        $this->assertEqual($this->logger->pop(), 'onWakeUp');
+        $this->assertEqual($this->logger->count(), 0);
+    }
+    public function testTransaction() {
+        $e = new EventListenerTest();
+        $e->name = "test 1";
+        
+        $this->logger->clear();
+
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+        
+        $e->name = "test 2";
+
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+        
+        $this->logger->clear();
+
+        $e->delete();
+
+        $this->assertEqual($this->logger->pop(), 'onDelete');
+        $this->assertEqual($this->logger->pop(), 'onPreDelete');
+    }
+    public function testTransactionWithConnectionListener() {
+        $e = new EventListenerTest();
+        $e->getTable()->getConnection()->setListener($this->logger);
+        
+        $e->name = "test 2";
+        
+        $this->logger->clear();
+        
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
+
+        $e->name = "test 1";
+
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
+
+        $this->logger->clear();
+
+        $e->delete();
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onDelete');
+
+        $this->assertEqual($this->logger->pop(), 'onPreDelete');
+        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
+    
+        $this->connection->setListener(new Doctrine_EventListener());
+    }
+
+
+
+    public function prepareData() { }
+    public function prepareTables() {
+        $this->tables = array('EventListenerTest');
+        parent::prepareTables();
+    }
+
+}
+?>
diff --git a/tests/classes.php b/tests/classes.php
index cf8f3ae9f..b79de31bc 100644
--- a/tests/classes.php
+++ b/tests/classes.php
@@ -695,9 +695,9 @@ class QueryTest_Entry extends Doctrine_Record
      */
     public function setTableDefinition()
     {        
-        $this->hasColumn('authorId as authorId', 'integer', 4,
+        $this->hasColumn('authorId', 'integer', 4,
                 array('notnull'));
-        $this->hasColumn('date as date', 'integer', 4,
+        $this->hasColumn('date', 'integer', 4,
                 array('notnull'));
     }
     
@@ -716,7 +716,32 @@ class QueryTest_User extends Doctrine_Record
     public function setTableDefinition()
     {        
         $this->hasColumn('username as username', 'string', 50,
-                array('notnull', 'unique'));
+                array('notnull'));
+        $this->hasColumn('visibleRankId', 'integer', 4);
+    }
+    
+    /**
+     * Runtime definition of the relationships to other entities.
+     */
+    public function setUp()
+    {
+        $this->hasOne('QueryTest_Rank as visibleRank', 'QueryTest_User.visibleRankId');
+    }
+}
+
+class QueryTest_Rank extends Doctrine_Record 
+{
+    /**
+     * Initializes the table definition.
+     */
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('title as title', 'string', 100,
+                array('notnull'));
+        $this->hasColumn('color as color', 'string', 20,
+                array('notnull', 'regexp' => '/^[a-zA-Z\-]{3,}|#[0-9a-fA-F]{6}$/D'));
+        $this->hasColumn('icon as icon', 'string', 50,
+                array('notnull', 'default' => ' ', 'regexp' => '/^[a-zA-Z0-9_\-]+\.(jpg|gif|png)$/D'));        
     }
 }
     
diff --git a/tests/run.php b/tests/run.php
index bd6f8910c..489b45ef6 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -222,7 +222,7 @@ $test->addTestCase(new Doctrine_ColumnAggregationInheritance_TestCase());
 
 $test->addTestCase(new Doctrine_ColumnAlias_TestCase());
 
-
+$test->addTestCase(new Doctrine_Query_OneToOneFetching_TestCase());
 
 $test->addTestCase(new Doctrine_Cache_Apc_TestCase());
 $test->addTestCase(new Doctrine_Cache_Memcache_TestCase());