Changeset 21015 for branches/version-2_11-dev/test

Timestamp:

2011/07/05 14:35:37 (12 years ago)

Author:

habu

Message:

PHPUtilテストが実行できる様に修正 (コンパイルエラーになる部分について修正)

Location:

branches/version-2_11-dev/test/class

Files:

• helper/Helper_AllTests.php (modified) (2 diffs)
• helper/SC_Helper_DB_Test.php (modified) (1 diff)
• helper/SC_Helper_Session_Test.php (added)
• page/LC_Page_Test.php (modified) (3 diffs)

branches/version-2_11-dev/test/class/helper/Helper_AllTests.php

@@ -25 +25 @@
 require_once(realpath(dirname(__FILE__)) . "/../../require.php");
 require_once(realpath(dirname(__FILE__)) . "/SC_Helper_DB_Test.php");
+require_once(realpath(dirname(__FILE__)) . "/SC_Helper_Session_Test.php");
 
 /**
@@ -38 +39 @@
         $suite = new PHPUnit_Framework_TestSuite('SC_Helper');
         $suite->addTestSuite('SC_Helper_DB_Test');
+        $suite->addTestSuite('SC_Helper_Session_Test');
         return $suite;
     }

branches/version-2_11-dev/test/class/helper/SC_Helper_DB_Test.php

@@ -42 +42 @@
         $this->assertEquals(true, $objDb->sfColumnExists("mtb_zip", "zipcode"));
     }
-
-    function testSfIndexExists() {
-        $objDb = new SC_Helper_DB_Ex();
-        $this->assertEquals(true, $objDb->sfIndexExists("dtb_products",
-                                                        "product_id",
-                                                        "dtb_products_pkey"));
-    }
 }
 ?>

branches/version-2_11-dev/test/class/page/LC_Page_Test.php

@@ -24 +24 @@
 // {{{ requires
 require_once(realpath(dirname(__FILE__)) . '/../../require.php');
-require_once(realpath(dirname(__FILE__)) . '/../../../data/class/pages/LC_Page_Ex.php');
+require_once(realpath(dirname(__FILE__)) . '/../../../data/class/pages/LC_Page.php');
 
 /**
@@ -72 +72 @@
         $objPage = new LC_Page();
 
-        $token = $objPage->getToken();
+        $objPage->setTokenTo();
+        $token = $objPage->transactionid;
 
         // 40文字の16進数
@@ -79 +80 @@
         // セッションに文字列が格納されているか
         $this->assertEquals($token, $_SESSION[TRANSACTION_ID_NAME]);
-    }
-
-    /**
-     * LC_Page::isValidToken() のテストケース(POST).
-     */
-    function testIsValidToken() {
-        $objPage = new LC_Page();
-
-        $token = $objPage->getToken();
-
-        // POST でトークンを渡す.
-        $_POST[TRANSACTION_ID_NAME] = $token;
-
-        $this->assertEquals(true, $objPage->isValidToken());
-        unset($_POST[TRANSACTION_ID_NAME]);
-    }
-
-    /**
-     * LC_Page::isValidToken() のテストケース(GET).
-     */
-    function testIsValidTokenWithGET() {
-        $objPage = new LC_Page();
-
-        $token = $objPage->getToken();
-
-        // GET でトークンを渡す.
-        $_GET[TRANSACTION_ID_NAME] = $token;
-
-        $this->assertEquals(true, $objPage->isValidToken());
-        unset($_GET[TRANSACTION_ID_NAME]);
-    }
-
-
-    /**
-     * LC_Page::isValidToken() のテストケース(エラー).
-     *
-     * 値が渡されてない場合
-     */
-    function testIsValidTokenNotParam() {
-
-        $objPage = new LC_Page();
-
-        $token = $objPage->getToken();
-
-        // 値を渡さなければ falsel
-        $this->assertEquals(false, $objPage->isValidToken());
-    }
-
-    /**
-     * LC_Page::createToken() のテストケース.
-     */
-    function testCreateToken() {
-        // 40文字の16進数
-        $this->assertEquals(1, preg_match("/[a-f0-9]{40,}/", LC_Page::createToken()));
     }