Merge branch 'MAGETWO-32115' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-32081

Author: sivaschenko

dev/tests/functional/composer.json

@@ -1,16 +1,16 @@
 {
-    "require": {
-        "magento/mtf": "1.0.0-rc11",
-        "php": ">=5.4.0",
-        "phpunit/phpunit": "4.1.0",
-        "phpunit/phpunit-selenium": ">=1.2",
-        "netwing/selenium-server-standalone": ">=2.35"
-    },
-    "autoload": {
-        "psr-4": {
-            "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
-            "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
-            "Test\\": "generated/Test/"
-        }
+  "require": {
+    "magento/mtf": "1.0.0-rc11",
+    "php": ">=5.4.0",
+    "phpunit/phpunit": "4.1.0",
+    "phpunit/phpunit-selenium": ">=1.2",
+    "netwing/selenium-server-standalone": ">=2.35"
+  },
+  "autoload": {
+    "psr-4": {
+      "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
+      "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+      "Test\\": "generated/Test/"
     }
+  }
 }

dev/tests/functional/lib/Mtf/ObjectManagerFactory.php

@@ -5,11 +5,9 @@
 
 namespace Mtf;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\ObjectManagerInterface as MagentoObjectManager;
-use Magento\Framework\Stdlib\BooleanUtils;
+use Mtf\ObjectManagerInterface as MagentoObjectManager;
+use Mtf\Stdlib\BooleanUtils;
 use Mtf\ObjectManager\Factory;
-use Mtf\System\Config as SystemConfig;
 
 /**
  * Class ObjectManagerFactory
@@ -53,14 +51,11 @@ public function create(array $sharedInstances = [])
         }
 
         $diConfig = new $this->configClassName();
-        $systemConfig = new SystemConfig();
-        $configuration = $systemConfig->getConfigParam();
-        $diConfig->extend($configuration);
         $factory = new Factory($diConfig);
         $argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
-        $argumentMapper = new \Magento\Framework\ObjectManager\Config\Mapper\Dom($argInterpreter);
+        $argumentMapper = new \Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
 
-        $sharedInstances['Magento\Framework\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
+        $sharedInstances['Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
         $objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);
 
         $factory->setObjectManager($objectManager);
@@ -85,35 +80,35 @@ protected function createDeploymentConfig(
         return new \Magento\Framework\App\DeploymentConfig(
             new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
             isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
-            ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
-            : null
+                ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
+                : null
         );
     }
 
     /**
      * Return newly created instance on an argument interpreter, suitable for processing DI arguments
      *
-     * @param \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
-     * @return \Magento\Framework\Data\Argument\InterpreterInterface
+     * @param \Mtf\Stdlib\BooleanUtils $booleanUtils
+     * @return \Mtf\Data\Argument\InterpreterInterface
      */
     protected function createArgumentInterpreter(
-        \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
+        \Mtf\Stdlib\BooleanUtils $booleanUtils
     ) {
-        $constInterpreter = new \Magento\Framework\Data\Argument\Interpreter\Constant();
-        $result = new \Magento\Framework\Data\Argument\Interpreter\Composite(
+        $constInterpreter = new \Mtf\Data\Argument\Interpreter\Constant();
+        $result = new \Mtf\Data\Argument\Interpreter\Composite(
             [
-                'boolean' => new \Magento\Framework\Data\Argument\Interpreter\Boolean($booleanUtils),
-                'string' => new \Magento\Framework\Data\Argument\Interpreter\String($booleanUtils),
-                'number' => new \Magento\Framework\Data\Argument\Interpreter\Number(),
-                'null' => new \Magento\Framework\Data\Argument\Interpreter\NullType(),
+                'boolean' => new \Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
+                'string' => new \Mtf\Data\Argument\Interpreter\String($booleanUtils),
+                'number' => new \Mtf\Data\Argument\Interpreter\Number(),
+                'null' => new \Mtf\Data\Argument\Interpreter\NullType(),
                 'const' => $constInterpreter,
-                'object' => new \Magento\Framework\Data\Argument\Interpreter\Object($booleanUtils),
-                'init_parameter' => new \Magento\Framework\App\Arguments\ArgumentInterpreter($constInterpreter),
+                'object' => new \Mtf\Data\Argument\Interpreter\Object($booleanUtils),
+                'init_parameter' => new \Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
             ],
-            \Magento\Framework\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
+            \Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
         );
         // Add interpreters that reference the composite
-        $result->addInterpreter('array', new \Magento\Framework\Data\Argument\Interpreter\ArrayType($result));
+        $result->addInterpreter('array', new \Mtf\Data\Argument\Interpreter\ArrayType($result));
         return $result;
     }
 

dev/tests/functional/utils/bootstrap.php

@@ -13,6 +13,5 @@
 require $appRoot . '/app/bootstrap.php';
 require __DIR__ . '/../vendor/autoload.php';
 
-$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-$objectManager = $objectManagerFactory->create($_SERVER);
+$objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
 \Mtf\ObjectManagerFactory::configure($objectManager);