Merge branch 'MAGETWO-28383-merge' of https://github.corp.ebay.com/magento-extensibility/magento2ce into MAGETWO-28383-merge

Author: Dale Sikkema

dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php

@@ -479,7 +479,6 @@ protected function removeSpecialCases($badClasses, $file, $contents, $namespaceP
                 '/dev/tests/performance/framework/',
                 '/dev/tests/static/framework/',
                 '/dev/tests/static/testsuite/',
-                '/dev/tests/unit/framework/',
                 '/setup/src/',
             ];
             // Full list of directories where there may be namespace classes
@@ -536,6 +535,7 @@ public function testCoversAnnotation()
                 BP . '/dev/tests/integration',
                 BP . '/app/code/*/*/Test/Unit',
                 BP . '/lib/internal/*/*/*/Test/Unit',
+                BP . '/lib/internal/Magento/Framework/Test/Unit',
                 BP . '/dev/tools/Magento/Tools/*/Test/Unit',
                 BP . '/setup/src/Magento/Setup/Test/Unit',
             ],

dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt

@@ -3,4 +3,3 @@ dev/tests/functional
 dev/tests/integration
 dev/tests/performance
 dev/tests/static
-dev/tests/unit

dev/tests/unit/framework/autoload.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__ . '/../../../../app/autoload.php';
 
 if (!defined('TESTS_TEMP_DIR')) {
     define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');

dev/tests/unit/framework/bootstrap.php

@@ -19,7 +19,6 @@ class FilesCollectorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        // dev/tests/unit/testsuite/tools/I18n/_files/files_collector
         $this->_testDir = str_replace('\\', '/', realpath(dirname(__FILE__))) . '/_files/files_collector/';
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);

dev/tools/Magento/Tools/I18n/Test/Unit/FilesCollectorTest.php

@@ -27,7 +27,6 @@ class JsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        // dev/tests/unit/testsuite/tools/I18n/Parser/Adapter/_files/file.js
         $this->_testFile = str_replace('\\', '/', realpath(dirname(__FILE__))) . '/_files/file.js';
         $this->_stringsCount = count(file($this->_testFile));
 

dev/tools/Magento/Tools/I18n/Test/Unit/Parser/Adapter/JsTest.php

@@ -19,7 +19,6 @@ class XmlTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        // dev/tests/unit/testsuite/tools/I18n/Parser/Adapter/_files/layout.xml
         $this->_testFile = str_replace('\\', '/', realpath(dirname(__FILE__))) . '/_files/default.xml';
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);

dev/tools/Magento/Tools/I18n/Test/Unit/Parser/Adapter/XmlTest.php

@@ -949,7 +949,6 @@ public function classFileExists($class, &$path = '')
             '/dev/tests/static/framework/',
             '/dev/tests/static/testsuite/',
             '/dev/tests/functional/tests/app/',
-            '/dev/tests/unit/framework/',
             '/setup/src/'
         ];