Merge remote-tracking branch 'origin/AC-8384-v1' into spartans_pr_18042023

Author: glo80326

app/code/Magento/ImportExport/Model/Source/Upload.php

@@ -7,6 +7,8 @@
 
 namespace Magento\ImportExport\Model\Source;
 
+use Laminas\File\Transfer\Adapter\Http;
+use Laminas\Validator\File\Upload as FileUploadValidator;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
@@ -74,19 +76,23 @@ public function __construct(
      */
     public function uploadSource(string $entity)
     {
-        /** @var $adapter \Zend_File_Transfer_Adapter_Http */
+        /**
+         * @var $adapter Http
+         */
         $adapter = $this->httpFactory->create();
         if (!$adapter->isValid(Import::FIELD_NAME_SOURCE_FILE)) {
             $errors = $adapter->getErrors();
-            if ($errors[0] == \Zend_Validate_File_Upload::INI_SIZE) {
+            if ($errors[0] == FileUploadValidator::INI_SIZE) {
                 $errorMessage = $this->importExportData->getMaxUploadSizeMessage();
             } else {
                 $errorMessage = __('The file was not uploaded.');
             }
             throw new LocalizedException($errorMessage);
         }
 
-        /** @var $uploader Uploader */
+        /**
+         * @var $uploader Uploader
+         */
         $uploader = $this->uploaderFactory->create(['fileId' => Import::FIELD_NAME_SOURCE_FILE]);
         $uploader->setAllowedExtensions(['csv', 'zip']);
         $uploader->skipDbProcessing(true);

app/code/Magento/ImportExport/Test/Unit/Model/Source/UploadTest.php

@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Test\Unit\Model\Source;
+
+use Laminas\File\Transfer\Adapter\Http;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\HTTP\Adapter\FileTransferFactory;
+use Magento\Framework\Math\Random;
+use Magento\ImportExport\Helper\Data as DataHelper;
+use Magento\ImportExport\Model\Source\Upload;
+use Magento\MediaStorage\Model\File\Uploader;
+use Magento\MediaStorage\Model\File\UploaderFactory;
+use PHPUnit\Framework\TestCase;
+
+class UploadTest extends TestCase
+{
+    /**
+     * @var Upload
+     */
+    private Upload $upload;
+
+    /**
+     * @var FileTransferFactory
+     */
+    protected FileTransferFactory $httpFactoryMock;
+
+    /**
+     * @var DataHelper
+     */
+    private DataHelper $importExportDataMock;
+
+    /**
+     * @var UploaderFactory
+     */
+    private UploaderFactory $uploaderFactoryMock;
+
+    /**
+     * @var Random
+     */
+    private Random $randomMock;
+
+    /**
+     * @var Filesystem
+     */
+    protected Filesystem $filesystemMock;
+
+    /**
+     * @var Http
+     */
+    private Http $adapterMock;
+
+    /**
+     * @var Uploader
+     */
+    private Uploader $uploaderMock;
+
+    protected function setUp(): void
+    {
+        $directoryAbsolutePath = 'importexport/';
+        $this->httpFactoryMock = $this->createPartialMock(FileTransferFactory::class, ['create']);
+        $this->importExportDataMock = $this->createMock(DataHelper::class);
+        $this->uploaderFactoryMock = $this->getMockBuilder(UploaderFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->randomMock = $this->getMockBuilder(Random::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filesystemMock = $this->createMock(Filesystem::class);
+        $this->adapterMock = $this->createMock(Http::class);
+        $directoryWriteMock = $this->getMockBuilder(WriteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $directoryWriteMock->expects($this->once())->method('getAbsolutePath')->willReturn($directoryAbsolutePath);
+        $this->filesystemMock->expects($this->once())->method('getDirectoryWrite')->willReturn($directoryWriteMock);
+        $this->upload = new Upload(
+            $this->httpFactoryMock,
+            $this->importExportDataMock,
+            $this->uploaderFactoryMock,
+            $this->randomMock,
+            $this->filesystemMock
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testValidateFileUploadReturnsSavedFileArray(): void
+    {
+        $allowedExtensions = ['csv', 'zip'];
+        $savedFileName = 'testString';
+        $importFileId = 'import_file';
+        $randomStringLength=32;
+        $this->adapterMock->method('isValid')->willReturn(true);
+        $this->httpFactoryMock->method('create')->willReturn($this->adapterMock);
+        $this->uploaderMock = $this->createMock(Uploader::class);
+        $this->uploaderMock->method('setAllowedExtensions')->with($allowedExtensions);
+        $this->uploaderMock->method('skipDbProcessing')->with(true);
+        $this->uploaderFactoryMock->method('create')
+            ->with(['fileId' => $importFileId])
+            ->willReturn($this->uploaderMock);
+        $this->randomMock->method('getRandomString')->with($randomStringLength);
+        $this->uploaderMock->method('save')->willReturn(['file' => $savedFileName]);
+        $result = $this->upload->uploadSource($savedFileName);
+        $this->assertIsArray($result);
+        $this->assertEquals($savedFileName, $result['file']);
+    }
+}