Merge pull request #6590 from Codeception/result-aggregator-cleanup

Don't override resultAggregator property in test formats
Codeception · Oct 30, 2022 · d2e403f · d2e403f
2 parents d55e5c3 + 3c27deb
commit d2e403f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/src/Codeception/Test/Test.php b/src/Codeception/Test/Test.php
@@ -228,6 +228,9 @@ final public function realRun(ResultAggregator $result): void
 
     public function getResultAggregator(): ResultAggregator
     {
+        if ($this->resultAggregator === null) {
+            throw new \LogicException('ResultAggregator is not set');
+        }
         return $this->resultAggregator;
     }
 

diff --git a/src/Codeception/Test/TestCaseWrapper.php b/src/Codeception/Test/TestCaseWrapper.php
@@ -5,7 +5,6 @@
 namespace Codeception\Test;
 
 use Codeception\Exception\UselessTestException;
-use Codeception\ResultAggregator;
 use Codeception\Test\Interfaces\Dependent;
 use Codeception\Test\Interfaces\Descriptive;
 use Codeception\Test\Interfaces\Reported;
@@ -27,8 +26,6 @@ class TestCaseWrapper extends Test implements Reported, Dependent, StrictCoverag
 {
     private Metadata $metadata;
 
-    private ?ResultAggregator $resultAggregator = null;
-
     /**
      * @var array<string, mixed>
      */
@@ -80,20 +77,6 @@ public function getMetadata(): Metadata
         return $this->metadata;
     }
 
-    public function getResultAggregator(): ResultAggregator
-    {
-        if ($this->resultAggregator === null) {
-            throw new \LogicException('ResultAggregator is not set');
-        }
-        return $this->resultAggregator;
-    }
-
-    public function setResultAggregator(?ResultAggregator $resultAggregator): void
-    {
-        $this->resultAggregator = $resultAggregator;
-    }
-
-
     public function fetchDependencies(): array
     {
         $names = [];

diff --git a/src/Codeception/Test/Unit.php b/src/Codeception/Test/Unit.php
@@ -32,8 +32,6 @@ class Unit extends TestCase implements
 
     private ?Metadata $metadata = null;
 
-    private ?ResultAggregator $resultAggregator = null;
-
     public function getMetadata(): Metadata
     {
         if (!$this->metadata) {
@@ -44,15 +42,7 @@ public function getMetadata(): Metadata
 
     public function getResultAggregator(): ResultAggregator
     {
-        if ($this->resultAggregator === null) {
-            throw new \LogicException('ResultAggregator is not set');
-        }
-        return $this->resultAggregator;
-    }
-
-    public function setResultAggregator(?ResultAggregator $resultAggregator): void
-    {
-        $this->resultAggregator = $resultAggregator;
+        throw new \LogicException('This method should not be called, TestCaseWrapper class must be used instead');
     }
 
     protected function _setUp()