Changeset 23542 for branches/version-2_13-dev/tests/class

Timestamp:

2014/06/11 13:42:24 (12 years ago)

Author:

h_yoshimoto

Message:

#2578 version-2_13_2の内容をdevにmerge
r23408,r23412,r23420

Location:

branches/version-2_13-dev/tests/class/helper/SC_Helper_Address

Files:

• SC_Helper_Address_deleteAddressTest.php (modified) (2 diffs)
• SC_Helper_Address_getAddressTest.php (modified) (4 diffs)

branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php

@@ -13 +13 @@
         parent::setUp();
         $this->objAddress = new SC_Helper_Address_Ex();
-        $_SESSION['customer']['customer_id'] = 1; // 会員じゃないとテストが落ちる
     }
 
@@ -27 +26 @@
         $this->setUpAddress();
         $other_deliv_id = '1000';
+        $customer_id = 1;
         $this->expected = NULL;
-        $this->objAddress->deleteAddress($other_deliv_id);
+        $this->objAddress->deleteAddress($other_deliv_id, $customer_id);
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $select = '*';
         $from = 'dtb_other_deliv';
-        $where = 'other_deliv_id = ?';
-        $whereVal = array($other_deliv_id);
+        $where = 'other_deliv_id = ? AND customer_id = ?';
+        $whereVal = array($other_deliv_id, $customer_id);
         $this->actual = $objQuery->getRow($select, $from, $where, $whereVal);
 
         $this->verify('登録配送先削除');
     }
+
+    public function testdeleteAddressTest_会員IDを設定しない場合_FALSEを返す()
+    {
+        $this->setUpAddress();
+        $other_deliv_id = '1000';
+        $this->expected = FALSE;
+        $this->actual = $this->objAddress->deleteAddress($other_deliv_id);
+
+        $this->verify('登録配送先削除');
+    }
 }

branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php

@@ -13 +13 @@
         parent::setUp();
         $this->objAddress = new SC_Helper_Address_Ex();
-        $_SESSION['customer']['customer_id'] = 1; // 会員じゃないとテストが落ちる
     }
 
@@ -28 +27 @@
         $this->setUpAddress();
         $other_deliv_id = '999';
+        $customer_id = 1;
+        $this->expected = FALSE;
+        $this->actual = $this->objAddress->getAddress($other_deliv_id, $customer_id);
+
+        $this->verify('登録配送先取得');
+    }
+    
+    public function testgetAddressTest_会員IDを設定しない場合_FALSEを返す()
+    {
+        $this->setUpAddress();
+        $other_deliv_id = '1001';
         $this->expected = FALSE;
         $this->actual = $this->objAddress->getAddress($other_deliv_id);
@@ -38 +48 @@
         $this->setUpAddress();
         $other_deliv_id = '1001';
+        $customer_id = 1;
         $this->expected = array(
                 'other_deliv_id' => '1001',
@@ -60 +71 @@
                 'zipcode' => null
             );
-        $this->actual = $this->objAddress->getAddress($other_deliv_id);
+        $this->actual = $this->objAddress->getAddress($other_deliv_id, $customer_id);
 
         $this->verify('登録配送先取得');