skip AC-10660 ticket fix changes

Author: glo60612

app/code/Magento/Catalog/Controller/Product/Compare/Index.php

@@ -6,8 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\View\Result\PageFactory;
 
@@ -81,8 +81,6 @@ public function execute()
             $this->_catalogSession->setBeforeCompareUrl(
                 $this->urlDecoder->decode($beforeUrl)
             );
-        } else {
-            $this->_catalogSession->unsBeforeCompareUrl();
         }
         return $this->resultPageFactory->create();
     }

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -9,7 +9,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -44,33 +43,25 @@ class CompareProducts implements SectionSourceInterface
      */
     private $storeManager;
 
-    /**
-     * @var UrlInterface
-     */
-    private $urlBuilder;
-
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param \Magento\Catalog\Helper\Output $outputHelper
      * @param ScopeConfigInterface|null $scopeConfig
      * @param StoreManagerInterface|null $storeManager
-     * @param UrlInterface|null $urlBuilder
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Compare $helper,
         \Magento\Catalog\Model\Product\Url $productUrl,
         \Magento\Catalog\Helper\Output $outputHelper,
         ?ScopeConfigInterface $scopeConfig = null,
-        ?StoreManagerInterface $storeManager = null,
-        ?UrlInterface $urlBuilder = null
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->helper = $helper;
         $this->productUrl = $productUrl;
         $this->outputHelper = $outputHelper;
         $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
-        $this->urlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlInterface::class);
     }
 
     /**
@@ -82,7 +73,7 @@ public function getSectionData()
         return [
             'count' => $count,
             'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
-            'listUrl' => $this->urlBuilder->getUrl('catalog/product_compare/index'),
+            'listUrl' => $this->helper->getListUrl(),
             'items' => $count ? $this->getItems() : [],
             'websiteId' => $this->storeManager->getWebsite()->getId()
         ];

app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php

@@ -17,15 +17,11 @@
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\UrlInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Store\Model\StoreManagerInterface;
 
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
 class CompareProductsTest extends TestCase
 {
     /**
@@ -68,11 +64,6 @@ class CompareProductsTest extends TestCase
      */
     private $websiteMock;
 
-    /**
-     * @var UrlInterface|MockObject
-     */
-    private $urlBuilder;
-
     /**
      * @var array
      */
@@ -97,9 +88,6 @@ protected function setUp(): void
         $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->storeManagerMock = $this->getMockBuilder(
             StoreManagerInterface::class
@@ -109,7 +97,7 @@ protected function setUp(): void
         $this->websiteMock = $this->getMockBuilder(
             Website::class
         )->onlyMethods(
-            ['getId']
+            ['getId',]
         )->disableOriginalConstructor()
             ->getMock();
 
@@ -122,8 +110,8 @@ protected function setUp(): void
                 'productUrl' => $this->productUrlMock,
                 'outputHelper' => $this->outputHelperMock,
                 'scopeConfig'  => $this->scopeConfigMock,
-                'storeManager' => $this->storeManagerMock,
-                'urlBuilder' => $this->urlBuilder
+                'storeManager' => $this->storeManagerMock
+
             ]
         );
     }
@@ -231,10 +219,9 @@ public function testGetSectionData()
             ->method('getItemCollection')
             ->willReturn($itemCollectionMock);
 
-        $this->urlBuilder->expects($this->once())
-            ->method('getUrl')
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
             ->willReturn('http://list.url');
-
         $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
         $this->websiteMock->expects($this->any())->method('getId')->willReturn(1);
         $this->assertEquals(
@@ -282,8 +269,8 @@ public function testGetSectionDataNoItems()
         $this->helperMock->expects($this->never())
             ->method('getItemCollection');
 
-        $this->urlBuilder->expects($this->once())
-            ->method('getUrl')
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
             ->willReturn('http://list.url');
 
         $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
@@ -327,8 +314,8 @@ public function testGetSectionDataSingleItem()
             ->method('getItemCollection')
             ->willReturn($itemCollectionMock);
 
-        $this->urlBuilder->expects($this->once())
-            ->method('getUrl')
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
             ->willReturn('http://list.url');
 
         $this->assertEquals(