X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fpq-gateway;a=blobdiff_plain;f=tests%2Flib%2Fpq%2FGateway%2FRowsetTest.php;h=6f16595994316ba4a49c0da7b89d275ca57bf463;hp=7ef1a0eb21721a374ba36b41c59108197b08b387;hb=348c73cdaf65cf9df2d6f582a96bf8694f1255f5;hpb=e2709f3f6de6d5c5ba272d353db16b015b5258b3

diff --git a/tests/lib/pq/Gateway/RowsetTest.php b/tests/lib/pq/Gateway/RowsetTest.php
index 7ef1a0e..6f16595 100644
--- a/tests/lib/pq/Gateway/RowsetTest.php
+++ b/tests/lib/pq/Gateway/RowsetTest.php
@@ -17,16 +17,15 @@ class RowsetTest extends \PHPUnit_Framework_TestCase {
 	protected $table;
 
 	protected function setUp() {
-		$this->conn = new \pq\Connection(PQ_DSN);
-		$this->conn->exec(PQ_TEST_DROP_TABLE);
-		$this->conn->exec(PQ_TEST_CREATE_TABLE);
-		$this->conn->exec(PQ_TEST_CREATE_DATA);
-		
-		$this->table = new Table(PQ_TEST_TABLE_NAME, $this->conn);
+		$this->conn = new \pq\Connection(PQ_TEST_DSN);
+		$this->conn->exec(PQ_TEST_SETUP_SQL);
+		Table::$defaultConnection = $this->conn;
+		$this->table = new Table("test");
+		$this->table->getQueryExecutor()->attach(new \QueryLogger());
 	}
 
 	protected function tearDown() {
-		$this->conn->exec(PQ_TEST_DROP_TABLE);
+		$this->conn->exec(PQ_TEST_TEARDOWN_SQL);
 	}
 
 	public function test__invoke() {
@@ -106,7 +105,7 @@ class RowsetTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testDeleteFail() {
-		$this->setExpectedException("pq\\Exception");
+		$this->setExpectedException("Exception");
 		$rowset = new Rowset($this->table);
 		$rowset->append(new Row($this->table, array("xx" => 0)))->delete();
 	}
@@ -115,9 +114,9 @@ class RowsetTest extends \PHPUnit_Framework_TestCase {
 		$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"}]',
-			date("Y-m-d H:i:s", strtotime("yesterday")),
-			date("Y-m-d H:i:s", strtotime("today")),
-			date("Y-m-d H:i:s", strtotime("tomorrow"))
+			new \pq\DateTime("yesterday"),
+			new \pq\DateTime("today"),
+			new \pq\DateTime("tomorrow")
 		);
 		$this->assertJsonStringEqualsJsonString($json, json_encode($this->table->find()));
 	}