Changeset 20467 for branches/version-2_5-dev/test

Timestamp:

2011/03/03 12:02:18 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php lc_page_shopping_loa-20101025071457-rpmc2g2y1ik9lyow-1
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php 16839@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fupgrade%2Fhelper%2FLC_Upgrade_Helper_Json.php
test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php lc_page_shopping_loa-20101025071501-16934ygv2y12gz92-1

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

3194

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php [email protected]
test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php [email protected]

bzr:timestamp:

2011-03-03 12:02:14.236999989 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-03T03:02:14.237000Z

Message:

#842(決済モジュールから load_payment_module へ戻った場合の挙動の改善)

• 受注フローの変更に伴い, LC_Page_Shopping_LoadPaymentModule.php を修正

File:

• branches/version-2_5-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php (modified) (3 diffs)

branches/version-2_5-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php

@@ -46 +46 @@
     }
 
-    function testGetPaymentIdBySession() {
-        $_SESSION['payment_id'] = 1;
-        $_GET['payment_id'] = 2;
-        $_POST['payment_id'] = 3;
+    function testGetOrderIdBySession() {
+        $_SESSION['order_id'] = 1;
+        $_GET['order_id'] = 2;
+        $_POST['order_id'] = 3;
 
-        $this->expected = $_SESSION['payment_id'];
-        $this->actual = $this->objPage->getPaymentId();
+        $this->expected = $_SESSION['order_id'];
+        $this->actual = $this->objPage->getOrderId();
 
         $this->verify();
     }
 
-    function testGetPaymentIdByPOST() {
-        $_GET['payment_id'] = 1;
-        $_POST['payment_id'] = 1;
+    function testGetOrderIdByPOST() {
+        $_GET['order_id'] = 1;
+        $_POST['order_id'] = 1;
 
-        $this->expected = $_POST['payment_id'];
-        $this->actual = $this->objPage->getPaymentId();
+        $this->expected = $_POST['order_id'];
+        $this->actual = $this->objPage->getOrderId();
 
         $this->verify();
     }
 
-    function testGetPaymentIdByGET() {
-        $_GET['payment_id'] = 2;
+    function testGetOrderIdByGET() {
+        $_GET['order_id'] = 2;
 
-        $this->expected = $_GET['payment_id'];
-        $this->actual = $this->objPage->getPaymentId();
+        $this->expected = $_GET['order_id'];
+        $this->actual = $this->objPage->getOrderId();
 
         $this->verify();
     }
 
-    function testGetPaymentIdIsNull() {
-        $this->assertFalse($this->objPage->getPaymentId());
+    function testGetOrderIdIsNull() {
+        $this->assertFalse($this->objPage->getOrderId());
     }
 
     function testGetModulePath() {
+        $order_id = 10000;
         $payment_id = 10000;
         $module_path = __FILE__;
-        $this->setPayment($payment_id, $module_path);
+        $this->setPayment($order_id, $payment_id, $module_path);
 
         $this->expected = __FILE__;
-        $this->actual = $this->objPage->getModulePath($payment_id);
+        $this->actual = $this->objPage->getModulePath($order_id);
 
         $this->verify();
@@ -92 +93 @@
 
     function testGetModulePathIsFailure() {
+        $order_id = 10000;
         $payment_id = 10000;
         $module_path = "aaa";
-        $this->setPayment($payment_id, $module_path);
+        $this->setPayment($order_id, $payment_id, $module_path);
 
-        $this->actual = $this->objPage->getModulePath($payment_id);
+        $this->actual = $this->objPage->getModulePath($order_id);
 
         $this->assertFalse($this->actual);
@@ -106 +108 @@
     }
 
-    function setPayment($payment_id, $module_path) {
-        $this->objQuery->insert("dtb_payment", array('payment_id' => $payment_id,
+    function setPayment($order_id, $payment_id, $module_path) {
+        $this->objQuery->insert('dtb_order', array('order_id' => $order_id,
+                                                   'customer_id' => (int) 0,
+                                                   'payment_id' => $payment_id,
+                                                   'create_date' => 'now()',
+                                                   'update_date' => 'now()'));
+
+        $this->objQuery->insert("dtb_payment", array('payment_id' => $order_id,
                                                      'module_path' => $module_path,
-                                                     'creator_id' => 1));
+                                                     'creator_id' => 1,
+                                                     'create_date' => 'now()',
+                                                     'update_date' => 'now()'));
     }
 }