Merge branch 'release/v2.2'

javigomez · javigomez · commit a7fd0b21b85e · 2016-04-27T12:28:11.000+02:00
diff --git a/src/Teststatistics.php b/src/Teststatistics.php
@@ -47,10 +47,7 @@ public function _initialize()
 	// we are printing test status and time taken
 	public function beforeTest(TestEvent $e)
 	{
-		$testName = $e->getTest()->toString();
-		preg_match('#\((.*?)\)#', $testName, $fileName);
-
-		self::$tmpCurrentTest = $fileName[1];
+		self::$tmpCurrentTest = \Codeception\Test\Descriptor::getTestFileName($e->getTest());
 	}
 
 	// we are printing test status and time taken
@@ -83,9 +80,7 @@ public function afterStep(StepEvent $e)
 	public function afterTest(TestEvent $e)
 	{
 		$test = new \stdClass;
-		$testName = $e->getTest()->toString();
-		preg_match('#\((.*?)\)#', $testName, $fileName);
-		$test->name = $fileName[1];
+		$test->name = \Codeception\Test\Descriptor::getTestFileName($e->getTest());
 
 
 		// stack overflow: http://stackoverflow.com/questions/16825240/how-to-convert-microtime-to-hhmmssuu

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,7 @@ public function _initialize()`
`47`	`47`	`// we are printing test status and time taken`
`48`	`48`	`public function beforeTest(TestEvent $e)`
`49`	`49`	`{`
`50`		`- $testName = $e->getTest()->toString();`
`51`		`- preg_match('#\((.*?)\)#', $testName, $fileName);`
`52`		`-`
`53`		`- self::$tmpCurrentTest = $fileName[1];`
	`50`	`+ self::$tmpCurrentTest = \Codeception\Test\Descriptor::getTestFileName($e->getTest());`
`54`	`51`	`}`
`55`	`52`
`56`	`53`	`// we are printing test status and time taken`
`@@ -83,9 +80,7 @@ public function afterStep(StepEvent $e)`
`83`	`80`	`public function afterTest(TestEvent $e)`
`84`	`81`	`{`
`85`	`82`	`$test = new \stdClass;`
`86`		`- $testName = $e->getTest()->toString();`
`87`		`- preg_match('#\((.*?)\)#', $testName, $fileName);`
`88`		`- $test->name = $fileName[1];`
	`83`	`+ $test->name = \Codeception\Test\Descriptor::getTestFileName($e->getTest());`
`89`	`84`
`90`	`85`
`91`	`86`	`// stack overflow: http://stackoverflow.com/questions/16825240/how-to-convert-microtime-to-hhmmssuu`