Simplify setup

Author: jfilla

src/NetteTests/Configuration.php

@@ -2,6 +2,9 @@
 
 namespace Wavevision\NetteTests;
 
+use Nette\Configurator;
+use PHPUnit\Framework\TestCase;
+
 class Configuration
 {
 
@@ -10,19 +13,34 @@ class Configuration
 	 */
 	private static $configuratorFactory;
 
-	public static function setConfiguratorFactory(callable $configuratorFactory): void
+	public static function setup(callable $configuratorFactory): void
 	{
+		ob_start();
 		self::$configuratorFactory = $configuratorFactory;
 	}
 
-	public static function getConfiguratorFactory(): callable
-	{
-		return self::$configuratorFactory;
-	}
-
-	public static function setup(): void
+	public static function createConfigurator(TestCase $testCase): Configurator
 	{
-		ob_start();
+		$configuratorFactory = self::$configuratorFactory;
+		if (!is_callable($configuratorFactory)) {
+			throw new InvalidState(
+				sprintf(
+					"Setup method not called. Call '%s::setup()' method in bootstrap file.",
+					self::class
+				)
+			);
+		}
+		$configurator = $configuratorFactory($testCase);
+		if ($configurator instanceof Configurator) {
+			return $configurator;
+		} else {
+			throw new InvalidState(
+				sprintf(
+					'\'%1$s::getConfigurationFactory()\' should return instance of \'%1$s\'.',
+					Configuration::class
+				)
+			);
+		}
 	}
 
 }

src/NetteTests/TestCases/DIContainerTestCase.php

@@ -2,10 +2,8 @@
 
 namespace Wavevision\NetteTests\TestCases;
 
-use Nette\Configurator;
 use PHPUnit\Framework\TestCase;
 use Wavevision\NetteTests\Configuration;
-use Wavevision\NetteTests\InvalidState;
 use Wavevision\NetteTests\TestCases\Parts\SetupContainer;
 
 class DIContainerTestCase extends TestCase
@@ -16,18 +14,7 @@ class DIContainerTestCase extends TestCase
 	protected function setUp(): void
 	{
 		parent::setUp();
-		$configuration = Configuration::getConfiguratorFactory()($this);
-		if ($configuration instanceof Configurator) {
-			$this->setupContainer($configuration, $this);
-		} else {
-			throw new InvalidState(
-				sprintf(
-					"'%s::getConfigurationFactory()' should return instance of '%s'.",
-					Configuration::class,
-					Configurator::class
-				)
-			);
-		}
+		$this->setupContainer(Configuration::createConfigurator($this), $this);
 	}
 
 }

src/NetteTests/TestCases/Parts/PresenterAsserts.php

@@ -13,9 +13,6 @@
 use Wavevision\NetteTests\Runners\PresenterRequest;
 use Wavevision\NetteTests\Runners\PresenterResponse;
 
-/**
- * @todo flash messages
- */
 trait PresenterAsserts
 {
 

tests/app/tests/bootstrap.php

@@ -4,8 +4,7 @@
 use Wavevision\NetteTests\Configuration;
 
 require __DIR__ . '/../../../vendor/autoload.php';
-Configuration::setup();
-Configuration::setConfiguratorFactory(
+Configuration::setup(
 	function (): Configurator {
 		$configurator = new Configurator();
 		$rootDir = __DIR__ . '/..';