MAGETWO-61066: [Backport] - Shopping Cart not being cleared when changing between different websites on the same domain. - for 2.0

Author: DianaRusin

app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php

@@ -124,7 +124,7 @@ public function testGetTotalsHtml()
     public function testGetConfig()
     {
         $websiteId = 100;
-        $storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
+        $storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
 
         $shoppingCartUrl = 'http://url.com/cart';
         $checkoutUrl = 'http://url.com/checkout';

app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php

@@ -95,12 +95,12 @@ public function testGetSectionData()
         $shortcutButtonsHtml = '<span>Buttons</span>';
         $websiteId = 100;
 
-        $subtotalMock = $this->getMock('\Magento\Framework\DataObject', ['getValue'], [], '', false);
+        $subtotalMock = $this->getMock(\Magento\Framework\DataObject::class, ['getValue'], [], '', false);
         $subtotalMock->expects($this->once())->method('getValue')->willReturn($subtotalValue);
         $totals = ['subtotal' => $subtotalMock];
 
         $quoteMock = $this->getMock(
-            '\Magento\Quote\Model\Quote',
+            \Magento\Quote\Model\Quote::class,
             ['getTotals', 'getHasError', 'getAllVisibleItems', 'getStore'],
             [],
             '',
@@ -117,15 +117,15 @@ public function testGetSectionData()
             ->willReturn($subtotalValue);
         $this->checkoutHelperMock->expects($this->once())->method('canOnepageCheckout')->willReturn(true);
 
-        $quoteItemMock = $this->getMock('\Magento\Quote\Model\Quote\Item', ['getProduct', 'getStoreId'], [], '', false);
+        $quoteItemMock = $this->getMock(\Magento\Quote\Model\Quote\Item::class, ['getProduct', 'getStoreId'], [], '', false);
         $quoteMock->expects($this->once())->method('getAllVisibleItems')->willReturn([$quoteItemMock]);
 
         $storeMock = $this->getMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId'], [], '', false);
         $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
         $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
 
         $productMock = $this->getMock(
-            '\Magento\Catalog\Model\Product',
+            \Magento\Catalog\Model\Product::class,
             ['isVisibleInSiteVisibility', 'getId', 'setUrlDataObject'],
             [],
             '',