Use addToAssertionCount(1) instead of assertTrue(true)

webonyx · Jun 17, 2024 · 83d3728 · 83d3728
1 parent 7e3ef03
commit 83d3728
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 25 deletions.
diff --git a/tests/Executor/Promise/SyncPromiseTest.php b/tests/Executor/Promise/SyncPromiseTest.php
@@ -415,6 +415,6 @@ public function testPendingPromiseThen(): void
     public function testRunEmptyQueue(): void
     {
         SyncPromise::runQueue();
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 }
diff --git a/tests/Language/ParserTest.php b/tests/Language/ParserTest.php
@@ -113,7 +113,7 @@ public function testParseProvidesUsefulErrorWhenUsingSource(): void
     public function testParsesVariableInlineValues(): void
     {
         Parser::parse('{ field(complex: { a: { b: [ $var ] } }) }');
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('parses constant default values') */
@@ -130,7 +130,7 @@ public function testParsesConstantDefaultValues(): void
     public function testParsesVariableDefinitionDirectives(): void
     {
         Parser::parse('query Foo($x: Boolean = false @bar) { field }');
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /**
@@ -264,7 +264,7 @@ public function testParsessAnonymousMutationOperations(): void
             mutationField
           }
         ');
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('parses anonymous subscription operations') */
@@ -275,7 +275,7 @@ public function testParsesAnonymousSubscriptionOperations(): void
             subscriptionField
           }
         ');
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('parses named mutation operations') */
@@ -286,7 +286,7 @@ public function testParsesNamedMutationOperations(): void
             mutationField
           }
         ');
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('parses named subscription operations') */
@@ -297,7 +297,7 @@ public function testParsesNamedSubscriptionOperations(): void
             subscriptionField
           }
         ');
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('creates ast') */

diff --git a/tests/TestCaseBase.php b/tests/TestCaseBase.php
@@ -15,10 +15,9 @@ abstract class TestCaseBase extends TestCase
      *
      * @see TestCase::expectNotToPerformAssertions()
      */
-    public static function assertDidNotCrash(): void
+    public function assertDidNotCrash(): void
     {
-        // @phpstan-ignore-next-line this truism is required to prevent a PHPUnit warning
-        self::assertTrue(true);
+        $this->addToAssertionCount(1);
     }
 
     protected static function assertASTMatches(string $expected, ?Node $node): void

diff --git a/tests/Type/DefinitionTest.php b/tests/Type/DefinitionTest.php
@@ -994,7 +994,7 @@ public function testRejectsAnObjectTypeWithInterfacesAsAFunctionReturningAnIncor
     public function testAcceptsALambdaAsAnObjectFieldResolver(): void
     {
         $this->schemaWithObjectWithFieldResolver(static fn () => null);
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /**
@@ -1065,7 +1065,7 @@ public function testAcceptsAnInterfaceTypeDefiningResolveType(): void
                 'fields' => ['f' => ['type' => Type::string()]],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('accepts an Interface type with an array of interfaces') */
@@ -1159,7 +1159,7 @@ public function testAcceptsAnInterfaceWithImplementingTypeDefiningIsTypeOf(): vo
                 'fields' => ['f' => ['type' => Type::string()]],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('accepts an Interface type defining resolveType with implementing type defining isTypeOf') */
@@ -1177,7 +1177,7 @@ public function testAcceptsAnInterfaceTypeDefiningResolveTypeWithImplementingTyp
                 'fields' => ['f' => ['type' => Type::string()]],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('rejects an Interface type with an incorrect type for resolveType') */
@@ -1206,7 +1206,7 @@ public function testAcceptsAUnionTypeDefiningResolveType(): void
                 'types' => [$this->objectType],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('accepts a Union of Object types defining isTypeOf') */
@@ -1218,7 +1218,7 @@ public function testAcceptsAUnionOfObjectTypesDefiningIsTypeOf(): void
                 'types' => [$this->objectWithIsTypeOf],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('accepts a Union type defining resolveType of Object types defining isTypeOf') */
@@ -1230,7 +1230,7 @@ public function testAcceptsAUnionTypeDefiningResolveTypeOfObjectTypesDefiningIsT
                 'types' => [$this->objectWithIsTypeOf],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('rejects an Union type with an incorrect type for resolveType') */
@@ -1258,7 +1258,7 @@ public function testAcceptsAScalarTypeDefiningSerialize(): void
                 'serialize' => static fn () => null,
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     // Type System: Scalar types must be serializable
@@ -1288,7 +1288,7 @@ public function testAcceptsAScalarTypeDefiningParseValueAndParseLiteral(): void
                 'parseLiteral' => static function (): void {},
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('rejects a Scalar type defining parseValue but not parseLiteral') */
@@ -1344,7 +1344,7 @@ public function testAcceptsAnObjectTypeWithAnIsTypeOfFunction(): void
                 'fields' => ['f' => ['type' => Type::string()]],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     // Type System: Object types must be assertable
@@ -1374,7 +1374,7 @@ public function testAcceptsAUnionTypeWithArrayTypes(): void
                 'types' => [$this->objectType],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     // Type System: Union types must be array
@@ -1388,7 +1388,7 @@ public function testAcceptsAUnionTypeWithFunctionReturningAnArrayOfTypes(): void
                 'types' => fn (): array => [$this->objectType],
             ])
         );
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('rejects a Union type without types') */

diff --git a/tests/Type/TypeLoaderTestCaseBase.php b/tests/Type/TypeLoaderTestCaseBase.php
@@ -38,7 +38,7 @@ public function testSchemaAcceptsTypeLoader(): void
             ]),
             'typeLoader' => static fn () => null,
         ]);
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     public function testSchemaRejectsNonCallableTypeLoader(): void

diff --git a/tests/Type/ValidationTest.php b/tests/Type/ValidationTest.php
@@ -567,7 +567,7 @@ public function testAcceptsShorthandNotationForFields(): void
             ])
         );
         $schema->assertValid();
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('accepts field args with valid names') */

diff --git a/tests/Utils/BuildSchemaTest.php b/tests/Utils/BuildSchemaTest.php
@@ -133,7 +133,7 @@ public function testIgnoresNonTypeSystemDefinitions(): void
         ';
         // Should not throw
         BuildSchema::build($sdl);
-        self::assertDidNotCrash();
+        $this->assertDidNotCrash();
     }
 
     /** @see it('Match order of default types and directives') */