Fix the Magento Weee tests that worked with the old Zend_Json dependancy

Author: dmanners

app/code/Magento/Weee/Helper/Data.php

@@ -86,7 +86,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param WeeeDisplayConfig $weeeTax
+     * @param \Magento\Weee\Model\Tax $weeeTax
      * @param \Magento\Weee\Model\Config $weeeConfig
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Framework\Registry $coreRegistry

app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php

@@ -15,11 +15,6 @@
 
 class TaxTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \Magento\Weee\Model\Attribute\Backend\Weee\Tax
-     */
-    protected $model;
-        
     /**
      * @var ObjectManager
      */
@@ -28,12 +23,14 @@ class TaxTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
-        $this->model = $this->objectManager->getObject(\Magento\Weee\Model\Attribute\Backend\Weee\Tax::class);
     }
 
     public function testGetBackendModelName()
     {
-        $this->assertEquals(\Magento\Weee\Model\Attribute\Backend\Weee\Tax::class, $this->model->getBackendModelName());
+        $this->assertEquals(
+            \Magento\Weee\Model\Attribute\Backend\Weee\Tax::class,
+            \Magento\Weee\Model\Attribute\Backend\Weee\Tax::getBackendModelName()
+        );
     }
 
     /**

app/code/Magento/Weee/Test/Unit/Model/Total/Quote/WeeeTaxTest.php

@@ -242,8 +242,12 @@ public function verifyTotals($address, $addressData)
 
     public function testFetch()
     {
+        $serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)->getMock();
         $weeeTotal = 17;
-        $totalMock = new \Magento\Quote\Model\Quote\Address\Total();
+        $totalMock = new \Magento\Quote\Model\Quote\Address\Total(
+            [],
+            $serializerMock
+        );
         $taxHelper = $this->setupTaxHelper([]);
         $weeeHelper = $this->setupWeeeHelper(['getTotalAmounts' => $weeeTotal]);
         $this->weeeCollector = $this->objectManagerHelper->getObject(
@@ -262,7 +266,11 @@ public function testFetch()
 
     public function testFetchWithZeroAmounts()
     {
-        $totalMock = new \Magento\Quote\Model\Quote\Address\Total();
+        $serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)->getMock();
+        $totalMock = new \Magento\Quote\Model\Quote\Address\Total(
+            [],
+            $serializerMock
+        );
         $taxHelper = $this->setupTaxHelper([]);
         $weeeHelper = $this->setupWeeeHelper(['getTotalAmounts' => null]);
         $this->weeeCollector = $this->objectManagerHelper->getObject(

app/code/Magento/Weee/Test/Unit/Model/Total/Quote/WeeeTest.php

@@ -298,7 +298,10 @@ public function testCollect(
         $storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
         $quoteMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
         $addressMock = $this->setupAddressMock($items);
-        $totalMock = new \Magento\Quote\Model\Quote\Address\Total();
+        $totalMock = new \Magento\Quote\Model\Quote\Address\Total(
+            [],
+            $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)->getMock()
+        );
         $shippingAssignmentMock = $this->setupShippingAssignmentMock($addressMock, $items);
 
         $taxHelper = $this->setupTaxHelper($taxConfig);