MAGETWO-32001: Refactor and cover by unit tests Magento classes.

aohorodnyk · aohorodnyk · commit 74e929929a85 · 2014-12-25T12:14:20.000+02:00
- MAGETWO-32003: Refactor and cover: Magento\Bundle\Model\Product\Type::_prepareProduct
 - Added test testPrepareForCartAdvancedSelectRequiredOptions
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -683,7 +683,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
 
             $options = $buyRequest->getBundleOption();
             if (is_array($options)) {
-                $options = array_filter($options, 'intval');
+                $options = $this->recursiveIntval($options);
                 $optionIds = array_keys($options);
 
                 if (empty($optionIds) && $isStrictProcessMode) {
@@ -700,21 +700,8 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                         }
                     }
                 }
-                $selectionIds = [];
 
-                foreach ($options as $selectionId) {
-                    if (!is_array($selectionId)) {
-                        if ($selectionId != '') {
-                            $selectionIds[] = (int)$selectionId;
-                        }
-                    } else {
-                        foreach ($selectionId as $id) {
-                            if ($id != '') {
-                                $selectionIds[] = (int)$id;
-                            }
-                        }
-                    }
-                }
+                $selectionIds = $this->multiToOFlatArray($options);
                 // If product has not been configured yet then $selections array should be empty
                 if (!empty($selectionIds)) {
                     $selections = $this->getSelectionsByIds($selectionIds, $product);
@@ -723,13 +710,14 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                     foreach ($selections->getItems() as $selection) {
                         if (!$selection->isSalable() && !$skipSaleableCheck) {
                             $_option = $optionsCollection->getItemById($selection->getOptionId());
-                            if (is_array($options[$_option->getId()]) && count($options[$_option->getId()]) > 1) {
+                            $optionId = $_option->getId();
+                            if (is_array($options[$optionId]) && count($options[$optionId]) > 1) {
                                 $moreSelections = true;
                             } else {
                                 $moreSelections = false;
                             }
-                            if ($_option->getRequired() && (!$_option->isMultiSelection() ||
-                                    $_option->isMultiSelection() && !$moreSelections)
+                            $isMultiSelection = $_option->isMultiSelection();
+                            if ($_option->getRequired() && (!$isMultiSelection || !$moreSelections)
                             ) {
                                 throw new \Magento\Framework\Model\Exception(
                                     __('The required options you selected are not available.')
@@ -816,7 +804,9 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                     }
 
                     if (!isset($_result[0])) {
-                        throw new \Magento\Framework\Model\Exception(__('We cannot add this item to your shopping cart.'));
+                        throw new \Magento\Framework\Model\Exception(
+                            __('We cannot add this item to your shopping cart.')
+                        );
                     }
 
                     $result[] = $_result[0]->setParentProductId($product->getId())
@@ -849,6 +839,41 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
         return $this->getSpecifyOptionMessage();
     }
 
+    /**
+     * @param array $array
+     * @return int[]|int[][]
+     */
+    public function recursiveIntval(array $array)
+    {
+        foreach($array as $key => $value) {
+            if (is_array($value)) {
+                $array[$key] = $this->recursiveIntval($value);
+            } elseif (is_numeric($value) && (int)$value != 0) {
+                $array[$key] = (int) $value;
+            } else {
+                unset($array[$key]);
+            }
+        }
+        return $array;
+    }
+
+    /**
+     * @param array $array
+     * @return int[]
+     */
+    public function multiToOFlatArray(array $array)
+    {
+        $flatArray = [];
+        foreach($array as $key => $value) {
+            if (is_array($value)) {
+                $flatArray = array_merge($flatArray, $this->multiToOFlatArray($value));
+            } else {
+                $flatArray[$key] = $value;
+            }
+        }
+        return $flatArray;
+    }
+
     /**
      * Retrieve message for specify option(s)
      *
@@ -873,7 +898,7 @@ public function getSelectionsByIds($selectionIds, $product)
         $usedSelections = $product->getData($this->_keyUsedSelections);
         $usedSelectionsIds = $product->getData($this->_keyUsedSelectionsIds);
 
-        if (!$usedSelections || serialize($usedSelectionsIds) != serialize($selectionIds)) {
+        if (!$usedSelections || $usedSelectionsIds !== $selectionIds) {
             $storeId = $product->getStoreId();
             $usedSelections = $this->_bundleCollection
                 ->create()
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
@@ -5,6 +5,7 @@
 namespace Magento\Bundle\Model\Product;
 
 use Magento\Bundle\Model\Resource\Option\Collection;
+use Magento\Bundle\Model\Resource\Selection\Collection as SelectionCollection;
 use Magento\Catalog\Model\Product\Option\Type\DefaultType;
 use Magento\Framework\Model\Exception;
 
@@ -120,7 +121,17 @@ public function testPrepareForCartAdvancedSelectRequiredOptions()
             ->getMock();
         /* @var $option \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product\Option */
         $option = $this->getMockBuilder('Magento\Catalog\Model\Product\Option')
-            ->setMethods(['groupFactory', 'getType', 'getId', 'getRequired'])
+            ->setMethods(['groupFactory', 'getType', 'getId', 'getRequired', 'isMultiSelection'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var \PHPUnit_Framework_MockObject_MockObject|SelectionCollection $selectionCollection */
+        $selectionCollection = $this->getMockBuilder('Magento\Bundle\Model\Resource\Selection\Collection')
+            ->setMethods(['getItems'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Object $buyRequest */
+        $selection = $this->getMockBuilder('Magento\Framework\Object')
+            ->setMethods(['__wakeup', 'isSalable', 'getOptionId'])
             ->disableOriginalConstructor()
             ->getMock();
         /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product $product */
@@ -148,44 +159,64 @@ public function testPrepareForCartAdvancedSelectRequiredOptions()
             ->getMock();
         /** @var \PHPUnit_Framework_MockObject_MockObject|Collection $optionCollection */
         $optionCollection = $this->getMockBuilder('Magento\Bundle\Model\Resource\Option\Collection')
-            ->setMethods(['getItems'])
+            ->setMethods(['getItems', 'getItemById'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->parentClass($group, $option, $buyRequest, $product);
 
-        $product->expects($this->at(0))
+        $product->expects($this->any())
             ->method('getSkipCheckRequiredOption')
             ->willReturn(true);
-        $product->expects($this->at(1))
-            ->method('getSkipCheckRequiredOption')
-            ->willReturn(false);
         $product->expects($this->once())
             ->method('getTypeInstance')
             ->willReturn($productType);
         $product->expects($this->once())
             ->method('hasData')
             ->willReturn(true);
-        $product->expects($this->once())
+        $product->expects($this->any())
             ->method('getData')
-            ->willReturn($optionCollection);
+            ->willReturnCallback(function($key) use ($optionCollection, $selectionCollection){
+                $resultValue = null;
+                switch($key) {
+                    case '_cache_instance_options_collection':
+                        $resultValue = $optionCollection;
+                        break;
+                    case '_cache_instance_used_selections':
+                        $resultValue = $selectionCollection;
+                        break;
+                    case '_cache_instance_used_selections_ids':
+                        $resultValue = [0 => 5];
+                        break;
+                }
+                return $resultValue;
+            });
+        $optionCollection->expects($this->once())
+            ->method('getItemById')
+            ->willReturn($option);
         $productType->expects($this->once())
             ->method('setStoreFilter');
         $buyRequest->expects($this->once())
             ->method('getBundleOption')
-            ->willReturn([1]);
-        $optionCollection->expects($this->once())
+            ->willReturn([3 => 5]);
+        $selectionCollection->expects($this->once())
             ->method('getItems')
-            ->willReturn([$option]);
+            ->willReturn([$selection]);
+        $selection->expects($this->once())
+            ->method('isSalable')
+            ->willReturn(false);
+        $option->expects($this->at(3))
+            ->method('getId')
+            ->willReturn(3);
         $option->expects($this->once())
             ->method('getRequired')
             ->willReturn(true);
-        $option->expects($this->at(1))
-            ->method('getId')
-            ->willReturn(3);
+        $option->expects($this->once())
+            ->method('isMultiSelection')
+            ->willReturn(true);
 
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
-        $this->assertEquals('Please select all required options.', $result);
+        $this->assertEquals('The required options you selected are not available.', $result);
     }
 
     public function testPrepareForCartAdvancedParentClassReturnString()
