Tests: refactor

tests/Cases/Annotations.phpt

@@ -1,13 +1,14 @@
 <?php declare(strict_types = 1);
 
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\Annotations;
 use Tester\Assert;
 use Tests\Fixtures\AnnotationFoo;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 // Class
-test(function (): void {
+Toolkit::test(function (): void {
 	$r = new ReflectionClass(AnnotationFoo::class);
 	$annotations = Annotations::getAnnotations($r);
 
@@ -24,7 +25,7 @@ test(function (): void {
 });
 
 // Method
-test(function (): void {
+Toolkit::test(function (): void {
 	$r = new ReflectionMethod(AnnotationFoo::class, 'fake');
 	$annotations = Annotations::getAnnotations($r);
 

tests/Cases/Arrays.phpt

@@ -1,11 +1,12 @@
 <?php declare(strict_types = 1);
 
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\Arrays;
 use Tester\Assert;
 
 require_once __DIR__ . '/../bootstrap.php';
 
-test(function (): void {
+Toolkit::test(function (): void {
 	$array1 = ['a', 'b', 'c', 'd'];
 	$hash1 = Arrays::hash($array1);
 

tests/Cases/Config.phpt

@@ -1,11 +1,12 @@
 <?php declare(strict_types = 1);
 
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\Config;
 use Tester\Assert;
 
-test(function (): void {
+require_once __DIR__ . '/../bootstrap.php';
+
+Toolkit::test(function (): void {
 	$data = [
 		'foo' => 'bar',
 		'conn' => [

tests/Cases/Csv.phpt

@@ -1,17 +1,14 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Csv
- */
-
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\Csv;
 use Nette\InvalidStateException;
 use Tester\Assert;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 // Simple array matching
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal([
 		0 => [
 			'name' => 'Milan',
@@ -37,7 +34,7 @@ test(function (): void {
 });
 
 // Complex array matching
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal([
 		0 => [
 			'user' => [
@@ -71,7 +68,7 @@ test(function (): void {
 });
 
 // Part of simple array matching
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal([
 		0 => [
 			'x' => 'foo',
@@ -85,7 +82,7 @@ test(function (): void {
 });
 
 // Part of complex array matching
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal([
 		0 => [
 			'x' => [
@@ -107,7 +104,7 @@ test(function (): void {
 });
 
 // Overriding
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal([
 		0 => [
 			'x' => 'foo',
@@ -122,7 +119,7 @@ test(function (): void {
 });
 
 // Invalid arguments
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::throws(function (): void {
 		Csv::structural([
 			0 => 'a',

tests/Cases/DI/DateTimeFactoryExtensions.phpt

@@ -1,9 +1,7 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: DI\DateTimeFactoryExtension
- */
-
+use Contributte\Tester\Environment;
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\DI\DateTimeFactoryExtension;
 use Contributte\Utils\IDateTimeFactory;
 use Nette\DI\Compiler;
@@ -13,8 +11,8 @@ use Tester\Assert;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(function (): void {
-	$loader = new ContainerLoader(TEMP_DIR, true);
+Toolkit::test(function (): void {
+	$loader = new ContainerLoader(Environment::getTestDir(), true);
 	$class = $loader->load(function (Compiler $compiler): void {
 		$compiler->addExtension('datetime', new DateTimeFactoryExtension());
 	}, 1);

tests/Cases/DateTime.compare.phpt

@@ -1,16 +1,13 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: DateTime [comparing]
- */
-
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\DateTime;
 use Tester\Assert;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 // Test: datetime
-test(function (): void {
+Toolkit::test(function (): void {
 	// Now
 	$now = new DateTime('2014-1-2 00:00:00');
 
@@ -23,7 +20,7 @@ test(function (): void {
 });
 
 // Test: datetime convert to strtotime
-test(function (): void {
+Toolkit::test(function (): void {
 	// Now
 	$now = strtotime((string) new DateTime('2014-1-2 00:00:00'));
 
@@ -36,7 +33,7 @@ test(function (): void {
 });
 
 // Test: now == until
-test(function (): void {
+Toolkit::test(function (): void {
 	// Now
 	$now = new DateTime('2014-1-5 00:00:00');
 
@@ -49,7 +46,7 @@ test(function (): void {
 });
 
 // Test: datetimes with DD.MM.YYYY 00:00:00
-test(function (): void {
+Toolkit::test(function (): void {
 	// Now
 	$now = new DateTime('now');
 	$now->setTime(0, 0, 0);

tests/Cases/DateTime.phpt

@@ -1,16 +1,13 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: DateTime
- */
-
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\DateTime;
 use Tester\Assert;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 // DateTime::setCurrentTime()
-test(function (): void {
+Toolkit::test(function (): void {
 	$dt = DateTime::from('2020-10-10');
 	Assert::equal('10.10.2020 00:00:00', $dt->format('d.m.Y H:i:s'));
 
@@ -19,7 +16,7 @@ test(function (): void {
 });
 
 // DateTime::create
-test(function (): void {
+Toolkit::test(function (): void {
 	$dt = DateTime::create([]);
 	Assert::equal(DateTime::from(sprintf('%s.%s.%s', date('d'), date('m'), date('Y'))), $dt);
 
@@ -34,7 +31,7 @@ test(function (): void {
 });
 
 // DateTime::createBy
-test(function (): void {
+Toolkit::test(function (): void {
 	$dt = DateTime::createBy(2020, 6, 1);
 	Assert::equal(DateTime::from('2020-06-01'), $dt);
 });
@@ -44,7 +41,7 @@ test(function (): void {
 // DateTime::getFirstDayOfYear
 // DateTime::getLastDayOfYear
 // DateTime::getFirstDayOfMonth
-test(function (): void {
+Toolkit::test(function (): void {
 	$dt = new DateTime('15.6.2020');
 	Assert::equal(DateTime::from('1.6.2020 00:00:00'), $dt->getFirstDayOfMonth());
 	Assert::equal(DateTime::from('30.6.2020 23:59:59'), $dt->getLastDayOfMonth());
@@ -54,7 +51,7 @@ test(function (): void {
 
 // DateTime::getFirstDayOfWeek
 // DateTime::getLastDayOfWeek
-test(function (): void {
+Toolkit::test(function (): void {
 	$dt = new DateTime('18.6.2020');
 	Assert::equal(DateTime::from('15.6.2020 00:00:00'), $dt->getFirstDayOfWeek());
 	Assert::equal(DateTime::from('21.6.2020 23:59:59'), $dt->getLastDayOfWeek());
@@ -65,7 +62,7 @@ test(function (): void {
 });
 
 // DateTime::setToday
-test(function (): void {
+Toolkit::test(function (): void {
 	$dt = DateTime::createBy(2020, 6, 1);
 	$dt = $dt->setToday();
 	Assert::equal(date('d.m.Y'), $dt->format('d.m.Y'));

tests/Cases/DeeperTest.php

@@ -2,13 +2,13 @@
 
 namespace Tests\Cases;
 
-require_once __DIR__ . '/../bootstrap.php';
-
 use Contributte\Utils\Deeper;
 use Nette\InvalidArgumentException;
 use Tester\Assert;
 use Tester\TestCase;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 class DeeperTest extends TestCase
 {
 
@@ -34,10 +34,9 @@ public function testGetFailure(): void
 
 	/**
 	 * @dataProvider validFlatProvider
-	 * @param mixed   $key
 	 * @param mixed[] $array
 	 */
-	public function testFlat($key, array $array): void
+	public function testFlat(mixed $key, array $array): void
 	{
 		Assert::same($array, Deeper::flat($key));
 	}

tests/Cases/Fields.phpt

@@ -1,16 +1,13 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Fields
- */
-
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\Fields;
 use Tester\Assert;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 // Fields::inn
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal('11223344', Fields::inn('11223344'));
 	Assert::equal('11223344', Fields::inn('11-22-33-44'));
 	Assert::equal('11223344', Fields::inn('11 22 33 44'));
@@ -21,7 +18,7 @@ test(function (): void {
 });
 
 // Fields::tin
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal('CZ11223344', Fields::tin('CZ11223344'));
 	Assert::equal('CZ11223344', Fields::tin('CZ11-22-33-44'));
 	Assert::equal('CZ11223344', Fields::tin('CZ 11 22 33 44'));
@@ -32,7 +29,7 @@ test(function (): void {
 });
 
 // Fields::phone
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal('123456789', Fields::phone('123456789'));
 	Assert::equal('123456789', Fields::phone(' 123456789 '));
 	Assert::equal('123456789', Fields::phone(' 123 456 789 '));
@@ -42,7 +39,7 @@ test(function (): void {
 });
 
 // Fields::zip
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal('10000', Fields::zip('10000'));
 	Assert::equal('10000', Fields::zip('10 000'));
 	Assert::equal('10000', Fields::zip(' 10000 '));

tests/Cases/Http.phpt

@@ -1,16 +1,13 @@
 <?php declare(strict_types = 1);
 
-/**
- * Test: Http
- */
-
-require_once __DIR__ . '/../bootstrap.php';
-
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\Http;
 use Tester\Assert;
 
+require_once __DIR__ . '/../bootstrap.php';
+
 // Http::metadata
-test(function (): void {
+Toolkit::test(function (): void {
 	Assert::equal([
 		'bar' => 'foo',
 		'bar1' => 'foo',

tests/Cases/LazyCollection.phpt

@@ -1,16 +1,15 @@
 <?php declare(strict_types = 1);
 
+use Contributte\Tester\Toolkit;
 use Contributte\Utils\LazyCollection;
 use Tester\Assert;
 
 require_once __DIR__ . '/../bootstrap.php';
 
-test(function (): void {
+Toolkit::test(function (): void {
 	$data = ['foo', 'bar', 'baz'];
 
-	$callback = function () use ($data): array {
-		return $data;
-	};
+	$callback = fn (): array => $data;
 
 	$collection = LazyCollection::fromCallback($callback);