Merge branch 'ACP2E-2710' of https://github.com/magento-l3/magento2ce into 2.4-develop

Author: thiaramus

app/code/Magento/ImportExport/Helper/Report.php

@@ -61,7 +61,7 @@ public function __construct(
      */
     public function getExecutionTime($time)
     {
-        $reportTime = $this->timeZone->date($time);
+        $reportTime = $this->timeZone->date(new \DateTime($time));
         $timeDiff = $reportTime->diff($this->timeZone->date());
         return $timeDiff->format('%H:%I:%S');
     }

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -11,13 +11,17 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\HTTP\Adapter\FileTransferFactory;
 use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Phrase;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
 use Magento\Framework\Stdlib\DateTime\Timezone;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ImportExport\Helper\Data;
@@ -49,11 +53,6 @@ class ReportTest extends TestCase
      */
     protected $context;
 
-    /**
-     * @var Timezone|MockObject
-     */
-    protected $timezone;
-
     /**
      * @var Filesystem|MockObject
      */
@@ -89,11 +88,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
-        $this->timezone = $this->getMockBuilder(Timezone::class)
-            ->addMethods(['diff', 'format'])
-            ->onlyMethods(['date', 'getConfigTimezone'])
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->varDirectory = $this->createPartialMock(
             Write::class,
             ['getRelativePath', 'getAbsolutePath', 'readFile', 'isFile', 'stat']
@@ -143,7 +137,7 @@ protected function setUp(): void
             Report::class,
             [
                 'context' => $this->context,
-                'timeZone' => $this->timezone,
+                'timeZone' => $this->getTimezone(),
                 'filesystem' =>$this->filesystem
             ]
         );
@@ -162,13 +156,27 @@ public function testGetExecutionTime()
 
         $startDateMock = $this->createTestProxy(\DateTime::class, ['time' => $startDate]);
         $endDateMock = $this->createTestProxy(\DateTime::class, ['time' => $endDate]);
-        $this->timezone->method('date')
+        $this->getTimezone()->method('date')
             ->withConsecutive([$startDate], [])
             ->willReturnOnConsecutiveCalls($startDateMock, $endDateMock);
 
         $this->assertEquals($executionTime, $this->report->getExecutionTime($startDate));
     }
 
+    /**
+     * Assert the report update execution time with default UTC timezone.
+     *
+     * @return void
+     */
+    public function testGetExecutionTimeDefaultTimezone()
+    {
+        $this->assertEquals(
+            '00:00:03',
+            $this->report->getExecutionTime((new \DateTime('now - 3seconds'))->format('Y-m-d H:i:s')),
+            'Report update execution time is not a match.'
+        );
+    }
+
     /**
      * Test getExecutionTime()
      */
@@ -306,4 +314,34 @@ public function testGetDelimiter()
             $this->report->getDelimiter()
         );
     }
+
+    /**
+     * Returns Timezone, UTC by default
+     *
+     * @param string $timezone
+     * @return Timezone|MockObject
+     */
+    private function getTimezone(string $timezone = 'UTC'): Timezone|MockObject
+    {
+        $localeResolver = $this->getMockBuilder(ResolverInterface::class)->getMock();
+        $scopeResolver = $this->getMockBuilder(ScopeResolverInterface::class)->getMock();
+        $dateTime = $this->getMockBuilder(DateTime::class)->getMock();
+        $scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)->getMock();
+        $timezoneMock = $this->getMockBuilder(Timezone::class)
+            ->addMethods(['diff', 'format'])
+            ->onlyMethods(['getConfigTimezone'])
+            ->setConstructorArgs([
+                'scopeResolver' => $scopeResolver,
+                'localeResolver' => $localeResolver,
+                'dateTime' => $dateTime,
+                'scopeConfig' => $scopeConfig,
+                'scopeType' => 'default',
+                'defaultTimezonePath' => 'general/locale/timezone',
+                'dateFormatterFactory' => (new DateFormatterFactory())
+            ])->getMock();
+
+        $timezoneMock->method('getConfigTimezone')->willReturn($timezone);
+
+        return $timezoneMock;
+    }
 }