ACPT-987

Fixes for unit tests

Author: JacobBrownAustin

app/code/Magento/Config/Test/Unit/Model/Config/LoaderTest.php

@@ -9,7 +9,7 @@
 
 use Magento\Config\Model\Config\Loader;
 use Magento\Config\Model\ResourceModel\Config\Data\Collection;
-use Magento\Framework\App\Config\Value;
+use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
 use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -23,57 +23,40 @@ class LoaderTest extends TestCase
     protected $_model;
 
     /**
-     * @var MockObject
+     * @var MockObject&ValueFactory
      */
     protected $_configValueFactory;
 
     /**
-     * @var MockObject
+     * @var MockObject&Collection
      */
     protected $_configCollection;
 
+    /**
+     * @var MockObject&CollectionFactory
+     */
+    protected $collectionFactory;
+
     protected function setUp(): void
     {
         $this->_configValueFactory = $this->getMockBuilder(ValueFactory::class)
             ->addMethods(['getCollection'])
             ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->_model = new Loader($this->_configValueFactory);
+        $this->collectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->addMethods(['getCollection'])
+            ->onlyMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->_model = new Loader($this->_configValueFactory, $this->collectionFactory);
         $this->_configCollection = $this->createMock(Collection::class);
-        $this->_configCollection->expects(
-            $this->once()
-        )->method(
-            'addScopeFilter'
-        )->with(
-            'scope',
-            'scopeId',
-            'section'
-        )->willReturnSelf();
-
-        $configDataMock = $this->createMock(Value::class);
-        $this->_configValueFactory->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->willReturn(
-            $configDataMock
-        );
-        $configDataMock->expects(
-            $this->any()
-        )->method(
-            'getCollection'
-        )->willReturn(
-            $this->_configCollection
-        );
-
-        $this->_configCollection->expects(
-            $this->once()
-        )->method(
-            'getItems'
-        )->willReturn(
-            [new DataObject(['path' => 'section', 'value' => 10, 'config_id' => 20])]
-        );
+        $this->_configCollection->expects($this->once())->
+            method('addScopeFilter')->with('scope', 'scopeId', 'section')->willReturnSelf();
+        $this->_configValueFactory->expects($this->never())->method('create');
+        $this->collectionFactory->expects($this->any())->method('create')->willReturn($this->_configCollection);
+        $this->_configCollection->expects($this->once())->method('getItems')
+            ->willReturn([new DataObject(['path' => 'section', 'value' => 10, 'config_id' => 20])]);
     }
 
     protected function tearDown(): void

app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php

@@ -12,6 +12,7 @@
 
 use Magento\Framework\App\State;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager\TestProvidesServiceInterface;
 use Magento\Framework\View\Design\Theme\CustomizationFactory;
 use Magento\Framework\View\Design\Theme\CustomizationInterface;
 use Magento\Framework\View\Design\Theme\Domain\Factory;
@@ -29,7 +30,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ThemeTest extends TestCase
+class ThemeTest extends TestCase implements TestProvidesServiceInterface
 {
     /**
      * @var Theme|MockObject
@@ -102,7 +103,6 @@ protected function setUp(): void
         $this->themeModelFactory = $this->createPartialMock(ThemeFactory::class, ['create']);
         $this->validator = $this->createMock(Validator::class);
         $this->appState = $this->createMock(State::class);
-
         $objectManagerHelper = new ObjectManager($this);
         $arguments = $objectManagerHelper->getConstructArguments(
             Theme::class,
@@ -118,10 +118,20 @@ protected function setUp(): void
                 'themeModelFactory' => $this->themeModelFactory
             ]
         );
-
         $this->_model = $objectManagerHelper->getObject(Theme::class, $arguments);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getServiceForObjectManager(string $type) : ?object
+    {
+        if (Collection::class == $type) {
+            return $this->resourceCollection;
+        }
+        return null;
+    }
+
     /**
      * @inheritdoc
      */

app/code/Magento/Variable/Test/Unit/Model/VariableTest.php

@@ -10,14 +10,15 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\Phrase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager\TestProvidesServiceInterface;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use Magento\Variable\Model\ResourceModel\Variable;
 use Magento\Variable\Model\ResourceModel\Variable\Collection;
-use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Framework\Validation\ValidationException;
 
-class VariableTest extends TestCase
+class VariableTest extends TestCase implements TestProvidesServiceInterface
 {
     /**
      * @var  \Magento\Variable\Model\Variable
@@ -79,6 +80,17 @@ protected function setUp(): void
         $this->validationFailedPhrase = __('Validation has failed.');
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getServiceForObjectManager(string $type) : ?object
+    {
+        if (Collection::class == $type) {
+            return $this->resourceCollectionMock;
+        }
+        return null;
+    }
+
     public function testGetValueHtml()
     {
         $type = \Magento\Variable\Model\Variable::TYPE_HTML;