Ignore:
Timestamp:
2013/05/02 18:11:36 (11 years ago)
Author:
h_yoshimoto
Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php

    r22567 r22796  
    5757    } 
    5858 
    59     function testRegistAddress() 
    60     { 
     59    function testSave() { 
    6160        // ダミーの住所を登録 
    6261        $sqlval = $this->dummy; 
     
    6463        // 検証用の住所02 
    6564        $sqlval['addr02'] = $create_test = 'create test ' . time(); 
    66         $this->objAddress->registAddress($sqlval); 
     65        $this->objAddress->save($sqlval); 
    6766 
    6867        // 住所02が検証用のものと同じか確認 
     
    7473        // 更新の検証のために住所02を変更 
    7574        $sqlval['addr02'] = $update_test = 'update test ' . time(); 
    76         $this->objAddress->registAddress($sqlval); 
     75        $this->objAddress->save($sqlval); 
    7776 
    7877        // 住所02が検証用のものと同じか検証 
     
    8584     * @depends testSave 
    8685     */ 
    87     function testGetAddress() 
    88     { 
     86    function testGet() { 
    8987        // testSave のテストが通っていること前提 
    9088        $sqlval = $this->dummy; 
    9189        $sqlval['customer_id'] = $this->customer_id; 
    9290        $sqlval['addr02'] = 'get test'; 
    93         $this->objAddress->registAddress($sqlval); 
     91        $this->objAddress->save($sqlval); 
    9492        $this->objQuery->setOrder('other_deliv_id DESC'); 
    9593        $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id)); 
    9694        // DBに正しく記録され、取得できているか確認 
    97         $address = $this->objAddress->getAddress($other_deliv_id); 
     95        $address = $this->objAddress->get($other_deliv_id); 
    9896        $result = TRUE; 
    9997        foreach ($sqlval as $key => $value) { 
     
    108106     * @depends testSave 
    109107     */ 
    110     function testGetList() 
    111     { 
     108    function testGetList() { 
    112109        // testSave のテストが通っていること前提 
    113110        $sqlval = $this->dummy; 
    114111        $sqlval['customer_id'] = $this->customer_id; 
    115112        $sqlval['addr02'] = 'getList test'; 
    116         $this->objAddress->registAddress($sqlval); 
     113        $this->objAddress->save($sqlval); 
    117114        $list = $this->objAddress->getList($this->customer_id); 
    118115        $found = FALSE; 
     
    135132     * @depends testSave 
    136133     */ 
    137     function testDeleteAddress() 
    138     { 
     134    function testDelete() { 
    139135        // testSave のテストが通っていること前提 
    140136        $sqlval = $this->dummy; 
    141137        $sqlval['customer_id'] = $this->customer_id; 
    142138        $sqlval['addr02'] = 'delete test'; 
    143         $this->objAddress->registAddress($sqlval); 
     139        $this->objAddress->save($sqlval); 
    144140        $this->objQuery->setOrder('other_deliv_id DESC'); 
    145141        $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id)); 
    146         $this->objAddress->deleteAddress($other_deliv_id); 
     142        $this->objAddress->delete($other_deliv_id); 
    147143        $result = $this->objQuery->getRow('*', 'dtb_other_deliv', 'customer_id = ? and other_deliv_id = ?', array($this->customer_id, $other_deliv_id)); 
    148144        $this->assertNull($result); 
Note: See TracChangeset for help on using the changeset viewer.