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

Timestamp:

2014/06/05 00:11:02 (12 years ago)

Author:

shutta

Message:

#2572 テスト> 税率5%でしか考慮されていない部分がある
他の箇所に倣って、SC_Helper_TaxRule_Ex::sfCalcIncTaxを利用するように修正。
ついでに、既存のSC_Helper_TaxRule_Ex::sfCalcIncTaxを使用している箇所は、integer型で渡すようにプチ整形。

Location:

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

Files:

• SC_CartSession/SC_CartSession_getCartListTest.php (modified) (2 diffs)
• SC_Product/SC_Product_getDetailAndProductsClassTest.php (modified) (2 diffs)
• SC_Product/SC_Product_getDetailTest.php (modified) (1 diff)
• SC_Product/SC_Product_getListByProductIdsTest.php (modified) (1 diff)
• SC_Product/SC_Product_getProductsClassTest.php (modified) (1 diff)
• helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php (modified) (2 diffs)

branches/version-2_13-dev/tests/class/SC_CartSession/SC_CartSession_getCartListTest.php

@@ -104 +104 @@
             ,'status' => '1'
             ,'del_flg' => '0'
-            ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-            ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-            ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-            ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
+            ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+            ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+            ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+            ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
             ,'maker_id' => null
             ,'comment4' => null
@@ -164 +164 @@
             ,'class_name2' => '味'
             ,'class_id2' => '1'
-            ,'price01_inctax' => 1575.0
-            ,'price02_inctax' => 1575.0
+            ,'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+            ,'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
             //,'create_date' => '2014-05-04 12:20:29'
             //,'update_date' => '2014-05-04 12:20:29'

branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php

@@ -54 +54 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
                 ,'maker_id' => null
                 ,'comment4' => null
@@ -115 +115 @@
                 ,'class_name2' => '味'
                 ,'class_id2' => '1'
-                ,'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
+                ,'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
         );
 

branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getDetailTest.php

@@ -54 +54 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
                 ,'maker_id' => null
                 ,'comment4' => null

branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php

@@ -69 +69 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
             )
         );

branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php

@@ -52 +52 @@
                 ,'class_name2' => '味'
                 ,'class_id2' => '1'
-                ,'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
-                ,'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax('1500')
+                ,'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
+                ,'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500)
         );
 

branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php

@@ -63 +63 @@
       'quantity' => 10,
       'price' => 9000,
-      'total_inctax' => 94500.0,
+      'total_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(90000),
       'productsClass' => array('price02' => 9000)
     );
@@ -80 +80 @@
       'quantity' => 10,
       'price' => '2500',
-      'total_inctax' => 26250.0
+      'total_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(25000),
     );
     $result = $_SESSION['shipping']['1001']['shipment_item']['1002'];