Fixed static test failures

Stanislav Idolov · Stanislav Idolov · commit 87c8f5aa5c4d · 2018-06-26T09:36:43.000+03:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
@@ -32,6 +32,7 @@ class ToolbarTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $scopeConfig;
+
     /**
      * @var \Magento\Catalog\Model\Config | \PHPUnit_Framework_MockObject_MockObject
      */
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/NewProductsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/NewProductsTest.php
@@ -100,6 +100,7 @@ public function isAllowedDataProvider()
             [0, false]
         ];
     }
+
     /**
      * @dataProvider isAllowedDataProvider
      */
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
@@ -126,7 +126,6 @@ protected function setUp()
         $attribute->expects($this->any())->method('getDefaultValue')->willReturn('default_value');
         $attribute->expects($this->any())->method('usesSource')->willReturn(true);
 
-
         $entityAttributes = [
             [
                 'attribute_id' => 'attribute_id',
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2013-2018 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2013-2018 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
@@ -15,30 +15,37 @@ class AdvancedTest extends \PHPUnit_Framework_TestCase
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection
      */
     protected $collection;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\CatalogSearch\Model\ResourceModel\Advanced
      */
     protected $resource;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\CatalogSearch\Model\ResourceModel\ResourceProvider
      */
     protected $resourceProvider;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject[]|\Magento\Catalog\Model\ResourceModel\Eav\Attribute[]
      */
     protected $attributes;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Data\Collection
      */
     protected $dataCollection;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Directory\Model\Currency
      */
     private $currency;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
      */
@@ -380,7 +387,6 @@ private function addFiltersPriceDataProvider()
         ];
     }
 
-
     /**
      * @param $backend
      * @param null $source
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
@@ -19,10 +19,12 @@ class IndexStructureTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver|\PHPUnit_Framework_MockObject_MockObject
      */
     private $indexScopeResolver;
+
     /**
      * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
      */
     private $resource;
+
     /**
      * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
      */
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
@@ -85,7 +85,9 @@ protected function setUp()
         $this->quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
         $this->eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
         $this->storeManagerMock = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->productRepository = $this->getMockForAbstractClass(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $this->productRepository = $this->getMockForAbstractClass(
+            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        );
         $this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Model\StockRegistry::class)
             ->disableOriginalConstructor()
             ->setMethods(['getStockItem', '__wakeup'])
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Session/SuccessValidatorTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Session/SuccessValidatorTest.php
@@ -97,7 +97,8 @@ public function testIsValidTrue()
     protected function createSuccessValidator(\PHPUnit_Framework_MockObject_MockObject $checkoutSession)
     {
         return $this->objectManagerHelper->getObject(
-            'Magento\Checkout\Model\Session\SuccessValidator', ['checkoutSession' => $checkoutSession]
+            'Magento\Checkout\Model\Session\SuccessValidator',
+            ['checkoutSession' => $checkoutSession]
         );
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Initialization/Helper/ProductLinks/Plugin/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Initialization/Helper/ProductLinks/Plugin/GroupedTest.php
@@ -28,6 +28,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $productRepository;
+
     /**
      * @var \Magento\GroupedProduct\Model\Product\Initialization\Helper\ProductLinks\Plugin\Grouped
      */
diff --git a/app/code/Magento/Indexer/Test/Unit/App/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/App/IndexerTest.php
@@ -39,7 +39,12 @@ protected function setUp()
             false
         );
 
-        $this->entryPoint = new \Magento\Indexer\App\Indexer('reportDir', $this->filesystem, $this->processor, $this->_response);
+        $this->entryPoint = new \Magento\Indexer\App\Indexer(
+            'reportDir',
+            $this->filesystem,
+            $this->processor,
+            $this->_response
+        );
     }
 
     /**
@@ -63,7 +68,8 @@ public function testExecute($isExist, $callCount)
     /**
      * @return array
      */
-    public function executeProvider(){
+    public function executeProvider()
+    {
         return [
             'set1' => ['isExist' => true, 'expectsValue' => 1],
             'set1' => ['delete' => false, 'expectsValue' => 0]
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php b/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
@@ -22,7 +22,6 @@ class AbstractResourceTest extends \PHPUnit_Framework_TestCase
      */
     protected $_tableStrategyInterface;
 
-
     protected function setUp()
     {
         $this->_resourceMock = $this->getMockBuilder('Magento\Framework\App\ResourceConnection')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -85,7 +85,6 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         // @TODO this is a wrong test and it does not check methods. Any digital value will be correct
         $priceCurrency->expects($this->any())->method('convert')->willReturn(1231313);
 
-
         /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $quoteItem */
         $quoteItem = $this->objectManager->getObject(
             'Magento\Quote\Model\Quote\Item',
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
@@ -64,9 +64,6 @@ public function testGetRelatedProductIds($optionValue, $productId, $expectedResu
      *
      * @return array
      */
-    /**
-     * @return array
-     */
     public function getRelatedProductIdsDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php
@@ -42,7 +42,6 @@ public static function testMethod1(array &$data = array());
      */
     public function testMethod2($data = 'test_default', $flag = true);
 
-    
     public function testMethod3();
 
 

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ public function isAllowedDataProvider()`
`100`	`100`	`[0, false]`
`101`	`101`	`];`
`102`	`102`	`}`
	`103`	`+`
`103`	`104`	`/**`
`104`	`105`	`* @dataProvider isAllowedDataProvider`
`105`	`106`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,6 @@ protected function setUp()`
`126`	`126`	`$attribute->expects($this->any())->method('getDefaultValue')->willReturn('default_value');`
`127`	`127`	`$attribute->expects($this->any())->method('usesSource')->willReturn(true);`
`128`	`128`
`129`		`-`
`130`	`129`	`$entityAttributes = [`
`131`	`130`	`[`
`132`	`131`	`'attribute_id' => 'attribute_id',`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ public function testIsValidTrue()`
`97`	`97`	`protected function createSuccessValidator(\PHPUnit_Framework_MockObject_MockObject $checkoutSession)`
`98`	`98`	`{`
`99`	`99`	`return $this->objectManagerHelper->getObject(`
`100`		`- 'Magento\Checkout\Model\Session\SuccessValidator', ['checkoutSession' => $checkoutSession]`
	`100`	`+ 'Magento\Checkout\Model\Session\SuccessValidator',`
	`101`	`+ ['checkoutSession' => $checkoutSession]`
`101`	`102`	`);`
`102`	`103`	`}`
`103`	`104`	`}`