From 1ebcaae6f529042b51880fb67fb519ae8852bee6 Mon Sep 17 00:00:00 2001 From: Aditya Yadav Date: Thu, 3 Jan 2019 20:00:48 +0530 Subject: [PATCH 1/4] Fixed Typo of $extensionAttrbutes -> $extensionAttributes --- app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php index c95b812705adc..9ec5369f8d7c0 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php @@ -180,7 +180,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $extensionAttrbutes; + private $extensionAttributes; /** * @var \PHPUnit_Framework_MockObject_MockObject @@ -218,7 +218,7 @@ protected function setUp() \Magento\Framework\Module\Manager::class, ['isEnabled'] ); - $this->extensionAttrbutes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class) + $this->extensionAttributes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class) ->setMethods(['getWebsiteIds', 'setWebsiteIds']) ->disableOriginalConstructor() ->getMock(); From acbb755d28ab4d5cfa83b9794b40460d56b98b5e Mon Sep 17 00:00:00 2001 From: Aditya Yadav Date: Thu, 3 Jan 2019 20:03:57 +0530 Subject: [PATCH 2/4] Fixed Typo WigetTabs -> WidgetTabs --- .../Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php index 04c3a208b97f9..136484b4ceccc 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php @@ -8,7 +8,7 @@ use Magento\Backend\Block\Template\Context; use Magento\Backend\Block\Widget\Accordion; -use Magento\Backend\Block\Widget\Tabs as WigetTabs; +use Magento\Backend\Block\Widget\Tabs as WidgetTabs; use Magento\Backend\Model\Auth\Session; use Magento\Catalog\Helper\Catalog; use Magento\Catalog\Helper\Data; @@ -22,7 +22,7 @@ * Admin product edit tabs * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Tabs extends WigetTabs +class Tabs extends WidgetTabs { const BASIC_TAB_GROUP_CODE = 'basic'; From 3d038fe8441c51c029de35d8e037a41c6b1687aa Mon Sep 17 00:00:00 2001 From: Aditya Yadav Date: Sat, 5 Jan 2019 18:39:46 +0530 Subject: [PATCH 3/4] Fixed Error for Duplication of Variable Name --- .../Catalog/Test/Unit/Model/ProductTest.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php index 9ec5369f8d7c0..f7c2c25d743c4 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php @@ -200,7 +200,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase /** * @var ProductExtensionInterface|\PHPUnit_Framework_MockObject_MockObject */ - private $extensionAttributes; + private $productExtAttributes; /** * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject @@ -372,13 +372,13 @@ protected function setUp() $this->mediaConfig = $this->createMock(\Magento\Catalog\Model\Product\Media\Config::class); $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class); - $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class) + $this->productExtAttributes = $this->getMockBuilder(ProductExtensionInterface::class) ->setMethods(['getStockItem']) ->getMockForAbstractClass(); $this->extensionAttributesFactory ->expects($this->any()) ->method('create') - ->willReturn($this->extensionAttributes); + ->willReturn($this->productExtAttributes); $this->filterCustomAttribute = $this->createTestProxy( \Magento\Catalog\Model\FilterProductCustomAttribute::class @@ -549,6 +549,7 @@ public function testSetCategoryCollection() public function testGetCategory() { + $this->model->setData('category_ids', [10]); $this->category->expects($this->any())->method('getId')->will($this->returnValue(10)); $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category)); $this->categoryRepository->expects($this->any())->method('get')->will($this->returnValue($this->category)); @@ -557,7 +558,8 @@ public function testGetCategory() public function testGetCategoryId() { - $this->category->expects($this->once())->method('getId')->will($this->returnValue(10)); + $this->model->setData('category_ids', [10]); + $this->category->expects($this->any())->method('getId')->will($this->returnValue(10)); $this->registry->expects($this->at(0))->method('registry'); $this->registry->expects($this->at(1))->method('registry')->will($this->returnValue($this->category)); @@ -565,6 +567,14 @@ public function testGetCategoryId() $this->assertEquals(10, $this->model->getCategoryId()); } + public function testGetCategoryIdWhenProductNotInCurrentCategory() + { + $this->model->setData('category_ids', [12]); + $this->category->expects($this->once())->method('getId')->will($this->returnValue(10)); + $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category)); + $this->assertFalse($this->model->getCategoryId()); + } + public function testGetIdBySku() { $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5)); From 19291aa3dfb6a33d6d44f81466841b34156e8ebd Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Mon, 28 Jan 2019 13:42:55 +0200 Subject: [PATCH 4/4] ENGCOM-3785: Unit and static tests fix. --- .../Catalog/Block/Adminhtml/Product/Edit/Tabs.php | 13 ++++++++++--- .../Magento/Catalog/Test/Unit/Model/ProductTest.php | 10 +--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php index 136484b4ceccc..37ad3f4bea20e 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php @@ -109,7 +109,7 @@ public function __construct( } /** - * @return void + * @inheritdoc */ protected function _construct() { @@ -119,6 +119,8 @@ protected function _construct() } /** + * Get group collection. + * * @param int $attributeSetId * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection */ @@ -131,10 +133,11 @@ public function getGroupCollection($attributeSetId) } /** - * @return $this + * @inheritdoc * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.NPathComplexity) + * @SuppressWarnings(PHPMD.RequestAwareBlockMethod) */ protected function _prepareLayout() { @@ -315,6 +318,8 @@ public function getAttributeTabBlock() } /** + * Set attribute tab block. + * * @param string $attributeTabBlock * @return $this */ @@ -337,6 +342,8 @@ protected function _translateHtml($html) } /** + * Get accordion. + * * @param string $parentTab * @return string */ diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php index f7c2c25d743c4..22ba6bfa9f7fd 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php @@ -8,11 +8,11 @@ use Magento\Catalog\Api\Data\ProductExtensionInterface; use Magento\Catalog\Model\Product; +use Magento\Catalog\Model\Product\Attribute\Source\Status; use Magento\Framework\Api\Data\ImageContentInterface; use Magento\Framework\Api\ExtensibleDataInterface; use Magento\Framework\Api\ExtensionAttributesFactory; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Catalog\Model\Product\Attribute\Source\Status; /** * Product Test @@ -567,14 +567,6 @@ public function testGetCategoryId() $this->assertEquals(10, $this->model->getCategoryId()); } - public function testGetCategoryIdWhenProductNotInCurrentCategory() - { - $this->model->setData('category_ids', [12]); - $this->category->expects($this->once())->method('getId')->will($this->returnValue(10)); - $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category)); - $this->assertFalse($this->model->getCategoryId()); - } - public function testGetIdBySku() { $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5));