Merge branch 'develop' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Author: Yu Tang

app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php

@@ -334,6 +334,7 @@ public function setUp()
      */
     public function testGetProductLinks()
     {
+        $this->markTestIncomplete('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
         $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
         $this->linkTypeProviderMock->expects($this->once())
             ->method('getLinkTypes')

app/code/Magento/Tax/Model/Calculation/Rate/Converter.php

@@ -60,8 +60,10 @@ public function createTitleArrayFromServiceObject(\Magento\Tax\Api\Data\TaxRateI
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function createArrayFromServiceObject(\Magento\Tax\Api\Data\TaxRateInterface $taxRate, $returnNumericLogic = false)
-    {
+    public function createArrayFromServiceObject(
+        \Magento\Tax\Api\Data\TaxRateInterface $taxRate,
+        $returnNumericLogic = false
+    ) {
         $taxRateFormData = [
             'tax_calculation_rate_id' => $taxRate->getId(),
             'tax_country_id' => $taxRate->getTaxCountryId(),

app/code/Magento/Tax/Test/Unit/Model/Calculation/Rate/ConverterTest.php

@@ -17,12 +17,12 @@ class ConverterTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Tax\Api\Data\TaxRateInterfaceFactory
      */
-    protected $_taxRateDataObjectFactory;
+    protected $taxRateDataObjectFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\TaxRateTitleInterfaceFactory
      */
-    protected $_taxRateTitleDataObjectFactory;
+    protected $taxRateTitleDataObjectFactory;
 
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper
@@ -31,12 +31,16 @@ class ConverterTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->_taxRateDataObjectFactory = $this->getMockBuilder('\Magento\Tax\Api\Data\TaxRateInterfaceFactory')
+        $this->taxRateDataObjectFactory = $this->getMockBuilder(
+            '\Magento\Tax\Api\Data\TaxRateInterfaceFactory'
+        )
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->_taxRateTitleDataObjectFactory = $this->getMockBuilder('\Magento\Tax\Api\Data\TaxRateTitleInterfaceFactory')
+        $this->taxRateTitleDataObjectFactory = $this->getMockBuilder(
+            '\Magento\Tax\Api\Data\TaxRateTitleInterfaceFactory'
+        )
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -45,8 +49,8 @@ public function setUp()
         $this->converter =  $this->objectManager->getObject(
             'Magento\Tax\Model\Calculation\Rate\Converter',
             [
-                'taxRateDataObjectFactory' =>  $this->_taxRateDataObjectFactory,
-                'taxRateTitleDataObjectFactory' => $this->_taxRateTitleDataObjectFactory,
+                'taxRateDataObjectFactory' =>  $this->taxRateDataObjectFactory,
+                'taxRateTitleDataObjectFactory' => $this->taxRateTitleDataObjectFactory,
             ]
         );
     }
@@ -110,7 +114,7 @@ public function testPopulateTaxRateData()
             ]
         );
 
-        $this->_taxRateDataObjectFactory->expects($this->once())->method('create')->willReturn($taxRate);
+        $this->taxRateDataObjectFactory->expects($this->once())->method('create')->willReturn($taxRate);
 
         $this->assertSame($taxRate, $this->converter->populateTaxRateData($dataArray));
         $this->assertEquals($taxRate->getTitles(), $rateTitles);