tests: uses more strict matching

dg · dg · commit 3c0de6c1815d · 2018-09-01T19:28:43.000+02:00
diff --git a/tests/PhpGenerator/ClassType.from.anonymous.phpt b/tests/PhpGenerator/ClassType.from.anonymous.phpt
@@ -7,7 +7,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
-use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -43,4 +42,4 @@ $res[] = ClassType::from(new class extends Class1 {
 	}
 });
 
-Assert::matchFile(__DIR__ . '/expected/ClassType.from.anonymous.expect', implode("\n", $res));
+sameFile(__DIR__ . '/expected/ClassType.from.anonymous.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.from.phpt b/tests/PhpGenerator/ClassType.from.phpt
@@ -8,7 +8,6 @@ declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\Factory;
-use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -25,4 +24,4 @@ $res[] = ClassType::from(Abc\Class4::class);
 $res[] = ClassType::from(Abc\Class5::class);
 $res[] = ClassType::from(Abc\Class6::class);
 
-Assert::matchFile(__DIR__ . '/expected/ClassType.from.expect', implode("\n", $res));
+sameFile(__DIR__ . '/expected/ClassType.from.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.from.trait.phpt b/tests/PhpGenerator/ClassType.from.trait.phpt
@@ -7,7 +7,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
-use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -45,4 +44,4 @@ $res[] = ClassType::from('Trait2');
 $res[] = ClassType::from('Class1');
 $res[] = ClassType::from('Class2');
 
-Assert::matchFile(__DIR__ . '/expected/ClassType.from.trait.expect', implode("\n", $res));
+sameFile(__DIR__ . '/expected/ClassType.from.trait.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.inheritance.phpt b/tests/PhpGenerator/ClassType.inheritance.phpt
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
-use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -55,4 +54,4 @@ class B extends A implements I3
 }
 
 
-Assert::matchFile(__DIR__ . '/expected/ClassType.inheritance.expect', (string) ClassType::from('B'));
+sameFile(__DIR__ . '/expected/ClassType.inheritance.expect', (string) ClassType::from('B'));
diff --git a/tests/PhpGenerator/ClassType.interface.phpt b/tests/PhpGenerator/ClassType.interface.phpt
@@ -24,4 +24,4 @@ Assert::same(['IOne', 'ITwo'], $interface->getExtends());
 
 $interface->addMethod('getForm');
 
-Assert::matchFile(__DIR__ . '/expected/ClassType.interface.expect', (string) $interface);
+sameFile(__DIR__ . '/expected/ClassType.interface.expect', (string) $interface);
diff --git a/tests/PhpGenerator/ClassType.phpt b/tests/PhpGenerator/ClassType.phpt
@@ -99,7 +99,7 @@ $method->addParameter('res', null)
 		->setReference(true)
 		->setTypeHint('array');
 
-Assert::matchFile(__DIR__ . '/expected/ClassType.expect', (string) $class);
+sameFile(__DIR__ . '/expected/ClassType.expect', (string) $class);
 
 
 // global setters & getters
diff --git a/tests/PhpGenerator/Closure.long.phpt b/tests/PhpGenerator/Closure.long.phpt
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\Closure;
-use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -17,7 +16,7 @@ for ($name = 'abcde'; $name < 'abcdr'; $name++) {
 	$function->addUse($name);
 }
 
-Assert::match(
+same(
 'function (
 	$abcde,
 	$abcdf,
diff --git a/tests/PhpGenerator/Closure.phpt b/tests/PhpGenerator/Closure.phpt
@@ -20,7 +20,7 @@ $function->addUse('this');
 $function->addUse('vars')
 	->setReference(true);
 
-Assert::match(
+same(
 'function &($a, $b) use ($this, &$vars) {
 	return $a + $b;
 }', (string) $function);
@@ -33,7 +33,7 @@ Assert::type(Nette\PhpGenerator\Parameter::class, $uses[1]);
 
 $uses = $function->setUses([$uses[0]]);
 
-Assert::match(
+same(
 'function &($a, $b) use ($this) {
 	return $a + $b;
 }', (string) $function);
@@ -46,6 +46,6 @@ Assert::exception(function () {
 
 $closure = function (stdClass $a, $b = null) {};
 $function = Closure::from($closure);
-Assert::match(
+same(
 'function (stdClass $a, $b = null) {
 }', (string) $function);
diff --git a/tests/PhpGenerator/GlobalFunction.phpt b/tests/PhpGenerator/GlobalFunction.phpt
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\GlobalFunction;
-use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -16,7 +15,7 @@ function func(stdClass $a, $b = null)
 
 
 $function = GlobalFunction::from('func');
-Assert::match(
+same(
 '/**
  * global
  */
diff --git a/tests/PhpGenerator/Helpers.dump().phpt b/tests/PhpGenerator/Helpers.dump().phpt
@@ -40,7 +40,7 @@ Assert::same('[$s]', Helpers::dump([new PhpLiteral('$s')]));
 
 Assert::same('[1, 2, 3]', Helpers::dump([1, 2, 3]));
 Assert::same("['a', 7 => 'b', 'c', '9a' => 'd', 'e']", Helpers::dump(['a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e']));
-Assert::match("[
+same("[
 	[
 		'a',
 		'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
@@ -124,8 +124,12 @@ Assert::same(
 	"new DateTimeImmutable('2016-06-22 20:52:43.123400', new DateTimeZone('Europe/Prague'))",
 	Helpers::dump(new DateTimeImmutable('2016-06-22 20:52:43.1234', new DateTimeZone('Europe/Prague')))
 );
-Assert::match(
-	"Nette\\PhpGenerator\\Helpers::createObject('TestDateTime', %A%)",
+same(
+	"Nette\\PhpGenerator\\Helpers::createObject('TestDateTime', [
+	'date' => '2016-06-22 20:52:43.123400',
+	'timezone_type' => 3,
+	'timezone' => 'Europe/Prague',
+])",
 	Helpers::dump(new TestDateTime('2016-06-22 20:52:43.1234', new DateTimeZone('Europe/Prague')))
 );
 
diff --git a/tests/PhpGenerator/Helpers.format.phpt b/tests/PhpGenerator/Helpers.format.phpt
@@ -21,7 +21,7 @@ Assert::same('func(1 ? 2 : 3)', Helpers::formatArgs('func(1 \? 2 : 3)', []));
 Assert::same('func([1, 2])', Helpers::formatArgs('func(?)', [[1, 2]]));
 Assert::same('func(1, 2)', Helpers::formatArgs('func(...?)', [[1, 2]]));
 Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', [[1, 2]])); // old way
-Assert::match(
+same(
 'func(
 	10,
 	11,
diff --git a/tests/PhpGenerator/Method.longParams.phpt b/tests/PhpGenerator/Method.longParams.phpt
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\Method;
-use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
@@ -15,7 +14,7 @@ for ($name = 'a'; $name < 'm'; $name++) {
 	$method->addParameter($name)->setTypeHint('string');
 }
 
-Assert::match(
+same(
 'function create(
 	string $a,
 	string $b,
@@ -31,5 +30,4 @@ Assert::match(
 	string $l
 ) {
 	return null;
-}
-', (string) $method);
+}', (string) $method);
diff --git a/tests/PhpGenerator/Method.returnTypes.phpt b/tests/PhpGenerator/Method.returnTypes.phpt
@@ -42,11 +42,10 @@ namespace
 		->setReturnType('Foo')
 		->setBody('return new Foo();');
 
-	Assert::match(
+	same(
 		'function create(): Foo
 {
 	return new Foo();
-}
-', (string) $method);
+}', (string) $method);
 
 }
diff --git a/tests/PhpGenerator/Method.scalarParameters.phpt b/tests/PhpGenerator/Method.scalarParameters.phpt
@@ -41,9 +41,8 @@ $method = (new Method('create'))
 $method->addParameter('a')->setTypeHint('string');
 $method->addParameter('b')->setTypeHint('bool');
 
-Assert::match(
+same(
 'function create(string $a, bool $b)
 {
 	return null;
-}
-', (string) $method);
+}', (string) $method);
diff --git a/tests/PhpGenerator/Method.variadics.phpt b/tests/PhpGenerator/Method.variadics.phpt
@@ -39,12 +39,11 @@ $method = (new Method('variadic'))
 	->setVariadic(true)
 	->setBody('return 42;');
 
-Assert::match(
+same(
 'function variadic()
 {
 	return 42;
-}
-', (string) $method);
+}', (string) $method);
 
 
 // variadic method with one parameter
@@ -53,12 +52,11 @@ $method = (new Method('variadic'))
 	->setBody('return 42;');
 $method->addParameter('foo');
 
-Assert::match(
+same(
 'function variadic(...$foo)
 {
 	return 42;
-}
-', (string) $method);
+}', (string) $method);
 
 
 // variadic method with multiple parameters
@@ -69,12 +67,11 @@ $method->addParameter('foo');
 $method->addParameter('bar');
 $method->addParameter('baz', []);
 
-Assert::match(
+same(
 'function variadic($foo, $bar, ...$baz)
 {
 	return 42;
-}
-', (string) $method);
+}', (string) $method);
 
 
 // method with typehinted variadic param
@@ -83,12 +80,11 @@ $method = (new Method('variadic'))
 	->setBody('return 42;');
 $method->addParameter('foo')->setTypeHint('array');
 
-Assert::match(
+same(
 'function variadic(array ...$foo)
 {
 	return 42;
-}
-', (string) $method);
+}', (string) $method);
 
 
 // method with typrhinted by-value variadic param
@@ -97,9 +93,8 @@ $method = (new Method('variadic'))
 	->setBody('return 42;');
 $method->addParameter('foo')->setTypeHint('array')->setReference(true);
 
-Assert::match(
+same(
 'function variadic(array &...$foo)
 {
 	return 42;
-}
-', (string) $method);
+}', (string) $method);
diff --git a/tests/PhpGenerator/PhpFile.phpt b/tests/PhpGenerator/PhpFile.phpt
@@ -68,15 +68,15 @@ $traitG = $file->addTrait('Baz\\G');
 Assert::same($file->addNamespace('Baz'), $traitG->getNamespace());
 
 
-Assert::matchFile(__DIR__ . '/expected/PhpFile.regular.expect', (string) $file);
+sameFile(__DIR__ . '/expected/PhpFile.regular.expect', (string) $file);
 
 $file->addClass('H');
 
 $file->addClass('FooBar\\I');
 
-Assert::matchFile(__DIR__ . '/expected/PhpFile.bracketed.expect', (string) $file);
+sameFile(__DIR__ . '/expected/PhpFile.bracketed.expect', (string) $file);
 
 $file = new PhpFile;
 $file->addClass('A');
 
-Assert::matchFile(__DIR__ . '/expected/PhpFile.globalNamespace.expect', (string) $file);
+sameFile(__DIR__ . '/expected/PhpFile.globalNamespace.expect', (string) $file);
diff --git a/tests/PhpGenerator/PhpNamespace.fqn.phpt b/tests/PhpGenerator/PhpNamespace.fqn.phpt
@@ -8,7 +8,6 @@ declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\PhpNamespace;
-use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
@@ -34,7 +33,7 @@ $method->addParameter('one')
 $method->addParameter('two')
 		->setTypeHint('\Two');
 
-Assert::matchFile(__DIR__ . '/expected/PhpNamespace.fqn1.expect', (string) $class);
+sameFile(__DIR__ . '/expected/PhpNamespace.fqn1.expect', (string) $class);
 
 
 // global namespace
@@ -58,4 +57,4 @@ $method->addParameter('one')
 $method->addParameter('two')
 		->setTypeHint('\Two');
 
-Assert::matchFile(__DIR__ . '/expected/PhpNamespace.fqn2.expect', (string) $class);
+sameFile(__DIR__ . '/expected/PhpNamespace.fqn2.expect', (string) $class);
diff --git a/tests/PhpGenerator/PhpNamespace.phpt b/tests/PhpGenerator/PhpNamespace.phpt
@@ -75,4 +75,4 @@ $method->addParameter('c')->setTypeHint('parent');
 $method->addParameter('d')->setTypeHint('array');
 $method->addParameter('e')->setTypeHint('callable');
 
-Assert::matchFile(__DIR__ . '/expected/PhpNamespace.expect', (string) $namespace);
+sameFile(__DIR__ . '/expected/PhpNamespace.expect', (string) $namespace);
diff --git a/tests/PhpGenerator/expected/ClassType.expect b/tests/PhpGenerator/expected/ClassType.expect
@@ -42,4 +42,4 @@ abstract final class Example extends ParentClass implements IExample, IOne
 
 
 	abstract public function show($item, array &$res = null);
-}
+}
diff --git a/tests/PhpGenerator/expected/ClassType.from.expect b/tests/PhpGenerator/expected/ClassType.from.expect
@@ -89,4 +89,4 @@ class Class6
 	const THE_PRIVATE_CONSTANT = 9;
 	const THE_PUBLIC_CONSTANT = 9;
 
-}
+}
diff --git a/tests/PhpGenerator/expected/ClassType.from.trait.expect b/tests/PhpGenerator/expected/ClassType.from.trait.expect
@@ -29,4 +29,4 @@ abstract class Class1
 
 class Class2 extends Class1
 {
-}
+}
diff --git a/tests/PhpGenerator/expected/ClassType.interface.expect b/tests/PhpGenerator/expected/ClassType.interface.expect
@@ -4,4 +4,4 @@
 interface IExample extends IOne, ITwo
 {
 	function getForm();
-}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -11,5 +11,18 @@
 }
 
 
+function same(string $expected, $actual): void
+{
+	$expected = str_replace(PHP_EOL, "\n", $expected);
+	Tester\Assert::same($expected, $actual);
+}
+
+
+function sameFile(string $file, $actual): void
+{
+	same(file_get_contents($file), $actual);
+}
+
+
 Tester\Environment::setup();
 date_default_timezone_set('Europe/Prague');

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`declare(strict_types=1);`
`8`	`8`
`9`	`9`	`use Nette\PhpGenerator\ClassType;`
`10`		`-use Tester\Assert;`
`11`	`10`
`12`	`11`
`13`	`12`	`require __DIR__ . '/../bootstrap.php';`
`@@ -43,4 +42,4 @@ $res[] = ClassType::from(new class extends Class1 {`
`43`	`42`	`}`
`44`	`43`	`});`
`45`	`44`
`46`		`-Assert::matchFile(__DIR__ . '/expected/ClassType.from.anonymous.expect', implode("\n", $res));`
	`45`	`+sameFile(__DIR__ . '/expected/ClassType.from.anonymous.expect', implode("\n", $res));`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`	`5`	`use Nette\PhpGenerator\ClassType;`
`6`		`-use Tester\Assert;`
`7`	`6`
`8`	`7`
`9`	`8`	`require __DIR__ . '/../bootstrap.php';`
`@@ -55,4 +54,4 @@ class B extends A implements I3`
`55`	`54`	`}`
`56`	`55`
`57`	`56`
`58`		`-Assert::matchFile(__DIR__ . '/expected/ClassType.inheritance.expect', (string) ClassType::from('B'));`
	`57`	`+sameFile(__DIR__ . '/expected/ClassType.inheritance.expect', (string) ClassType::from('B'));`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@ Assert::same(['IOne', 'ITwo'], $interface->getExtends());`
`24`	`24`
`25`	`25`	`$interface->addMethod('getForm');`
`26`	`26`
`27`		`-Assert::matchFile(__DIR__ . '/expected/ClassType.interface.expect', (string) $interface);`
	`27`	`+sameFile(__DIR__ . '/expected/ClassType.interface.expect', (string) $interface);`