added tests for expressions in DQL select part

tests/EventListener/ChainTestCase.php

@@ -29,6 +29,68 @@
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
- */
+ */   
 class Doctrine_EventListener_Chain_TestCase extends Doctrine_UnitTestCase {
+
+    public function testAccessorInvokerChain() {
+        $e = new EventListenerChainTest;
+        $e->name = "something";
+
+
+        $this->assertEqual($e->get('name'), 'somethingTestATestB');
+        // test repeated calls
+        $this->assertEqual($e->get('name'), 'somethingTestATestB');
+        $this->assertEqual($e->id, null);
+        $this->assertEqual($e->rawGet('name'), 'something');
+
+        $e->save();
+
+        $this->assertEqual($e->id, 1);
+        $this->assertEqual($e->name, 'somethingTestATestB');
+        $this->assertEqual($e->rawGet('name'), 'something');
+
+        $this->connection->clear();
+
+        $e->refresh();
+
+        $this->assertEqual($e->id, 1);
+        $this->assertEqual($e->name, 'somethingTestATestB');
+        $this->assertEqual($e->rawGet('name'), 'something');
+
+        $this->connection->clear();
+
+        $e = $e->getTable()->find($e->id);
+
+        $this->assertEqual($e->id, 1);
+        $this->assertEqual($e->name, 'somethingTestATestB');
+        $this->assertEqual($e->rawGet('name'), 'something');
+    }
+    public function prepareData() { }
+    public function prepareTables() {
+        $this->tables = array('EventListenerChainTest');
+        parent::prepareTables();
+    }
+}
+class EventListenerChainTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn("name", "string", 100);
+    }
+    public function setUp() {
+        $chain = new Doctrine_EventListener_Chain();
+        $chain->add(new Doctrine_EventListener_TestA());
+        $chain->add(new Doctrine_EventListener_TestB());
+        $this->setAttribute(Doctrine::ATTR_LISTENER, $chain);
+    }
 }
+
+class Doctrine_EventListener_TestA extends Doctrine_EventListener {
+    public function onGetProperty(Doctrine_Record $record, $property, $value) {
+        return $value . 'TestA';
+    }
+}
+class Doctrine_EventListener_TestB extends Doctrine_EventListener {
+    public function onGetProperty(Doctrine_Record $record, $property, $value) {
+        return $value . 'TestB';
+    }
+}
+

tests/Query/ExpressionTestCase.php

+<?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_Query_Expression_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @version     $Revision$
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ */
+class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase {
+    public function testUnknownExpressionInSelectClauseThrowsException() {
+        $q = new Doctrine_Query();
+        
+        try {
+            $q->parseQuery('SELECT SOMEUNKNOWNFUNC(u.name, " ", u.loginname) FROM User u');
+            $this->fail();
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testUnknownColumnWithinFunctionInSelectClauseThrowsException() {
+        $q = new Doctrine_Query();
+        
+        try {
+            $q->parseQuery('SELECT CONCAT(u.name, u.unknown) FROM User u');
+            $this->fail();
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testConcatIsSupportedInSelectClause() {
+        $q = new Doctrine_Query();
+        
+        $q->parseQuery('SELECT CONCAT(u.name, u.loginname) FROM User u');
+        
+        $this->assertEqual($q->getQuery(), 'SELECT CONCAT(e.name, e.loginname) AS e__0 FROM entity e WHERE (e.type = 0)');
+    }
+    public function testConcatInSelectClauseSupportsLiteralStrings() {
+        $q = new Doctrine_Query();
+        
+        $q->parseQuery("SELECT CONCAT(u.name, 'The Man') FROM User u");
+        
+        $this->assertEqual($q->getQuery(), "SELECT CONCAT(e.name, 'The Man') AS e__0 FROM entity e WHERE (e.type = 0)");
+    }
+    public function testConcatInSelectClauseSupportsMoreThanTwoArgs() {
+        $q = new Doctrine_Query();
+        
+        $q->parseQuery("SELECT CONCAT(u.name, 'The Man', u.loginname) FROM User u");
+        
+        $this->assertEqual($q->getQuery(), "SELECT CONCAT(e.name, 'The Man', e.loginname) AS e__0 FROM entity e WHERE (e.type = 0)");
+    }
+}