[Svn-src-all:3920] [version-2_12-dev 22834] #2236 r22818 の対応漏れを対応します

[m_uehara]

Subversion committed to /home/svn/open 22834
http://svn.ec-cube.net/open_trac/changeset/22834
┌────────────────────────────┐
│更新者　:  m_uehara                                     │
│更新日時:  2013-05-21 13:51:14 +0900 (火, 21  5月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2236 r22818 の対応漏れを対応します

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php

変更: branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php	2013-05-21 03:01:24 UTC (rev 22833)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php	2013-05-21 04:51:14 UTC (rev 22834)
@@ -56,13 +56,13 @@
         $this->objQuery->rollback();
     }
 
-    function testSave() {
+    function testRegistAddress() {
         // ダミーの住所を登録
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         // 検証用の住所02
         $sqlval['addr02'] = $create_test = 'create test ' . time();
-        $this->objAddress->save($sqlval);
+        $this->objAddress->registAddress($sqlval);
 
         // 住所02が検証用のものと同じか確認
         $this->objQuery->setOrder('other_deliv_id DESC');
@@ -72,7 +72,7 @@
         $sqlval['other_deliv_id'] = $created_address['other_deliv_id'];
         // 更新の検証のために住所02を変更
         $sqlval['addr02'] = $update_test = 'update test ' . time();
-        $this->objAddress->save($sqlval);
+        $this->objAddress->registAddress($sqlval);
 
         // 住所02が検証用のものと同じか検証
         $this->objQuery->setOrder('other_deliv_id DESC');
@@ -83,16 +83,16 @@
     /**
      * @depends testSave
      */
-    function testGet() {
+    function testGetAddress() {
         // testSave のテストが通っていること前提
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         $sqlval['addr02'] = 'get test';
-        $this->objAddress->save($sqlval);
+        $this->objAddress->registAddress($sqlval);
         $this->objQuery->setOrder('other_deliv_id DESC');
         $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
         // DBに正しく記録され、取得できているか確認
-        $address = $this->objAddress->get($other_deliv_id);
+        $address = $this->objAddress->getAddress($other_deliv_id);
         $result = TRUE;
         foreach ($sqlval as $key => $value) {
             if ($value != $address[$key]) {
@@ -110,7 +110,7 @@
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         $sqlval['addr02'] = 'getList test';
-        $this->objAddress->save($sqlval);
+        $this->objAddress->registAddress($sqlval);
         $list = $this->objAddress->getList($this->customer_id);
         $found = FALSE;
         foreach ($list as $address) {
@@ -131,15 +131,15 @@
     /**
      * @depends testSave
      */
-    function testDelete() {
+    function testDeleteAddress() {
         // testSave のテストが通っていること前提
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         $sqlval['addr02'] = 'delete test';
-        $this->objAddress->save($sqlval);
+        $this->objAddress->registAddress($sqlval);
         $this->objQuery->setOrder('other_deliv_id DESC');
         $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
-        $this->objAddress->delete($other_deliv_id);
+        $this->objAddress->deleteAddress($other_deliv_id);
         $result = $this->objQuery->getRow('*', 'dtb_other_deliv', 'customer_id = ? and other_deliv_id = ?', array($this->customer_id, $other_deliv_id));
         $this->assertNull($result);
     }