- Fix unit test

- Refactoring

Author: VladimirZaets

app/code/Magento/MediaGallery/Model/Directory/Config.php

@@ -14,6 +14,8 @@
  */
 class Config
 {
+    private const XML_PATH_BLACKLIST_PATTERNS = 'blacklist/patterns';
+
     /**
      * @var DataInterface
      */
@@ -38,4 +40,14 @@ public function get($key = null, $default = null)
     {
         return $this->data->get($key, $default);
     }
+
+    /**
+     * Returns list of blacklist regexp patterns
+     *
+     * @return array
+     */
+    public function getBlacklistPatterns() : array
+    {
+        return $this->data->get(self::XML_PATH_BLACKLIST_PATTERNS);
+    }
 }

app/code/Magento/MediaGallery/Model/Directory/Config/Converter.php

@@ -40,7 +40,7 @@ public function convert($source): array
         $result = [];
 
         if (!$source instanceof \DOMDocument) {
-            return $result;
+            throw new \InvalidArgumentException('The source should be instance of DOMDocument');
         }
 
         foreach ($source->getElementsByTagName(self::BLACKLIST_TAG_NAME) as $blacklist) {

app/code/Magento/MediaGallery/Model/Directory/Config/Reader.php

@@ -7,12 +7,8 @@
 
 namespace Magento\MediaGallery\Model\Directory\Config;
 
-use Magento\Framework\App\Area;
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\Reader\Filesystem;
-use Magento\Framework\Config\FileResolverInterface;
-use Magento\Framework\Config\ValidationStateInterface;
-use Magento\Framework\Config\Dom;
 
 /**
  * Media gallery directory config reader
@@ -28,43 +24,4 @@ class Reader extends Filesystem implements ReaderInterface
         '/config/patterns' => 'patterns',
         '/config/patterns/pattern' => 'name',
     ];
-
-    /**
-     * XML Configuration file name
-     */
-    private const XML_FILE_NAME = 'directory.xml';
-
-    /**
-     * Construct the FileSystem Reader Class
-     *
-     * @param \Magento\Framework\Config\FileResolverInterface $fileResolver
-     * @param Converter $converter
-     * @param SchemaLocator $schemaLocator
-     * @param \Magento\Framework\Config\ValidationStateInterface $validationState
-     * @param string $fileName
-     * @param array $idAttributes
-     * @param string $domDocumentClass
-     * @param string $defaultScope
-     */
-    public function __construct(
-        FileResolverInterface $fileResolver,
-        Converter $converter,
-        SchemaLocator $schemaLocator,
-        ValidationStateInterface $validationState,
-        $fileName = self::XML_FILE_NAME,
-        $idAttributes = [],
-        $domDocumentClass = Dom::class,
-        $defaultScope = Area::AREA_GLOBAL
-    ) {
-        parent::__construct(
-            $fileResolver,
-            $converter,
-            $schemaLocator,
-            $validationState,
-            $fileName,
-            $idAttributes,
-            $domDocumentClass,
-            $defaultScope
-        );
-    }
 }

app/code/Magento/MediaGallery/Model/Directory/IsBlacklisted.php

@@ -14,8 +14,6 @@
  */
 class IsBlacklisted implements IsBlacklistedInterface
 {
-    const XML_PATH_BLACKLIST_PATTERNS = 'blacklist/patterns';
-
     /**
      * @var Config
      */
@@ -37,7 +35,7 @@ public function __construct(Config $config)
      */
     public function execute(string $path): bool
     {
-        foreach ($this->config->get(self::XML_PATH_BLACKLIST_PATTERNS) as $pattern) {
+        foreach ($this->config->getBlacklistPatterns() as $pattern) {
             if (empty($pattern)) {
                 continue;
             }

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/SaveTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
 
-use Magento\Eav\Helper\Data;
 use Magento\MediaGallery\Model\Asset\Command\Save;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\Framework\App\ResourceConnection;

app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use Magento\MediaGallery\Model\Directory\IsBlacklisted;
+use Magento\MediaGallery\Model\Directory\Config;
 
 /**
  * Test the Excluded model
@@ -21,20 +22,24 @@ class IsBlacklistedTest extends TestCase
      */
     private $object;
 
+    /**
+     * @var
+     */
+    private $config;
+
     /**
      * Initialize basic test class mocks
      */
     protected function setUp(): void
     {
-        $this->object = (new ObjectManager($this))->getObject(
-            IsBlacklisted::class,
-            [
-                'patterns' => [
-                    'tmp' => '/pub\/media\/tmp/',
-                    'captcha' => '/pub\/media\/captcha/'
-                ]
-            ]
-        );
+        $this->config = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
+        $this->config->expects($this->at(0))->method('getBlacklistPatterns')->willReturn([
+            'tmp' => '/pub\/media\/tmp/',
+            'captcha' => '/pub\/media\/captcha/'
+        ]);
+        $this->object = (new ObjectManager($this))->getObject(IsBlacklisted::class, [
+            'config' => $this->config
+        ]);
     }
 
     /**