nette/tester 2.5

composer.json

@@ -19,7 +19,7 @@
 		"nette/utils": "^4.0"
 	},
 	"require-dev": {
-		"nette/tester": "^2.4",
+		"nette/tester": "^2.5.2",
 		"tracy/tracy": "^2.8",
 		"phpstan/phpstan-nette": "^1.0"
 	},

tests/Schema/Expect.anyOf.phpt

@@ -229,13 +229,12 @@ test('First is default', function () {
 });
 
 
-test('Empty set', function () {
-	Assert::exception(
-		fn() => Expect::anyOf(),
-		Nette\InvalidStateException::class,
-		'The enumeration must not be empty.',
-	);
-});
+testException(
+	'Empty set',
+	fn() => Expect::anyOf(),
+	Nette\InvalidStateException::class,
+	'The enumeration must not be empty.',
+);
 
 
 test('normalization', function () {

tests/Schema/Expect.array.phpt

@@ -310,12 +310,11 @@ test('arrayOf() & keys II.', function () {
 });
 
 
-test('arrayOf() error', function () {
-	Assert::exception(
-		fn() => Expect::arrayOf(['a' => Expect::string()]),
-		TypeError::class,
-	);
-});
+testException(
+	'arrayOf() error',
+	fn() => Expect::arrayOf(['a' => Expect::string()]),
+	TypeError::class,
+);
 
 
 test('type[]', function () {

tests/Schema/Expect.list.phpt

@@ -99,9 +99,8 @@ test('listOf() & scalar', function () {
 });
 
 
-test('listOf() & error', function () {
-	Assert::exception(
-		fn() => Expect::listOf(['a' => Expect::string()]),
-		TypeError::class,
-	);
-});
+testException(
+	'listOf() & error',
+	fn() => Expect::listOf(['a' => Expect::string()]),
+	TypeError::class,
+);

tests/Schema/Expect.structure.phpt

@@ -101,12 +101,11 @@ test('array items', function () {
 });
 
 
-test('default value must be readonly', function () {
-	Assert::exception(
-		fn() => Expect::structure([])->default([]),
-		Nette\InvalidStateException::class,
-	);
-});
+testException(
+	'default value must be readonly',
+	fn() => Expect::structure([])->default([]),
+	Nette\InvalidStateException::class,
+);
 
 
 test('with indexed item', function () {

tests/bootstrap.php

@@ -15,15 +15,10 @@
 
 // configure environment
 Tester\Environment::setup();
+Tester\Environment::setupFunctions();
 date_default_timezone_set('Europe/Prague');
 
 
-function test(string $title, Closure $function): void
-{
-	$function();
-}
-
-
 function checkValidationErrors(Closure $function, array $messages): Nette\Schema\ValidationException
 {
 	$e = Assert::exception($function, Nette\Schema\ValidationException::class);