fix includes

[m6w6/pq-gateway] / tests / lib / pq / Gateway / RowsetTest.php

diff --git a/tests/lib/pq/Gateway/RowsetTest.php b/tests/lib/pq/Gateway/RowsetTest.php
index 6f16595994316ba4a49c0da7b89d275ca57bf463..84981a61dc591047dac7010c144dbbacaf49f93b 100644 (file)
--- a/tests/lib/pq/Gateway/RowsetTest.php
+++ b/tests/lib/pq/Gateway/RowsetTest.php
@@ -2,7 +2,7 @@
 
 namespace pq\Gateway;
 
-include_once __DIR__."/../../../setup.inc";
+require_once __DIR__."/../../../setup.inc";
 
 class RowsetTest extends \PHPUnit_Framework_TestCase {
 
@@ -71,7 +71,7 @@ class RowsetTest extends \PHPUnit_Framework_TestCase {
        }
        
        public function testCreateFail() {
-               $this->setExpectedException("\\pq\\Exception");
+               $this->setExpectedException("\\OutOfBoundsException");
                $rowset = new Rowset($this->table);
                $rowset->append(new Row($this->table, array("foo" => "bar"), true));
                $rowset->create();
@@ -111,12 +111,16 @@ class RowsetTest extends \PHPUnit_Framework_TestCase {
        }
 
        public function testJsonSerialize() {
-               $json = sprintf('[{"id":"1","created":"%s","counter":"-1","number":"-1.1","data":"yesterday"}'
-                       .',{"id":"2","created":"%s","counter":"0","number":"0","data":"today"}'
-                       .',{"id":"3","created":"%s","counter":"1","number":"1.1","data":"tomorrow"}]',
-                       new \pq\DateTime("yesterday"),
-                       new \pq\DateTime("today"),
-                       new \pq\DateTime("tomorrow")
+               $yday = new \pq\DateTime("yesterday");
+               $tday = new \pq\DateTime("today");
+               $tmrw = new \pq\DateTime("tomorrow");
+               
+               $yday->format = $tday->format = $tmrw->format = "Y-m-d H:i:s.u";
+               
+               $json = sprintf('[{"id":1,"created":"%s","counter":-1,"number":-1.1,"data":"yesterday","list":[-1,0,1],"prop":null}'
+                       .',{"id":2,"created":"%s","counter":0,"number":0,"data":"today","list":[0,1,2],"prop":null}'
+                       .',{"id":3,"created":"%s","counter":1,"number":1.1,"data":"tomorrow","list":[1,2,3],"prop":null}]',
+                       $yday, $tday, $tmrw
                );
                $this->assertJsonStringEqualsJsonString($json, json_encode($this->table->find()));
        }
@@ -155,4 +159,14 @@ class RowsetTest extends \PHPUnit_Framework_TestCase {
                $this->assertSame(array(), $rowset3->getRows());
                $this->assertCount(1, $rowset->filter(function($row) { return $row->id->get() == 1; }));
        }
+       
+       public function testApplyAppend() {
+               $rowset1 = $this->table->find(null, null, 1);
+               $rowset2 = $this->table->find(null, null, 1, 1);
+               $this->assertCount(1, $rowset1);
+               $this->assertCount(1, $rowset2);
+               $rowset2->apply(array($rowset1, "append"));
+               $this->assertCount(1, $rowset2);
+               $this->assertCount(2, $rowset1);
+       }
 }