Changeset 23540

Timestamp:

2014/06/11 11:27:45 (9 years ago)

Author:

shutta

Message:

#2588 商品管理＞商品登録(商品規格) dtb_classcategory.del_flg を関知していない
テストケースで失敗するようになっているものが出ていたので修正。

Location:

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

Files:

• SC_CartSession/SC_CartSession_TestBase.php (modified) (1 diff)
• SC_Product/SC_Product_TestBase.php (modified) (1 diff)
• SC_Product/SC_Product_getProductsClassByProductIdsTest.php (modified) (2 diffs)
• helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php (modified) (1 diff)
• util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php (modified) (1 diff)

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

@@ -93 +93 @@
         );
 
-        $this->objQuery->delete('dtb_classcategory');
+        // classcategory_id=0のものは削除しない
+        $this->objQuery->delete('dtb_classcategory', 'classcategory_id <> 0');
         foreach ($class_category as $key => $item) {
             $this->objQuery->insert('dtb_classcategory', $item);

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

@@ -93 +93 @@
                                 );
 
-        $this->objQuery->delete('dtb_classcategory');
+        // classcategory_id=0のものは削除しない
+        $this->objQuery->delete('dtb_classcategory', 'classcategory_id <> 0');
         foreach ($class_category as $key => $item) {
             $this->objQuery->insert('dtb_classcategory', $item);

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

@@ -125 +125 @@
                 ,'down_realfilename' => null
                 ,'classcategory_name1' => null
-                ,'rank1' => null
+                ,'rank1' => 0
                 ,'class_name1' => null
                 ,'class_id1' => null
@@ -131 +131 @@
                 ,'classcategory_id2' => '0'
                 ,'classcategory_name2' => null
-                ,'rank2' => null
+                ,'rank2' => 0
                 ,'class_name2' => null
                 ,'class_id2' => null

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

@@ -212 +212 @@
     );
 
-    $this->objQuery->delete('dtb_classcategory');
+    // classcategory_id=0のものは削除しない
+    $this->objQuery->delete('dtb_classcategory', 'classcategory_id <> 0');
     foreach ($class_category as $key => $item) {
       $this->objQuery->insert('dtb_classcategory', $item);

branches/version-2_13-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php

@@ -128 +128 @@
       )
     );
-    $this->objQuery->delete('dtb_classcategory');
+    // classcategory_id=0のものは削除しない
+    $this->objQuery->delete('dtb_classcategory', 'classcategory_id <> 0');
     foreach ($class_categories as $item) {
       $this->objQuery->insert('dtb_classcategory', $item);