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

Author: Robert He

app/code/Magento/GoogleShopping/Model/Attribute/Tax.php

@@ -171,9 +171,9 @@ public function convertAttribute($product, $entry)
                 foreach ($regions as $region) {
                     $adjustments = $product->getPriceInfo()->getAdjustments();
                     if (array_key_exists('tax', $adjustments)) {
-                        $taxIncluded = true;
+                        $isTaxIncluded = true;
                     } else {
-                        $taxIncluded = false;
+                        $isTaxIncluded = false;
                     }
 
                     $quoteDetailsItemDataArray = [
@@ -185,7 +185,7 @@ public function convertAttribute($product, $entry)
                         ],
                         'unit_price' => $product->getPrice(),
                         'quantity' => 1,
-                        'tax_included' => $taxIncluded,
+                        'is_tax_included' => $isTaxIncluded,
                         'short_description' => $product->getName(),
                     ];
 

app/code/Magento/GoogleShopping/Test/Unit/Model/Attribute/TaxTest.php

@@ -192,7 +192,7 @@ public function testConvertAttribute()
                             ],
                             'unit_price'        => $price,
                             'quantity'          => 1,
-                            'tax_included'      => 1,
+                            'is_tax_included'      => 1,
                             'short_description' => $name,
                         ],
                     ],

app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php

@@ -88,7 +88,7 @@ public function setQuantity($quantity);
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
-    public function getTaxIncluded();
+    public function getIsTaxIncluded();
 
     /**
      * Set whether the tax is included in the unit price and row total

app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php

@@ -217,7 +217,7 @@ public function setCustomerId($customerId)
      */
     public function calculate(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
-        if ($item->getTaxIncluded()) {
+        if ($item->getIsTaxIncluded()) {
             return $this->calculateWithTaxInPrice($item, $quantity, $round);
         } else {
             return $this->calculateWithTaxNotInPrice($item, $quantity, $round);

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

@@ -21,7 +21,7 @@ class ItemDetails extends AbstractExtensibleModel implements QuoteDetailsItemInt
     const KEY_TAX_CLASS_KEY        = 'tax_class_key';
     const KEY_UNIT_PRICE           = 'unit_price';
     const KEY_QUANTITY             = 'quantity';
-    const KEY_TAX_INCLUDED         = 'tax_included';
+    const KEY_IS_TAX_INCLUDED      = 'is_tax_included';
     const KEY_SHORT_DESCRIPTION    = 'short_description';
     const KEY_DISCOUNT_AMOUNT      = 'discount_amount';
     const KEY_PARENT_CODE          = 'parent_code';
@@ -72,9 +72,9 @@ public function getQuantity()
     /**
      * {@inheritdoc}
      */
-    public function getTaxIncluded()
+    public function getIsTaxIncluded()
     {
-        return $this->getData(self::KEY_TAX_INCLUDED);
+        return $this->getData(self::KEY_IS_TAX_INCLUDED);
     }
 
     /**
@@ -180,7 +180,7 @@ public function setQuantity($quantity)
      */
     public function setIsTaxIncluded($isTaxIncluded)
     {
-        return $this->setData(self::KEY_TAX_INCLUDED, $isTaxIncluded);
+        return $this->setData(self::KEY_IS_TAX_INCLUDED, $isTaxIncluded);
     }
 
     /**