Merge branch 'sprint-develop' of https://github.com/magento-pangolin/magento2-functional-testing-framework into sprint-develop

Author: jilu1

.gitattributes

@@ -0,0 +1,3 @@
+# Declare files that will always have LF line endings on checkout.
+dev/tests/verification/Resources/TestSuiteGeneration1.txt text=auto !eol
+dev/tests/verification/Resources/*.txt text eol=lf

bin/phpunit-checks.bat

@@ -0,0 +1,10 @@
+:: Copyright © Magento, Inc. All rights reserved.
+:: See COPYING.txt for license details.
+
+@echo ===============================UNIT TESTS===============================
+@echo off
+call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite unit --coverage-xml build\coverage-xml
+
+@echo off
+@echo ===============================VERIFICATION TESTS===============================
+call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite verification --coverage-xml build\coverage-xml

bin/static-checks.bat

@@ -0,0 +1,20 @@
+:: Copyright © Magento, Inc. All rights reserved.
+:: See COPYING.txt for license details.
+
+@echo off
+@echo ===============================PHP CODE SNIFFER REPORT===============================
+call vendor\bin\phpcs .\src --standard=.\dev\tests\static\Magento
+call vendor\bin\phpcs .\dev\tests\unit --standard=.\dev\tests\static\Magento
+call vendor\bin\phpcs .\dev\tests\verification --standard=.\dev\tests\static\Magento --ignore=dev\tests\verification\_generated
+
+@echo ===============================COPY PASTE DETECTOR REPORT===============================
+call vendor\bin\phpcpd .\src
+
+:: Uncomment lines as part of MQE-590
+:: @echo "===============================PHP MESS DETECTOR REPORT===============================
+:: vendor\bin\phpmd .\src text \dev\tests\static\Magento\CodeMessDetector\ruleset.xml --exclude _generated
+
+@echo ===============================MAGENTO COPYRIGHT REPORT===============================
+echo msgbox "INFO:Copyright check currently not run as part of .bat implementation" > "%temp%\popup.vbs"
+wscript.exe "%temp%\popup.vbs"
+::bin\copyright-check

dev/tests/verification/Resources/TestSuiteGeneration1.txt

@@ -16,6 +16,13 @@ class SuiteGenerationTest extends TestCase
     const RESOURCES_DIR = TESTS_BP . DIRECTORY_SEPARATOR . 'verification' . DIRECTORY_SEPARATOR . 'Resources';
     const CONFIG_YML_FILE = FW_BP . DIRECTORY_SEPARATOR . SuiteGenerator::YAML_CODECEPTION_CONFIG_FILENAME;
 
+    const MANIFEST_RESULTS = [
+        'SampleSuite3Cest.php:IncludeTest',
+        'SampleSuite5Cest.php:additionalTest',
+        'SampleSuiteCest.php:IncludeTest',
+        'SampleSuite4Cest.php:IncludeTest'
+    ];
+
     private static $YML_EXISTS_FLAG = false;
     private static $TEST_GROUPS = [];
 
@@ -45,18 +52,34 @@ public function testSuiteGeneration1()
         $yml = Yaml::parse(file_get_contents(self::CONFIG_YML_FILE));
         $this->assertArrayHasKey($groupName, $yml['groups']);
 
-        // Validate test manifest contents
-        $actualManifest = TESTS_BP .
+        $suiteResultBaseDir = TESTS_BP .
             DIRECTORY_SEPARATOR .
             "verification" .
             DIRECTORY_SEPARATOR .
             "_generated" .
             DIRECTORY_SEPARATOR .
             $groupName .
-            DIRECTORY_SEPARATOR .
-            TestManifest::TEST_MANIFEST_FILENAME;
-        $expectedManifest = self::RESOURCES_DIR .  DIRECTORY_SEPARATOR . "TestSuiteGeneration1.txt";
-        $this->assertFileEquals($expectedManifest, $actualManifest, '', true, true);
+            DIRECTORY_SEPARATOR;
+
+        // Validate test manifest contents
+        $actualManifest = $suiteResultBaseDir . TestManifest::TEST_MANIFEST_FILENAME;
+        $actualTestReferences = explode(PHP_EOL, file_get_contents($actualManifest));
+
+        for ($i = 0; $i < count($actualTestReferences); $i++) {
+            if (empty($actualTestReferences[$i])) {
+                continue;
+            }
+
+            $this->assertStringEndsWith(self::MANIFEST_RESULTS[$i], $actualTestReferences[$i]);
+            $this->assertNotFalse(strpos($actualTestReferences[$i], $groupName));
+        }
+
+        // Validate expected php files exist
+        foreach (self::MANIFEST_RESULTS as $expectedTestReference) {
+            $cestName = explode(":", $expectedTestReference, 2);
+            $this->assertFileExists($suiteResultBaseDir . $cestName[0]);
+        }
+
     }
 
     public static function tearDownAfterClass()

dev/tests/verification/Tests/SuiteGenerationTest.php

@@ -64,7 +64,7 @@ protected function getFileCollection($filename, $scope)
         $modulesPath = $this->moduleResolver->getModulesPath();
 
         foreach ($modulesPath as $modulePath) {
-            $path = $modulePath . '/' . $scope . '/';
+            $path = $modulePath . DIRECTORY_SEPARATOR . $scope . DIRECTORY_SEPARATOR;
             if (is_readable($path)) {
                 $directoryIterator = new \RecursiveIteratorIterator(
                     new \RecursiveDirectoryIterator(

src/Magento/FunctionalTestingFramework/Config/FileResolver/Mask.php

@@ -28,7 +28,7 @@ public function get($filename, $scope)
         if (!$filename) {
             return [];
         }
-        $scope = str_replace('\\', '/', $scope);
+        $scope = str_replace('\\', DIRECTORY_SEPARATOR, $scope);
         return new File($this->getFilePaths($filename, $scope));
     }
 
@@ -59,19 +59,20 @@ private function getPathPatterns($filename, $scope)
     {
         if (substr($scope, 0, strlen(FW_BP)) === FW_BP) {
             $patterns = [
-                $scope . '/' . $filename,
-                $scope . '/*/' . $filename
+                $scope . DIRECTORY_SEPARATOR . $filename,
+                $scope . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $filename
             ];
         } else {
             $defaultPath = dirname(dirname(dirname(dirname(__DIR__))));
-            $defaultPath = str_replace('\\', '/', $defaultPath);
+            $defaultPath = str_replace('\\', DIRECTORY_SEPARATOR, $defaultPath);
             $patterns = [
-                $defaultPath . '/' . $scope . '/' . $filename,
-                $defaultPath . '/' . $scope . '/*/' . $filename,
-                FW_BP . '/' . $scope . '/' . $filename,
-                FW_BP . '/' . $scope . '/*/' . $filename
+                $defaultPath . DIRECTORY_SEPARATOR . $scope . DIRECTORY_SEPARATOR . $filename,
+                $defaultPath . DIRECTORY_SEPARATOR . $scope . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR
+                . $filename,
+                FW_BP . DIRECTORY_SEPARATOR . $scope . DIRECTORY_SEPARATOR . $filename,
+                FW_BP . DIRECTORY_SEPARATOR . $scope . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $filename
             ];
         }
