[Svn-src-all:3653] [version-2_12-dev 22565] #2150 (改行コードの調整)
shutta
admin ＠ mail.ec-cube.net
2013年 2月 18日 (月) 18:02:57 JST
Subversion committed to /home/svn/open 22565
http://svn.ec-cube.net/open_trac/changeset/22565
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2013-02-18 18:02:57 +0900 (月, 18 2月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2150 (改行コードの調整)
改行コードを調整(CRLF -> LF)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch
U branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php
U branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php
変更: branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch
===================================================================
--- branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch 2013-02-18 08:58:21 UTC (rev 22564)
+++ branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch 2013-02-18 09:02:57 UTC (rev 22565)
@@ -1,14 +1,14 @@
-Index: Mobile.php
-
---- data/module/Net/UserAgent/Mobile.php ベース (BASE)
-+++ data/module/Net/UserAgent/Mobile.php ローカルでの変更 (LOCAL がベース)
-@@ -424,7 +424,8 @@
- 'blackberry9800', // Torch
- 'webOS', // Palm Pre Experimental
- 'incognito', // Other iPhone browser
-- 'webmate' // Other iPhone browser
-+ 'webmate', // Other iPhone browser
-+ 'Windows Phone OS' // Windows Phone
- );
-
- $pattern = implode("|", $useragents);
+Index: Mobile.php
+
+--- data/module/Net/UserAgent/Mobile.php ベース (BASE)
++++ data/module/Net/UserAgent/Mobile.php ローカルでの変更 (LOCAL がベース)
+@@ -424,7 +424,8 @@
+ 'blackberry9800', // Torch
+ 'webOS', // Palm Pre Experimental
+ 'incognito', // Other iPhone browser
+- 'webmate' // Other iPhone browser
++ 'webmate', // Other iPhone browser
++ 'Windows Phone OS' // Windows Phone
+ );
+
+ $pattern = implode("|", $useragents);
変更: 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-02-18 08:58:21 UTC (rev 22564)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php 2013-02-18 09:02:57 UTC (rev 22565)
@@ -1,146 +1,146 @@
-<?php
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- * Description of SC_Helper_Address_Test
- *
- * @author cyberwill
- */
-class SC_Helper_Address_Test extends PHPUnit_Framework_TestCase
-{
- public $objQuery = "";
- public $objAddress = "";
- public $customer_id = "";
-
- public $dummy = array(
- 'name01' => '追加',
- 'name02' => '住所',
- 'kana01' => 'ツイカ',
- 'kana02' => 'ジュウショ',
- 'zip01' => '123',
- 'zip02' => '4567',
- 'pref' => '23',
- 'addr01' => 'その他のお届け先',
- 'addr02' => '',
- 'tel01' => '0123',
- 'tel02' => '4567',
- 'tel03' => '8901',
- 'fax01' => '',
- 'fax02' => '',
- 'fax03' => '',
- );
-
- /**
- * Sets up the fixture, for example, opens a network connection.
- * This method is called before a test is executed.
- */
- protected function setUp()
- {
- $this->objQuery =& SC_Query::getSingletonInstance();
- $this->objQuery->begin();
- $arrRet = $this->objQuery->getOne('SELECT MAX(customer_id) FROM dtb_customer');
- $this->customer_id = $arrRet;
- $this->objAddress = new SC_Helper_Address_Ex();
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- protected function tearDown()
- {
- $this->objQuery->rollback();
- }
-
- function testRegistAddress() {
- // ダミーの住所を登録
- $sqlval = $this->dummy;
- $sqlval['customer_id'] = $this->customer_id;
- // 検証用の住所02
- $sqlval['addr02'] = $create_test = 'create test ' . time();
- $this->objAddress->registAddress($sqlval);
-
- // 住所02が検証用のものと同じか確認
- $this->objQuery->setOrder('other_deliv_id DESC');
- $created_address = $this->objQuery->getRow('other_deliv_id, addr02', 'dtb_other_deliv', 'customer_id = ?', array($this->customer_id));
- $this->assertEquals($create_test, $created_address['addr02']);
-
- $sqlval['other_deliv_id'] = $created_address['other_deliv_id'];
- // 更新の検証のために住所02を変更
- $sqlval['addr02'] = $update_test = 'update test ' . time();
- $this->objAddress->registAddress($sqlval);
-
- // 住所02が検証用のものと同じか検証
- $this->objQuery->setOrder('other_deliv_id DESC');
- $updated_address = $this->objQuery->getRow('addr02', 'dtb_other_deliv', 'other_deliv_id = ?', array($created_address['other_deliv_id']));
- $this->assertEquals($update_test, $updated_address['addr02']);
- }
-
- /**
- * @depends testSave
- */
- function testGetAddress() {
- // testSave のテストが通っていること前提
- $sqlval = $this->dummy;
- $sqlval['customer_id'] = $this->customer_id;
- $sqlval['addr02'] = 'get test';
- $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->getAddress($other_deliv_id);
- $result = TRUE;
- foreach ($sqlval as $key => $value) {
- if ($value != $address[$key]) {
- $result = FALSE;
- }
- }
- $this->assertTrue($result);
- }
-
- /**
- * @depends testSave
- */
- function testGetList() {
- // testSave のテストが通っていること前提
- $sqlval = $this->dummy;
- $sqlval['customer_id'] = $this->customer_id;
- $sqlval['addr02'] = 'getList test';
- $this->objAddress->registAddress($sqlval);
- $list = $this->objAddress->getList($this->customer_id);
- $found = FALSE;
- foreach ($list as $address) {
- $check = TRUE;
- foreach ($sqlval as $key => $value) {
- if ($value != $address[$key]) {
- $check = FALSE;
- }
- }
- if ($check) {
- $found = TRUE;
- break;
- }
- }
- $this->assertTrue($found);
- }
-
- /**
- * @depends testSave
- */
- function testDeleteAddress() {
- // testSave のテストが通っていること前提
- $sqlval = $this->dummy;
- $sqlval['customer_id'] = $this->customer_id;
- $sqlval['addr02'] = 'delete test';
- $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->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);
- }
-}
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of SC_Helper_Address_Test
+ *
+ * @author cyberwill
+ */
+class SC_Helper_Address_Test extends PHPUnit_Framework_TestCase
+{
+ public $objQuery = "";
+ public $objAddress = "";
+ public $customer_id = "";
+
+ public $dummy = array(
+ 'name01' => '追加',
+ 'name02' => '住所',
+ 'kana01' => 'ツイカ',
+ 'kana02' => 'ジュウショ',
+ 'zip01' => '123',
+ 'zip02' => '4567',
+ 'pref' => '23',
+ 'addr01' => 'その他のお届け先',
+ 'addr02' => '',
+ 'tel01' => '0123',
+ 'tel02' => '4567',
+ 'tel03' => '8901',
+ 'fax01' => '',
+ 'fax02' => '',
+ 'fax03' => '',
+ );
+
+ /**
+ * Sets up the fixture, for example, opens a network connection.
+ * This method is called before a test is executed.
+ */
+ protected function setUp()
+ {
+ $this->objQuery =& SC_Query::getSingletonInstance();
+ $this->objQuery->begin();
+ $arrRet = $this->objQuery->getOne('SELECT MAX(customer_id) FROM dtb_customer');
+ $this->customer_id = $arrRet;
+ $this->objAddress = new SC_Helper_Address_Ex();
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ */
+ protected function tearDown()
+ {
+ $this->objQuery->rollback();
+ }
+
+ function testRegistAddress() {
+ // ダミーの住所を登録
+ $sqlval = $this->dummy;
+ $sqlval['customer_id'] = $this->customer_id;
+ // 検証用の住所02
+ $sqlval['addr02'] = $create_test = 'create test ' . time();
+ $this->objAddress->registAddress($sqlval);
+
+ // 住所02が検証用のものと同じか確認
+ $this->objQuery->setOrder('other_deliv_id DESC');
+ $created_address = $this->objQuery->getRow('other_deliv_id, addr02', 'dtb_other_deliv', 'customer_id = ?', array($this->customer_id));
+ $this->assertEquals($create_test, $created_address['addr02']);
+
+ $sqlval['other_deliv_id'] = $created_address['other_deliv_id'];
+ // 更新の検証のために住所02を変更
+ $sqlval['addr02'] = $update_test = 'update test ' . time();
+ $this->objAddress->registAddress($sqlval);
+
+ // 住所02が検証用のものと同じか検証
+ $this->objQuery->setOrder('other_deliv_id DESC');
+ $updated_address = $this->objQuery->getRow('addr02', 'dtb_other_deliv', 'other_deliv_id = ?', array($created_address['other_deliv_id']));
+ $this->assertEquals($update_test, $updated_address['addr02']);
+ }
+
+ /**
+ * @depends testSave
+ */
+ function testGetAddress() {
+ // testSave のテストが通っていること前提
+ $sqlval = $this->dummy;
+ $sqlval['customer_id'] = $this->customer_id;
+ $sqlval['addr02'] = 'get test';
+ $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->getAddress($other_deliv_id);
+ $result = TRUE;
+ foreach ($sqlval as $key => $value) {
+ if ($value != $address[$key]) {
+ $result = FALSE;
+ }
+ }
+ $this->assertTrue($result);
+ }
+
+ /**
+ * @depends testSave
+ */
+ function testGetList() {
+ // testSave のテストが通っていること前提
+ $sqlval = $this->dummy;
+ $sqlval['customer_id'] = $this->customer_id;
+ $sqlval['addr02'] = 'getList test';
+ $this->objAddress->registAddress($sqlval);
+ $list = $this->objAddress->getList($this->customer_id);
+ $found = FALSE;
+ foreach ($list as $address) {
+ $check = TRUE;
+ foreach ($sqlval as $key => $value) {
+ if ($value != $address[$key]) {
+ $check = FALSE;
+ }
+ }
+ if ($check) {
+ $found = TRUE;
+ break;
+ }
+ }
+ $this->assertTrue($found);
+ }
+
+ /**
+ * @depends testSave
+ */
+ function testDeleteAddress() {
+ // testSave のテストが通っていること前提
+ $sqlval = $this->dummy;
+ $sqlval['customer_id'] = $this->customer_id;
+ $sqlval['addr02'] = 'delete test';
+ $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->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);
+ }
+}
変更: branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php 2013-02-18 08:58:21 UTC (rev 22564)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php 2013-02-18 09:02:57 UTC (rev 22565)
@@ -1,490 +1,490 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-// {{{ requires
-require_once(realpath(dirname(__FILE__)) . "/../../require.php");
-require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php");
-
-/**
- * SC_Helper_Purchase のテストケース.
- *
- * @package Helper
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase {
- /**
- * @var SC_Helper_Purchase
- */
- protected $object;
-
- /**
- * Sets up the fixture, for example, opens a network connection.
- * This method is called before a test is executed.
- */
- protected function setUp()
- {
- $this->object = new SC_Helper_Purchase;
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- protected function tearDown()
- {
- }
-
- /**
- * @todo Implement testCompleteOrder().
- */
- public function testCompleteOrder()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testCancelOrder().
- */
- public function testCancelOrder()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testRollbackOrder().
- */
- public function testRollbackOrder()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testVerifyChangeCart().
- */
- public function testVerifyChangeCart()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetOrderTemp().
- */
- public function testGetOrderTemp()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetOrderTempByOrderId().
- */
- public function testGetOrderTempByOrderId()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSaveOrderTemp().
- */
- public function testSaveOrderTemp()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * getShippingTemp() のテストケース.
- */
- public function testGetShippingTemp()
- {
- $_SESSION['shipping'] = array(
- '0' => array('shipping_name01' => 'test01', 'shipment_item' => array('10' => array('shipment_item' => 0) ) ),
- '1' => array('shipping_name01' => 'test02'),
- '2' => array('shipping_name01' => 'test03', 'shipment_item' => array('11' => array('shipment_item' => 1) ) ),
- '3' => array('shipping_name01' => 'test04', 'shipment_item' => array('12' => array('shipment_item' => 2) ) ),
- );
-
- // 第一引数(複数お届け先フラグ)がfalseの場合、$_SESSION['shipping']をそのまま返す
- $result = SC_Helper_Purchase_Ex::getShippingTemp(false);
- $this->assertEquals($result, $_SESSION['shipping']);
-
- // 第一引数(複数お届け先フラグ)がtrueの場合、実際に配送で利用されるお届け先の情報のみを入れたデータを返す
- $result = SC_Helper_Purchase_Ex::getShippingTemp(true);
- $this->assertEquals(false, $result === $_SESSION['shipping']);
- $this->assertEquals(false, $result == $_SESSION['shipping']);
- $this->assertEquals(3, count($result));
-
- unset($_SESSION['shipping']);
- }
-
- /**
- * @todo Implement testClearShipmentItemTemp().
- */
- public function testClearShipmentItemTemp()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSetShipmentItemTemp().
- */
- public function testSetShipmentItemTemp()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetShippingPref().
- */
- public function testGetShippingPref()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testIsMultiple().
- */
- public function testIsMultiple()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSaveShippingTemp().
- */
- public function testSaveShippingTemp()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testUnsetShippingTemp().
- */
- public function testUnsetShippingTemp()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testCopyFromCustomer().
- */
- public function testCopyFromCustomer()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testCopyFromOrder().
- */
- public function testCopyFromOrder()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetPaymentsByPrice().
- */
- public function testGetPaymentsByPrice()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetDelivDate().
- */
- public function testGetDelivDate()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetDateArray().
- */
- public function testGetDateArray()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetDelivTime().
- */
- public function testGetDelivTime()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetDeliv().
- */
- public function testGetDeliv()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetPayments().
- */
- public function testGetPayments()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testRegisterShipping().
- */
- public function testRegisterShipping()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testRegisterShipmentItem().
- */
- public function testRegisterShipmentItem()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testRegisterOrderComplete().
- */
- public function testRegisterOrderComplete()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testRegisterOrder().
- */
- public function testRegisterOrder()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testRegisterOrderDetail().
- */
- public function testRegisterOrderDetail()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetOrder().
- */
- public function testGetOrder()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetOrderDetail().
- */
- public function testGetOrderDetail()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSetDownloadableFlgTo().
- */
- public function testSetDownloadableFlgTo()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetShippings().
- */
- public function testGetShippings()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testGetShipmentItems().
- */
- public function testGetShipmentItems()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSendOrderMail().
- */
- public function testSendOrderMail()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSfUpdateOrderStatus().
- */
- public function testSfUpdateOrderStatus()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testSfUpdateOrderNameCol().
- */
- public function testSfUpdateOrderNameCol()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testIsUsePoint().
- */
- public function testIsUsePoint()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testIsAddPoint().
- */
- public function testIsAddPoint()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-
- /**
- * @todo Implement testCleanupSession().
- */
- public function testCleanupSession()
- {
- // Remove the following lines when you implement this test.
- $this->markTestIncomplete(
- 'This test has not been implemented yet.'
- );
- }
-}
-?>
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
+require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php");
+
+/**
+ * SC_Helper_Purchase のテストケース.
+ *
+ * @package Helper
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase {
+ /**
+ * @var SC_Helper_Purchase
+ */
+ protected $object;
+
+ /**
+ * Sets up the fixture, for example, opens a network connection.
+ * This method is called before a test is executed.
+ */
+ protected function setUp()
+ {
+ $this->object = new SC_Helper_Purchase;
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ */
+ protected function tearDown()
+ {
+ }
+
+ /**
+ * @todo Implement testCompleteOrder().
+ */
+ public function testCompleteOrder()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testCancelOrder().
+ */
+ public function testCancelOrder()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testRollbackOrder().
+ */
+ public function testRollbackOrder()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testVerifyChangeCart().
+ */
+ public function testVerifyChangeCart()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetOrderTemp().
+ */
+ public function testGetOrderTemp()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetOrderTempByOrderId().
+ */
+ public function testGetOrderTempByOrderId()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSaveOrderTemp().
+ */
+ public function testSaveOrderTemp()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * getShippingTemp() のテストケース.
+ */
+ public function testGetShippingTemp()
+ {
+ $_SESSION['shipping'] = array(
+ '0' => array('shipping_name01' => 'test01', 'shipment_item' => array('10' => array('shipment_item' => 0) ) ),
+ '1' => array('shipping_name01' => 'test02'),
+ '2' => array('shipping_name01' => 'test03', 'shipment_item' => array('11' => array('shipment_item' => 1) ) ),
+ '3' => array('shipping_name01' => 'test04', 'shipment_item' => array('12' => array('shipment_item' => 2) ) ),
+ );
+
+ // 第一引数(複数お届け先フラグ)がfalseの場合、$_SESSION['shipping']をそのまま返す
+ $result = SC_Helper_Purchase_Ex::getShippingTemp(false);
+ $this->assertEquals($result, $_SESSION['shipping']);
+
+ // 第一引数(複数お届け先フラグ)がtrueの場合、実際に配送で利用されるお届け先の情報のみを入れたデータを返す
+ $result = SC_Helper_Purchase_Ex::getShippingTemp(true);
+ $this->assertEquals(false, $result === $_SESSION['shipping']);
+ $this->assertEquals(false, $result == $_SESSION['shipping']);
+ $this->assertEquals(3, count($result));
+
+ unset($_SESSION['shipping']);
+ }
+
+ /**
+ * @todo Implement testClearShipmentItemTemp().
+ */
+ public function testClearShipmentItemTemp()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSetShipmentItemTemp().
+ */
+ public function testSetShipmentItemTemp()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetShippingPref().
+ */
+ public function testGetShippingPref()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testIsMultiple().
+ */
+ public function testIsMultiple()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSaveShippingTemp().
+ */
+ public function testSaveShippingTemp()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testUnsetShippingTemp().
+ */
+ public function testUnsetShippingTemp()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testCopyFromCustomer().
+ */
+ public function testCopyFromCustomer()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testCopyFromOrder().
+ */
+ public function testCopyFromOrder()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetPaymentsByPrice().
+ */
+ public function testGetPaymentsByPrice()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetDelivDate().
+ */
+ public function testGetDelivDate()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetDateArray().
+ */
+ public function testGetDateArray()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetDelivTime().
+ */
+ public function testGetDelivTime()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetDeliv().
+ */
+ public function testGetDeliv()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetPayments().
+ */
+ public function testGetPayments()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testRegisterShipping().
+ */
+ public function testRegisterShipping()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testRegisterShipmentItem().
+ */
+ public function testRegisterShipmentItem()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testRegisterOrderComplete().
+ */
+ public function testRegisterOrderComplete()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testRegisterOrder().
+ */
+ public function testRegisterOrder()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testRegisterOrderDetail().
+ */
+ public function testRegisterOrderDetail()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetOrder().
+ */
+ public function testGetOrder()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetOrderDetail().
+ */
+ public function testGetOrderDetail()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSetDownloadableFlgTo().
+ */
+ public function testSetDownloadableFlgTo()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetShippings().
+ */
+ public function testGetShippings()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testGetShipmentItems().
+ */
+ public function testGetShipmentItems()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSendOrderMail().
+ */
+ public function testSendOrderMail()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSfUpdateOrderStatus().
+ */
+ public function testSfUpdateOrderStatus()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testSfUpdateOrderNameCol().
+ */
+ public function testSfUpdateOrderNameCol()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testIsUsePoint().
+ */
+ public function testIsUsePoint()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testIsAddPoint().
+ */
+ public function testIsAddPoint()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+
+ /**
+ * @todo Implement testCleanupSession().
+ */
+ public function testCleanupSession()
+ {
+ // Remove the following lines when you implement this test.
+ $this->markTestIncomplete(
+ 'This test has not been implemented yet.'
+ );
+ }
+}
+?>
Svn-src-all メーリングリストの案内