Changeset 18801 for branches/version-2_5-dev/test/class/SC_Query_Test.php

Timestamp:

2010/09/09 18:05:15 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100909013100-rwua4q4xm052kab2

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
test/class/SC_Query_Test.php sc_query_test.php-20100803024127-ljzonih8f5jpan9o-1

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100909090512-qyyhgu9bnz0iwjna

bzr:revno:

2284

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-09-09 18:05:12.825000048 +0900

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-09-09T09:05:12.825000Z

Message:

SC_Query::getSql() の WHERE が動作していなかったため修正(#565)

File:

• branches/version-2_5-dev/test/class/SC_Query_Test.php (modified) (4 diffs)

branches/version-2_5-dev/test/class/SC_Query_Test.php

@@ -47 +47 @@
 
     function tearDown() {
-        $this->objQuery->rollback();
         // MySQL では CREATE TABLE がロールバックされないので DROP TABLE を行う
         $this->dropTestTable();
+        $this->objQuery->rollback();
         $this->objQuery = null;
     }
@@ -83 +83 @@
      */
     function testGetAll() {
-        $this->createTestTable();
+        $result = $this->createTestTable();
         $result = $this->setTestData(1, "2", "f");
 
@@ -94 +94 @@
         $this->verify();
     }
+
+    /**
+     * SC_Query::select() のテストケース.
+     */
+    function testSelect() {
+        $this->createTestTable();
+        $result = $this->setTestData(1, "2", "f");
+
+        $this->expected =  array(array("id" => "1",
+                                       "column1" => "1",
+                                       "column2" => "2",
+                                       "column3" => "f"));
+
+        $this->actual = $this->objQuery->setWhere("id = ?")
+                                       ->setOrder("id")
+                                       ->select("*", "test_table", "", array(1));
+
+        $this->verify();
+    }
+
 
     /**
@@ -253 +273 @@
 
     function dropTestTable() {
-        return $this->objQuery->query("DROP TABLE test_table");
+        $tables = $this->objQuery->listTables();
+        if (in_array("test_table", $tables)) {
+            $this->objQuery->query("DROP TABLE test_table");
+        }
+        return;
     }