ACPT-987

fixes for unit tests

Author: JacobBrownAustin

lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager.php

@@ -11,6 +11,7 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestListener;
 use PHPUnit\Framework\TestListenerDefaultImplementation;
+use Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager\TestProvidesServiceInterface;
 
 /**
  * The event listener which instantiates ObjectManager before test run
@@ -36,6 +37,12 @@ public function startTest(Test $test): void
             $objectManagerMock = $test->getMockBuilder(ObjectManagerInterface::class)
                 ->getMockForAbstractClass();
             $createMockCallback = function ($type) use ($test) {
+                if ($test instanceof TestProvidesServiceInterface) {
+                    $serviceObject = $test->getServiceForObjectManager($type);
+                    if ($serviceObject) {
+                        return $serviceObject;
+                    }
+                }
                 return $test->getMockBuilder($type)
                     ->disableOriginalConstructor()
                     ->getMockForAbstractClass();

lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager/TestProvidesServiceInterface.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager;
+
+interface TestProvidesServiceInterface
+{
+    /**
+     * Gets a service object from a test to use by the mock object manager
+     *
+     * @param string $type
+     * @return object|null
+     */
+    public function getServiceForObjectManager(string $type) : ?object;
+}