test fixups

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

diff --git a/tests/lib/pq/Gateway/TableTest.php b/tests/lib/pq/Gateway/TableTest.php
index f3d955819c4e25ba6eeecf35c6e3064aa3431cf7..a43634cf203114fee18a5f9a54d4ade57cce53c8 100644 (file)
--- a/tests/lib/pq/Gateway/TableTest.php
+++ b/tests/lib/pq/Gateway/TableTest.php
@@ -18,17 +18,14 @@ class TableTest extends \PHPUnit_Framework_TestCase {
 
        protected function setUp() {
                $this->conn = new \pq\Connection(PQ_TEST_DSN);
-               $this->conn->exec(PQ_TEST_TABLE_CREATE);
-               $this->conn->exec(PQ_TEST_REFTABLE_CREATE);
-               $this->conn->exec(PQ_TEST_DATA);
+               $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_REFTABLE_DROP);
-               $this->conn->exec(PQ_TEST_TABLE_DROP);
+               $this->conn->exec(PQ_TEST_TEARDOWN_SQL);
        }
        
        public function testSetRowsetPrototype() {
@@ -70,14 +67,14 @@ class TableTest extends \PHPUnit_Framework_TestCase {
        public function testUpdate() {
                $row = $this->table->create(array())->current();
                $data = array(
-                       "created" => "2013-03-03 03:03:03",
+                       "created" => new \pq\DateTime("2013-03-03 03:03:03"),
                        "counter" => 2,
                        "number" => 2.2,
                        "data" => "this is a test",
                );
                $row = $this->table->update(array("id = " => $row->id), $data)->current();
                $data = array("id" => $row->id->get()) + $data;
-               $this->assertSame(array_map(function($v){return strval($v);}, $data), $row->getData());
+               $this->assertEquals(array_map(function($v){return strval($v);}, $data), $row->getData());
        }
 
        public function testDelete() {
@@ -91,7 +88,7 @@ class TableTest extends \PHPUnit_Framework_TestCase {
                $this->assertCount(1, $rowset);
                $this->assertEquals(array(
                        "id" => 2,
-                       "created" => date_create("today")->format("Y-m-d H:i:s"),
+                       "created" => new \pq\DateTime("today"),
                        "counter" => 0,
                        "number" => 0,
                        "data" => "today"