MAGETWO-33080: Preferences, Shared Instance creation and Compiled Factory optimization

- fixed test

Author: dkvashninbay

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Factory/CompiledTest.php

@@ -51,7 +51,8 @@ public function testCreateSimple()
     {
         $expectedConfig = $this->getSimpleConfig();
 
-        $requestedType = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\SimpleClassTesting';
+        $requestedType = 'requestedType';
+        $type = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\SimpleClassTesting';
         $sharedType = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\DependencySharedTesting';
         $nonSharedType = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\DependencyTesting';
 
@@ -64,6 +65,15 @@ public function testCreateSimple()
                     [$nonSharedType, null]
                 ]
             );
+        $this->config->expects($this->any())
+            ->method('getInstanceType')
+            ->willReturnMap(
+                [
+                    [$requestedType, $type],
+                    [$sharedType, $sharedType],
+                    [$nonSharedType, $nonSharedType]
+                ]
+            );
 
         $this->factory->setArguments(
             [
@@ -90,7 +100,8 @@ public function testCreateSimpleConfiguredArguments()
     {
         $expectedConfig = $this->getSimpleNestedConfig();
 
-        $requestedType = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\SimpleClassTesting';
+        $type = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\SimpleClassTesting';
+        $requestedType = 'requestedType';
         $sharedType = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\DependencySharedTesting';
         $nonSharedType = 'Magento\Framework\ObjectManager\Factory\Fixture\Compiled\DependencyTesting';
 
@@ -103,6 +114,15 @@ public function testCreateSimpleConfiguredArguments()
                     [$nonSharedType, null]
                 ]
             );
+        $this->config->expects($this->any())
+            ->method('getInstanceType')
+            ->willReturnMap(
+                [
+                    [$requestedType, $type],
+                    [$sharedType, $sharedType],
+                    [$nonSharedType, $nonSharedType]
+                ]
+            );
 
         $this->factory->setArguments(
             [

dev/tests/unit/testsuite/Magento/Tools/Di/App/CompilerTest.php

@@ -106,7 +106,17 @@ private function getPreferences()
                         'Magento\Tools\Di\Compiler\Config\Writer\Filesystem',
                     'Magento\Tools\Di\Compiler\Log\Writer\WriterInterface' =>
                         'Magento\Tools\Di\Compiler\Log\Writer\Console'
+                ],
+            'Magento\Tools\Di\Compiler\Config\Chain\ModificationChain' => [
+                'arguments' => [
+                    'modificationsList' => [
+                        'PreferencesResolving' =>
+                            ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\PreferencesResolving'],
+                        'ArgumentsSerialization' =>
+                            ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],
+                    ]
                 ]
+            ]
         ];
     }