Tests: refactoring

contributte · Jan 4, 2024 · 0b5d838 · 0b5d838
1 parent 3b8cbcd
commit 0b5d838
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 95 deletions.
diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml
diff --git a/tests/.gitignore b/tests/.gitignore
diff --git a/tests/Cases/Decorator/Decorator.phpt b/tests/Cases/Decorator/Decorator.phpt
@@ -1,11 +1,9 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Decorator/Decorator
- */
-
 use Contributte\DI\Decorator\Decorator;
 use Contributte\DI\Helper\ExtensionDefinitionsHelper;
+use Contributte\Tester\Environment;
+use Contributte\Tester\Toolkit;
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Container;
@@ -17,8 +15,8 @@ use Tests\Fixtures\Inject\Tester;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$extension = new class extends CompilerExtension
 		{

diff --git a/tests/Cases/Extension/ContainerAwareExtension.phpt b/tests/Cases/Extension/ContainerAwareExtension.phpt
@@ -1,11 +1,9 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Extension\ContainerAwareExtension
- */
-
 use Contributte\DI\Extension\ContainerAwareExtension;
 use Contributte\DI\IContainerAware;
+use Contributte\Tester\Environment;
+use Contributte\Tester\Toolkit;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
@@ -15,8 +13,8 @@ use Tests\Fixtures\TestContainerAware;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('aware', new ContainerAwareExtension());
 		$compiler->loadConfig(FileMock::create('

diff --git a/tests/Cases/Extension/MutableExtension.phpt b/tests/Cases/Extension/MutableExtension.phpt
@@ -1,10 +1,8 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Extension\MutableExtension
- */
-
 use Contributte\DI\Extension\MutableExtension;
+use Contributte\Tester\Environment;
+use Contributte\Tester\Toolkit;
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Container;
@@ -14,8 +12,8 @@ use Tester\Assert;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$mutable = new MutableExtension();
 		$mutable->onLoad[] = static function (CompilerExtension $ext, ContainerBuilder $builder): void {

diff --git a/tests/Cases/Extension/ResourceExtension.phpt b/tests/Cases/Extension/ResourceExtension.phpt
@@ -1,10 +1,8 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Extension\ResourceExtension
- */
-
 use Contributte\DI\Extension\ResourceExtension;
+use Contributte\Tester\Environment;
+use Contributte\Tester\Toolkit;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
@@ -25,12 +23,14 @@ use Tests\Fixtures\Scalar\ZScalarService;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
+const APP_DIR = __DIR__ . '/../..';
+
 // Autoload services
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -47,11 +47,11 @@ test(static function (): void {
 });
 
 // Skip interface & abstract classes
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -67,11 +67,11 @@ test(static function (): void {
 });
 
 // Multiple resources
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -92,11 +92,11 @@ test(static function (): void {
 });
 
 // Exclude namespace
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -116,9 +116,9 @@ test(static function (): void {
 });
 
 // Invalid resource - must end with /
-test(static function (): void {
+Toolkit::test(static function (): void {
 	Assert::throws(static function (): void {
-		$loader = new ContainerLoader(TEMP_DIR, true);
+		$loader = new ContainerLoader(Environment::getTestDir(), true);
 		$class = $loader->load(static function (Compiler $compiler): void {
 			$compiler->addExtension('autoload', new ResourceExtension());
 			$compiler->loadConfig(FileMock::create('
@@ -133,11 +133,11 @@ test(static function (): void {
 });
 
 // Exclude whole namespace
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -159,11 +159,11 @@ test(static function (): void {
 });
 
 // Decorate services - add tags
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -181,11 +181,11 @@ test(static function (): void {
 });
 
 // Decorate services - add setup
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		services:
 			- stdClass
@@ -207,11 +207,11 @@ test(static function (): void {
 });
 
 // Decorate services - add setup
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -229,11 +229,11 @@ test(static function (): void {
 });
 
 // Register services manually
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		services:
 			scalar: Tests\Fixtures\Scalar\ScalarService("foobar")
@@ -257,12 +257,12 @@ test(static function (): void {
 });
 
 // Register services manually (exception)
-test(static function (): void {
+Toolkit::test(static function (): void {
 	Assert::exception(function (): void {
-		$loader = new ContainerLoader(TEMP_DIR, true);
+		$loader = new ContainerLoader(Environment::getTestDir(), true);
 		$loader->load(static function (Compiler $compiler): void {
 			$compiler->addExtension('autoload', new ResourceExtension());
-			$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+			$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 			$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:
@@ -274,12 +274,12 @@ test(static function (): void {
 });
 
 // Register services manually
-test(static function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(static function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('autoload', new ResourceExtension());
 		$compiler->addExtension('inject', new InjectExtension());
-		$compiler->addConfig(['parameters' => ['appDir' => TESTER_DIR]]);
+		$compiler->addConfig(['parameters' => ['appDir' => APP_DIR]]);
 		$compiler->loadConfig(FileMock::create('
 		autoload:
 			resources:

diff --git a/tests/Fixtures/Bar/BarService.php b/tests/Fixtures/Bar/BarService.php
@@ -7,8 +7,7 @@
 final class BarService
 {
 
-	/** @var stdClass */
-	private $logger;
+	private stdClass $logger;
 
 	public function setLogger(stdClass $logger): void
 	{

diff --git a/tests/Fixtures/Decorator/InjectService.php b/tests/Fixtures/Decorator/InjectService.php
@@ -5,8 +5,7 @@
 class InjectService
 {
 
-	/** @var Authenticator */
-	public $authenticator;
+	public Authenticator $authenticator;
 
 	public function injectAuthenticator(Authenticator $authenticator): void
 	{

diff --git a/tests/Fixtures/Foo/FooBarService.php b/tests/Fixtures/Foo/FooBarService.php
@@ -5,8 +5,7 @@
 final class FooBarService
 {
 
-	/** @var FooService */
-	public $foo;
+	public FooService $foo;
 
 	public function __construct(FooService $foo)
 	{

diff --git a/tests/Fixtures/Inject/Base.php b/tests/Fixtures/Inject/Base.php
@@ -6,7 +6,7 @@ abstract class Base
 {
 
 	/** @var mixed[] */
-	public $setup = [];
+	public array $setup = [];
 
 	public function setup(Tester $tester, string $bar): void
 	{

diff --git a/tests/Fixtures/Scalar/Scalar2Service.php b/tests/Fixtures/Scalar/Scalar2Service.php
@@ -5,13 +5,9 @@
 final class Scalar2Service
 {
 
-	/** @var string */
-	public $text;
+	public string $text;
 
-	/**
-	 * @param string $text
-	 */
-	public function __construct($text = 'default')
+	public function __construct(string $text = 'default')
 	{
 		$this->text = $text;
 	}

diff --git a/tests/Fixtures/Scalar/ScalarService.php b/tests/Fixtures/Scalar/ScalarService.php
@@ -5,13 +5,9 @@
 final class ScalarService
 {
 
-	/** @var string */
-	public $text;
+	public string $text;
 
-	/**
-	 * @param string $text
-	 */
-	public function __construct($text)
+	public function __construct(string $text)
 	{
 		$this->text = $text;
 	}

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,13 +1,10 @@
 <?php declare(strict_types = 1);
 
-use Ninjify\Nunjuck\Environment;
+use Contributte\Tester\Environment;
 
 if (@!include __DIR__ . '/../vendor/autoload.php') {
 	echo 'Install Nette Tester using `composer update --dev`';
 	exit(1);
 }
 
-// Configure environment
-Environment::setupTester();
-Environment::setupTimezone();
-Environment::setupVariables(__DIR__);
+Environment::setup(__DIR__);