Merge branch 'develop' into MQE-884

Author: aljcalandra

composer.json

@@ -24,8 +24,9 @@
         "squizlabs/php_codesniffer": "1.5.3",
         "sebastian/phpcpd": "~3.0",
         "brainmaestro/composer-git-hooks": "^2.3",
-        "codeception/aspect-mock": "^2.0",
-        "goaop/framework": "2.1.2",
+        "doctrine/cache": "<1.7.0",
+        "codeception/aspect-mock": "^3.0",
+        "goaop/framework": "2.2.0",
         "codacy/coverage": "^1.4",
         "phpmd/phpmd": "^2.6.0",
         "rregeer/phpunit-coverage-check": "^0.1.4",

composer.lock

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

dev/tests/.cache/.gitignore

@@ -13,7 +13,14 @@
 $kernel = \AspectMock\Kernel::getInstance();
 $kernel->init([
     'debug' => true,
-    'includePaths' => [PROJECT_ROOT . '/src']
+    'includePaths' => [PROJECT_ROOT . '/src'],
+    'cacheDir' => PROJECT_ROOT .
+        DIRECTORY_SEPARATOR .
+        'dev' .
+        DIRECTORY_SEPARATOR .
+        'tests' .
+        DIRECTORY_SEPARATOR .
+        '.cache'
 ]);
 
 // set mftf appplication context

dev/tests/_bootstrap.php

@@ -88,6 +88,7 @@ public function testGetTestObject()
             $testDataArrayBuilder->testName,
             [$expectedTestActionObject],
             [
+                'features' => ['NO MODULE DETECTED'],
                 'group' => ['test']
             ],
             [
@@ -101,6 +102,15 @@ public function testGetTestObject()
         $this->assertEquals($expectedTestObject, $actualTestObject);
     }
 
+    /**
+     * Tests basic getting of a test that has a fileName
+     */
+    public function testGetTestWithFileName()
+    {
+        $this->markTestIncomplete();
+        //TODO
+    }
+
     /**
      * Tests the function used to get a series of relevant tests by group.
      *
@@ -131,6 +141,44 @@ public function testGetTestsByGroup()
         $this->assertArrayNotHasKey('excludeTest', $tests);
     }
 
+    /**
+     * Tests the function used to parse and determine a test's Module (used in allure Features annotation)
+     *
+     * @throws \Exception
+     */
+    public function testGetTestWithModuleName()
+    {
+        // set up Test Data
+        $moduleExpected = "SomeTestModule";
+        $filepath = DIRECTORY_SEPARATOR .
+            "user" .
+            "magento2ce" . DIRECTORY_SEPARATOR .
+            "dev" . DIRECTORY_SEPARATOR .
+            "tests" . DIRECTORY_SEPARATOR .
+            "acceptance" . DIRECTORY_SEPARATOR .
+            "tests" . DIRECTORY_SEPARATOR .
+            $moduleExpected . DIRECTORY_SEPARATOR .
+            "Tests" . DIRECTORY_SEPARATOR .
+            "text.xml";
+        // set up mock data
+        $testDataArrayBuilder = new TestDataArrayBuilder();
+        $mockData = $testDataArrayBuilder
+            ->withAnnotations()
+            ->withFailedHook()
+            ->withAfterHook()
+            ->withBeforeHook()
+            ->withTestActions()
+            ->withFileName($filepath)
+            ->build();
+        $this->setMockParserOutput(['tests' => $mockData]);
+        // Execute Test Method
+        $toh = TestObjectHandler::getInstance();
+        $actualTestObject = $toh->getObject($testDataArrayBuilder->testName);
+        $moduleName = $actualTestObject->getAnnotations()["features"][0];
+        //performAsserts
+        $this->assertEquals($moduleExpected, $moduleName);
+    }
+
     /**
      * Function used to set mock for parser return and force init method to run between tests.
      *