Extract comparison tests

Author: herndlm

tests/Type/WebMozartAssert/AssertTypeSpecifyingExtensionTest.php

@@ -14,6 +14,7 @@ public function dataFileAsserts(): iterable
 	{
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/collection.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/comparison.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/data.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/string.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/type.php');

tests/Type/WebMozartAssert/data/comparison.php

@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+
+namespace PHPStan\Type\WebMozartAssert;
+
+use Webmozart\Assert\Assert;
+
+class ComparisonTest
+{
+	public function true($a): void
+	{
+		Assert::true($a);
+		\PHPStan\Testing\assertType('true', $a);
+	}
+
+	public function false($a): void
+	{
+		Assert::false($a);
+		\PHPStan\Testing\assertType('false', $a);
+	}
+
+	public function notFalse(int $a): void
+	{
+		/** @var int|false $a */
+		Assert::notFalse($a);
+		\PHPStan\Testing\assertType('int', $a);
+	}
+
+	public function null($a): void
+	{
+		Assert::null($a);
+		\PHPStan\Testing\assertType('null', $a);
+	}
+
+	public function notNull(?int $a): void
+	{
+		Assert::notNull($a);
+		\PHPStan\Testing\assertType('int', $a);
+	}
+
+	public function same($a): void
+	{
+		Assert::same($a, 1);
+		\PHPStan\Testing\assertType('1', $a);
+	}
+
+	/**
+	 * @param -1|1 $a
+	 */
+	public function notSame($a): void
+	{
+		Assert::notSame($a, 1);
+		\PHPStan\Testing\assertType('-1', $a);
+	}
+
+	public function inArray($a): void
+	{
+		Assert::inArray($a, ['foo', 'bar']);
+		\PHPStan\Testing\assertType('\'bar\'|\'foo\'', $a);
+	}
+
+	public function oneOf($a): void
+	{
+		Assert::oneOf($a, [1, 2]);
+		\PHPStan\Testing\assertType('1|2', $a);
+	}
+}

tests/Type/WebMozartAssert/data/data.php

@@ -20,18 +20,6 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		Assert::allInteger($d);
 		\PHPStan\Testing\assertType('iterable<int>', $d);
 
-		Assert::true($r);
-		\PHPStan\Testing\assertType('true', $r);
-
-		Assert::false($s);
-		\PHPStan\Testing\assertType('false', $s);
-
-		Assert::null($t);
-		\PHPStan\Testing\assertType('null', $t);
-
-		Assert::notNull($u);
-		\PHPStan\Testing\assertType('int', $u);
-
 		/** @var (Foo|Bar)[] $v */
 		$v = doFoo();
 		Assert::allNotInstanceOf($v, Bar::class);
@@ -42,19 +30,6 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		Assert::allNotNull($w);
 		\PHPStan\Testing\assertType('array<int>', $w);
 
-		Assert::same($x, 1);
-		\PHPStan\Testing\assertType('1', $x);
-
-		if (doFoo()) {
-			$y = 1;
-		} else {
-			$y = -1;
-		}
-
-		\PHPStan\Testing\assertType('-1|1', $y);
-		Assert::notSame($y, 1);
-		\PHPStan\Testing\assertType('-1', $y);
-
 		$z = [1, 2, 3];
 		if (doFoo()) {
 			$z = [-1, -2, -3];
@@ -72,10 +47,6 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		Assert::implementsInterface($ae, Baz::class);
 		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\Baz', $ae);
 
-		/** @var int|false $af */
-		Assert::notFalse($af);
-		\PHPStan\Testing\assertType('int', $af);
-
 		/** @var array{foo?: string, bar?: string} $things */
 		$things = doFoo();
 		Assert::keyExists($things, 'foo');
@@ -102,15 +73,9 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		$ak = array_pop($aj);
 		\PHPStan\Testing\assertType('int', $ak);
 
-		Assert::inArray($al, ['foo', 'bar']);
-		\PHPStan\Testing\assertType('\'bar\'|\'foo\'', $al);
-
 		Assert::nullOrInArray($am, ['foo', 'bar']);
 		\PHPStan\Testing\assertType('\'bar\'|\'foo\'|null', $am);
 
-		Assert::oneOf($an, [1, 2]);
-		\PHPStan\Testing\assertType('1|2', $an);
-
 		/** @var object $ao */
 		Assert::methodExists($ao, 'foo');
 		\PHPStan\Testing\assertType('object&hasMethod(foo)', $ao);