-        return str_replace('/', DIRECTORY_SEPARATOR, $patterns);
+        return str_replace(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $patterns);
     }
 }

src/Magento/FunctionalTestingFramework/Config/FileResolver/Primary.php

@@ -25,12 +25,12 @@ class SchemaLocator implements \Magento\FunctionalTestingFramework\Config\Schema
      */
     public function __construct($schemaPath)
     {
-        if (constant('FW_BP') && file_exists(FW_BP . '/' . $schemaPath)) {
-            $this->schemaPath =  FW_BP . '/' . $schemaPath;
+        if (constant('FW_BP') && file_exists(FW_BP . DIRECTORY_SEPARATOR . $schemaPath)) {
+            $this->schemaPath =  FW_BP . DIRECTORY_SEPARATOR . $schemaPath;
         } else {
             $path = dirname(dirname(dirname(__DIR__)));
-            $path = str_replace('\\', '/', $path);
-            $this->schemaPath =  $path . '/' . $schemaPath;
+            $path = str_replace('\\', DIRECTORY_SEPARATOR, $path);
+            $this->schemaPath =  $path . DIRECTORY_SEPARATOR . $schemaPath;
         }
     }
 

src/Magento/FunctionalTestingFramework/Config/SchemaLocator.php

@@ -132,7 +132,7 @@ private function initDataObjects()
      */
     private function parseEnvVariables()
     {
-        $envFilename = PROJECT_ROOT . '/.env';
+        $envFilename = PROJECT_ROOT . DIRECTORY_SEPARATOR . '.env';
         if (file_exists($envFilename)) {
             $envData = [];
             $envFile = file($envFilename);

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php

@@ -20,7 +20,7 @@ class MagentoSequence extends Sequence
 }
 
 if (!function_exists('msq') && !function_exists('msqs')) {
-    require_once __DIR__ . '/../Util/msq.php';
+    require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'Util' . DIRECTORY_SEPARATOR . 'msq.php';
 } else {
     throw new ModuleException('Magento\FunctionalTestingFramework\Module\MagentoSequence', "function 'msq' and 'msqs' already defined");
 }