Merge pull request #22 from vania-pooh/master

Fixed issue with not processed @depend annotation - skipped test ignored...

Author: robot-bucket

src/Yandex/Allure/Adapter/AllureAdapter.php

@@ -25,6 +25,7 @@ class AllureAdapter implements PHPUnit_Framework_TestListener
     //NOTE: here we implicitly assume that PHPUnit runs in single-threaded mode
     private $uuid;
     private $suiteName;
+    private $methodName;
 
     /**
      * Annotations that should be ignored by the annotaions parser (especially PHPUnit annotations)
@@ -152,8 +153,21 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
+        $shouldCreateStartStopEvents = false;
+        if ($test instanceof \PHPUnit_Framework_TestCase){
+            $methodName = $test->getName();
+            if ($methodName !== $this->methodName){
+                $shouldCreateStartStopEvents = true;
+                $this->startTest($test);
+            }
+        }
+
         $event = new TestCaseCanceledEvent();
         Allure::lifecycle()->fire($event->withException($e)->withMessage($e->getMessage()));
+
+        if ($shouldCreateStartStopEvents && $test instanceof \PHPUnit_Framework_TestCase){
+            $this->endTest($test, 0);
+        }
     }
 
     /**
@@ -200,11 +214,14 @@ public function startTest(PHPUnit_Framework_Test $test)
         if ($test instanceof \PHPUnit_Framework_TestCase) {
             $suiteName = $this->suiteName;
             $methodName = $test->getName();
+            $this->methodName = $methodName;
             $event = new TestCaseStartedEvent($this->uuid, get_class($test) . T_DOUBLE_COLON . $methodName);
-            $annotationManager = new Annotation\AnnotationManager(
-                Annotation\AnnotationProvider::getMethodAnnotations($suiteName, $methodName)
-            );
-            $annotationManager->updateTestCaseEvent($event);
+            if (class_exists($suiteName, false) && method_exists($suiteName, $methodName)) {
+                $annotationManager = new Annotation\AnnotationManager(
+                    Annotation\AnnotationProvider::getMethodAnnotations($suiteName, $methodName)
+                );
+                $annotationManager->updateTestCaseEvent($event);
+            }
             Allure::lifecycle()->fire($event);
         }
     }

test/Yandex/Allure/Adapter/AllureAdapterTest.php

@@ -107,9 +107,11 @@ public function testAddSkippedTest()
         $events = $this->getMockedLifecycle()->getEvents();
         $event = new TestCaseCanceledEvent();
         $event->withException($exception)->withMessage(EXCEPTION_MESSAGE);
-        $this->assertEquals(1, sizeof($events));
-        $this->assertInstanceOf('\Yandex\Allure\Adapter\Event\TestCaseCanceledEvent', $events[0]);
-        $this->assertEquals($event, $events[0]);
+        $this->assertEquals(3, sizeof($events));
+        $this->assertInstanceOf('\Yandex\Allure\Adapter\Event\TestCaseStartedEvent', $events[0]);
+        $this->assertInstanceOf('\Yandex\Allure\Adapter\Event\TestCaseCanceledEvent', $events[1]);
+        $this->assertInstanceOf('\Yandex\Allure\Adapter\Event\TestCaseFinishedEvent', $events[2]);
+        $this->assertEquals($event, $events[1]);
     }
 
     public function testStartTestSuite()