Fix tests

Author: iherwig

src/wcmf/lib/core/impl/DefaultSession.php

@@ -34,22 +34,25 @@ class DefaultSession implements Session {
    * @param $configuration
    */
   public function __construct(Configuration $configuration) {
-    // session configuration
-    ini_set('session.cookie_lifetime', 0);
-    ini_set('session.use_cookies', 1);
-    ini_set('session.use_only_cookies', 1);
-    ini_set('session.use_strict_mode', 1);
-    ini_set('session.cookie_httponly', 1);
-    ini_set('session.cookie_secure', (URIUtil::isHttps() ? 1 : 0));
-    ini_set('session.use_trans_sid', 0);
-    ini_set('session.cache_limiter', 'nocache');
-    ini_set('session.hash_function', 1);
-    if (in_array('sha256', hash_algos())) {
-      ini_set('session.hash_function', 'sha256');
-    }
-    $this->cookiePrefix = strtolower(StringUtil::slug($configuration->getValue('title', 'application')));
+    // NOTE: prevent "headers already sent" errors in phpunit tests
+    if (!headers_sent()) {
+      // session configuration
+      ini_set('session.cookie_lifetime', 0);
+      ini_set('session.use_cookies', 1);
+      ini_set('session.use_only_cookies', 1);
+      ini_set('session.use_strict_mode', 1);
+      ini_set('session.cookie_httponly', 1);
+      ini_set('session.cookie_secure', (URIUtil::isHttps() ? 1 : 0));
+      ini_set('session.use_trans_sid', 0);
+      ini_set('session.cache_limiter', 'nocache');
+      ini_set('session.hash_function', 1);
+      if (in_array('sha256', hash_algos())) {
+        ini_set('session.hash_function', 'sha256');
+      }
+      $this->cookiePrefix = strtolower(StringUtil::slug($configuration->getValue('title', 'application')));
 
-    session_name($this->getCookieName());
+      session_name($this->getCookieName());
+    }
   }
 
   public function __destruct() {

src/wcmf/lib/model/mapper/SelectStatement.php

@@ -157,7 +157,7 @@ public function getParameters($stripColons=false) {
   public function getRowCount() {
     $mapper = ObjectFactory::getInstance('persistenceFacade')->getMapper($this->type);
     if ($this->table) {
-      $table = !is_array($this->table) ? $this-> table : key($this->table);
+      $table = !is_array($this->table) ? $this->table : key($this->table);
       // use pk columns for counting
       $countColumns = array_map(function($valueName) use ($mapper, $table) {
         return $mapper->quoteIdentifier($table).'.'.$mapper->quoteIdentifier($mapper->getAttribute($valueName)->getColumn());
@@ -191,6 +191,8 @@ public function getRowCount() {
     try {
       $result = $countStatement->query();
       $row = $result->fetch();
+      // update cache with count query
+      $this->cachedSql = array_merge($this->cachedSql, $countStatement->cachedSql);
       return $row['nRows'];
     }
     catch (\Exception $ex) {
@@ -272,6 +274,10 @@ public function getAliasNames($table) {
    * @return String
    */
   public function getSql() {
+    if ($this->id == self::NO_CACHE) {
+      return trim((new Sql($this->getAdapter()))->buildSqlString($this));
+    }
+
     $cacheKey = self::getCacheId($this->id);
     if (!isset($this->cachedSql[$cacheKey])) {
       $sql = trim((new Sql($this->getAdapter()))->buildSqlString($this));
@@ -328,7 +334,7 @@ protected static function getCacheId($id) {
    */
 
   public function __sleep() {
-    return ['id', 'type', 'meta', 'cachedSql', 'specifications'];
+    return ['id', 'type', 'table', 'meta', 'cachedSql', 'specifications'];
   }
 
   public function __wakeup() {

src/wcmf/test/configuration.xml

@@ -51,6 +51,7 @@
       <file>tests/persistence/PersistentObjectTest.php</file>
       <file>tests/persistence/RDBMapperTest.php</file>
       <file>tests/persistence/RelationDescriptionTest.php</file>
+      <file>tests/persistence/SelectTest.php</file>
       <file>tests/persistence/SortTest.php</file>
       <file>tests/persistence/StringQueryTest.php</file>
       <file>tests/persistence/TransactionTest.php</file>

src/wcmf/test/tests/persistence/SelectTest.php

@@ -64,7 +64,7 @@ protected function getDataSet() {
     ]);
   }
 
-  public function testSimple() {
+  public function testWithCache() {
     $selectId = __CLASS__.__METHOD__;
     $time = time();
 
@@ -76,12 +76,15 @@ public function testSimple() {
     $select->columns(['id']);
     $select->where('id = :id');
     $select->setParameters([':id' => 203]);
+    $this->assertEquals(1, $select->getRowCount());
+
     $result = $select->query();
     $rows = $result->fetchAll();
 
     $this->assertEquals(1, sizeof($rows));
     $this->assertEquals(203, $rows[0][0]);
     $this->assertEquals(203, $rows[0]['id']);
+    $this->assertEquals(1, $select->getRowCount());
 
     // test cache
     $select->save();
@@ -90,6 +93,49 @@ public function testSimple() {
     $select2 = SelectStatement::get($mapper, $selectId);
     $this->assertEquals($selectId, $select2->getId());
     $this->assertEquals($time, $select2->getMeta('created'));
+
+    $select2->where('id = :id');
+    $select2->setParameters([':id' => 203]);
+    $this->assertEquals(1, $select2->getRowCount());
+
+    $result2 = $select2->query();
+    $rows2 = $result2->fetchAll();
+
+    $this->assertEquals(1, sizeof($rows2));
+    $this->assertEquals(203, $rows2[0][0]);
+    $this->assertEquals(203, $rows2[0]['id']);
+    $this->assertEquals(1, $select2->getRowCount());
+}
+
+  public function testWithoutCache() {
+    $selectId = __CLASS__.__METHOD__;
+    $time = time();
+
+    $persistenceFacade = ObjectFactory::getInstance('persistenceFacade');
+    $mapper = $persistenceFacade->getMapper('Chapter');
+    $select = SelectStatement::get($mapper);
+    $select->from('Chapter');
+    $this->assertEquals(3, $select->getRowCount());
+
+    $result = $select->query();
+    $rows = $result->fetchAll();
+
+    $this->assertEquals(3, sizeof($rows));
+    $this->assertEquals(300, $rows[0][0]);
+    $this->assertEquals(300, $rows[0]['id']);
+    $this->assertEquals(302, $rows[1][0]);
+    $this->assertEquals(302, $rows[1]['id']);
+    $this->assertEquals(303, $rows[2][0]);
+    $this->assertEquals(303, $rows[2]['id']);
+    $this->assertEquals(3, $select->getRowCount());
+
+    // test cache
+    $select->save();
+    $this->assertFalse($select->isCached());
+
+    $select2 = SelectStatement::get($mapper);
+    $select2->from('Chapter');
+    $this->assertEquals(3, $select2->getRowCount());
   }
 
   public function testMapper() {