Merge pull request magento#4228 from magento-trigger/bugs_develop

- adding test coverage

Author: irenelagno

app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -393,4 +393,40 @@ public function dataProviderGetSavePercent()
             ['basePrice' => '20.80', 'tierPrice' => '18.72', 'savedPercent' => '10']
         ];
     }
+
+    /**
+     * @param null|string|float $quantity
+     * @param float $expectedValue
+     * @dataProvider getQuantityDataProvider
+     */
+    public function testGetQuantity($quantity, $expectedValue)
+    {
+        $tierPrice = new TierPrice(
+            $this->product,
+            $quantity,
+            $this->calculator,
+            $this->priceCurrencyMock,
+            $this->session,
+            $this->groupManagement,
+            $this->customerGroupRetriever
+        );
+
+        $this->assertEquals($expectedValue, $tierPrice->getQuantity());
+    }
+
+    /**
+     * @return array
+     */
+    public function getQuantityDataProvider()
+    {
+        return [
+            [null, 1],
+            ['one', 1],
+            ['', 1],
+            [4, 4],
+            [4.5, 4.5],
+            ['0.7', 0.7],
+            ['0.0000000', 1]
+        ];
+    }
 }

dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/SoldTest.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Reports\Controller\Adminhtml\Report\Product;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class SoldTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    public function testExecute()
+    {
+        $this->dispatch('backend/reports/report_product/sold');
+        $actual = $this->getResponse()->getBody();
+        $this->assertContains('Ordered Products Report', $actual);
+        //verify if SKU column is presented on grid
+        $this->assertContains('SKU', $actual);
+    }
+}

dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Sold/CollectionTest.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Reports\Model\ResourceModel\Report\Sold;
+
+/**
+ * Class CollectionTest
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Reports\Model\ResourceModel\Product\Sold\Collection
+     */
+    private $collection;
+
+    protected function setUp()
+    {
+        /**
+         * @var \Magento\Reports\Model\ResourceModel\Product\Sold\Collection
+         */
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Reports\Model\ResourceModel\Product\Sold\Collection::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_item_with_configurable_for_reorder.php
+     */
+    public function testFilterByProductTypeException()
+    {
+        $items = $this->collection->addOrderedQty()->getItems();
+        $this->assertEquals(1, count($items));
+        $orderItem = array_shift($items);
+        $this->assertEquals('1.0000', $orderItem['ordered_qty']);
+        $this->assertEquals('Configurable Product', $orderItem['order_items_name']);
+        //verify if order_item_sku exists in return data
+        $this->assertEquals('simple_20', $orderItem['order_items_sku']);
+    }
+}

dev/tests/integration/testsuite/Magento/Review/Block/Product/ReviewRendererTest.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Review\Block\Product;
+
+/**
+ * Class ReviewRendererTest
+ */
+class ReviewRendererTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test verifies ReviewRenderer::getReviewsSummaryHtml call with $displayIfNoReviews = false
+     * The reviews summary will be shown as expected only if there is at least one review available
+     *
+     * @magentoDataFixture Magento/Review/_files/different_reviews.php
+     * @magentoAppArea frontend
+     */
+    public function testGetReviewSummaryHtml()
+    {
+        $productSku = 'simple';
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku);
+        /** @var  ReviewRenderer $reviewRenderer */
+        $reviewRenderer = $objectManager->create(ReviewRenderer::class);
+        $actualResult = $reviewRenderer->getReviewsSummaryHtml($product);
+        $this->assertEquals(2, $reviewRenderer->getReviewsCount());
+        $this->assertContains('<span itemprop="reviewCount">2</span>', $actualResult);
+    }
+}

dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
 $review = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -71,3 +72,4 @@
         )->getStore()->getId()
     ]
 )->save();
+$review->aggregate();

dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php

@@ -7,10 +7,11 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ProductRepository;
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
+// phpcs:ignore Magento2.Security.IncludeFile
 $addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
 
 $billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
@@ -62,6 +63,8 @@
 $orderItem->setProductType($product->getTypeId());
 $orderItem->setProductOptions(['info_buyRequest' => $requestInfo]);
 $orderItemSimple->setProductId($simpleProduct->getId());
+$orderItem->setName($product->getName());
+$orderItem->setSku($simpleProduct->getSku());
 $orderItemSimple->setParentItem($orderItem);
 $orderItemSimple->setStoreId(0);
 $orderItemSimple->setProductType($simpleProduct->getTypeId());

lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+/**
+ * Class JsonConverterTest
+ */
+class JsonConverterTest extends \PHPUnit\Framework\TestCase
+{
+    public function testConvert()
+    {
+        $data = [
+            'key' => 'value'
+        ];
+
+        $this->assertEquals(json_encode($data), \Magento\Framework\Serialize\JsonConverter::convert($data));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to serialize value.
+     */
+    public function testConvertWithException()
+    {
+        //verify that exception will be thrown with invalid UTF8 sequence
+        \Magento\Framework\Serialize\JsonConverter::convert("\xB1\x31");
+    }
+}