Merge pull request #517 from magento-performance/ACPT-1223

aa-kashk · web-flow · commit 240a19d1732f · 2023-04-18T12:24:57.000-05:00
ACPT-1223: Fix Unit Tests for application-server PR
diff --git a/app/code/Magento/CustomerGraphQl/Test/Unit/Model/Context/AddUserInfoToContextTest.php b/app/code/Magento/CustomerGraphQl/Test/Unit/Model/Context/AddUserInfoToContextTest.php
@@ -84,14 +84,6 @@ public function testExecuteForCustomer(): void
         $this->contextParametersMock
             ->expects($this->once())
             ->method('setUserType');
-        $this->sessionMock
-            ->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(true);
-        $this->sessionMock
-            ->expects($this->once())
-            ->method('getCustomerData')
-            ->willReturn($this->customerMock);
         $this->customerRepositoryMock
             ->expects($this->once())
             ->method('getById')
diff --git a/lib/internal/Magento/Framework/Composer/DependencyChecker.php b/lib/internal/Magento/Framework/Composer/DependencyChecker.php
@@ -17,7 +17,7 @@
 class DependencyChecker
 {
     /**
-     * @var Application
+     * @var ApplicationFactory
      */
     private $applicationFactory;
 
@@ -29,7 +29,7 @@ class DependencyChecker
     /**
      * Constructor
      *
-     * @param Application $applicationFactory
+     * @param ApplicationFactory $applicationFactory
      * @param DirectoryList $directoryList
      */
     public function __construct(ApplicationFactory $applicationFactory, DirectoryList $directoryList)
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
@@ -8,28 +8,46 @@
 namespace Magento\Framework\Composer\Test\Unit;
 
 use Composer\Console\Application;
+use Composer\Console\ApplicationFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Composer\DependencyChecker;
 use PHPUnit\Framework\TestCase;
 
 class DependencyCheckerTest extends TestCase
 {
+
+    private ApplicationFactory $composerFactory;
+
+    private Application $composerApp;
+
+    protected function setUp(): void
+    {
+        $this->composerFactory = $this->getMockBuilder(ApplicationFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->composerApp = $this->getMockBuilder(Application::class)
+            ->setMethods(['setAutoExit', 'resetComposer', 'run','__destruct'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->composerFactory->method('create')->willReturn($this->composerApp);
+        parent::setUp();
+
+    }
     /**
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function testCheckDependencies(): void
     {
-        $composerApp = $this->getMockBuilder(Application::class)
-            ->setMethods(['setAutoExit', 'resetComposer', 'run','__destruct'])
-            ->disableOriginalConstructor()
-            ->getMock();
+
         $directoryList = $this->createMock(DirectoryList::class);
         $directoryList->expects($this->exactly(2))->method('getRoot');
-        $composerApp->expects($this->once())->method('setAutoExit')->with(false);
-        $composerApp->expects($this->any())->method('__destruct');
+        $this->composerApp->expects($this->once())->method('setAutoExit')->with(false);
+        $this->composerApp->expects($this->any())->method('__destruct');
 
-        $composerApp
+        $this->composerApp
             ->method('run')
             ->willReturnOnConsecutiveCalls(
                 $this->returnCallback(
@@ -52,7 +70,7 @@ function ($input, $buffer) {
                 )
             );
 
-        $dependencyChecker = new DependencyChecker($composerApp, $directoryList);
+        $dependencyChecker = new DependencyChecker($this->composerFactory, $directoryList);
         $expected = [
             'magento/package-a' => ['magento/package-b', 'magento/package-c'],
             'magento/package-b' => ['magento/package-c', 'magento/package-d'],
@@ -69,16 +87,12 @@ function ($input, $buffer) {
      */
     public function testCheckDependenciesExcludeSelf(): void
     {
-        $composerApp = $this->getMockBuilder(Application::class)
-            ->setMethods(['setAutoExit', 'resetComposer', 'run','__destruct'])
-            ->disableOriginalConstructor()
-            ->getMock();
         $directoryList = $this->createMock(DirectoryList::class);
         $directoryList->expects($this->exactly(3))->method('getRoot');
-        $composerApp->expects($this->once())->method('setAutoExit')->with(false);
-        $composerApp->expects($this->any())->method('__destruct');
+        $this->composerApp->expects($this->once())->method('setAutoExit')->with(false);
+        $this->composerApp->expects($this->any())->method('__destruct');
 
-        $composerApp
+        $this->composerApp
             ->method('run')
             ->willReturnOnConsecutiveCalls(
                 $this->returnCallback(
@@ -109,7 +123,7 @@ function ($input, $buffer) {
                 )
             );
 
-        $dependencyChecker = new DependencyChecker($composerApp, $directoryList);
+        $dependencyChecker = new DependencyChecker($this->composerFactory, $directoryList);
         $expected = [
             'magento/package-a' => [],
             'magento/package-b' => ['magento/package-d'],
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixedProxy.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixedProxy.txt
@@ -71,6 +71,14 @@ class SampleMixed_Proxy extends SampleMixed implements \Magento\Framework\Object
         $this->_subject = clone $this->_getSubject();
     }
 
+    /**
+     * Clone proxied instance
+     */
+    public function __debugInfo()
+    {
+        return ['i' => $this->_subject];
+    }
+
     /**
      * Get proxied instance
      *
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
@@ -71,6 +71,14 @@ class Sample_Proxy extends Sample implements \Magento\Framework\ObjectManager\No
         $this->_subject = clone $this->_getSubject();
     }
 
+    /**
+     * Clone proxied instance
+     */
+    public function __debugInfo()
+    {
+        return ['i' => $this->_subject];
+    }
+
     /**
      * Get proxied instance
      *
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
@@ -60,7 +60,7 @@ public function testGet()
         $acceptTypes = ['application/json'];
 
         /** Mock request getAcceptTypes method to return specified value. */
-        $this->_requestMock->expects($this->once())->method('getAcceptTypes')->willReturn($acceptTypes);
+        $this->_requestMock->expects($this->once())->method('getHeader')->willReturn('application/json');
         /** Mock renderer. */
         $rendererMock = $this->getMockBuilder(
             Json::class
@@ -84,14 +84,14 @@ public function testGet()
      */
     public function testGetWithWrongAcceptHttpHeader()
     {
-        /** Mock request to return empty Accept Types. */
-        $this->_requestMock->expects($this->once())->method('getAcceptTypes')->willReturn('');
+        /** Mock request to return invalid Accept Types. */
+        $this->_requestMock->expects($this->once())->method('getHeader')->willReturn('invalid');
         try {
             $this->_factory->get();
             $this->fail("Exception is expected to be raised");
         } catch (Exception $e) {
             $exceptionMessage = 'Server cannot match any of the given Accept HTTP header media type(s) ' .
-                'from the request: "" with media types from the config of response renderer.';
+                'from the request: "invalid" with media types from the config of response renderer.';
             $this->assertInstanceOf(Exception::class, $e, 'Exception type is invalid');
             $this->assertEquals($exceptionMessage, $e->getMessage(), 'Exception message is invalid');
             $this->assertEquals(
@@ -107,9 +107,8 @@ public function testGetWithWrongAcceptHttpHeader()
      */
     public function testGetWithWrongRendererClass()
     {
-        $acceptTypes = ['application/json'];
         /** Mock request getAcceptTypes method to return specified value. */
-        $this->_requestMock->expects($this->once())->method('getAcceptTypes')->willReturn($acceptTypes);
+        $this->_requestMock->expects($this->once())->method('getHeader')->willReturn('application/json');
         /** Mock object to return \Magento\Framework\DataObject */
         $this->_objectManagerMock->expects(
             $this->once()

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,14 @@ class SampleMixed_Proxy extends SampleMixed implements \Magento\Framework\Object`
`71`	`71`	`$this->_subject = clone $this->_getSubject();`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ /**`
	`75`	`+ * Clone proxied instance`
	`76`	`+ */`
	`77`	`+ public function __debugInfo()`
	`78`	`+ {`
	`79`	`+ return ['i' => $this->_subject];`
	`80`	`+ }`
	`81`	`+`
`74`	`82`	`/**`
`75`	`83`	`* Get proxied instance`
`76`	`84`	`*`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,14 @@ class Sample_Proxy extends Sample implements \Magento\Framework\ObjectManager\No`
`71`	`71`	`$this->_subject = clone $this->_getSubject();`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ /**`
	`75`	`+ * Clone proxied instance`
	`76`	`+ */`
	`77`	`+ public function __debugInfo()`
	`78`	`+ {`
	`79`	`+ return ['i' => $this->_subject];`
	`80`	`+ }`
	`81`	`+`
`74`	`82`	`/**`
`75`	`83`	`* Get proxied instance`
`76`	`84`	`*`