From 62de403f270c0535c3c17990e95c65a9cc7b8b3f Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Fri, 31 Aug 2018 11:23:02 +0200 Subject: [PATCH] Use right assert method --- .../Promise/ReactPromiseAdapterTest.php | 26 ++++++++-------- tests/Language/SerializationTest.php | 2 +- tests/Server/QueryExecutionTest.php | 2 +- tests/Server/ServerConfigTest.php | 30 +++++++++---------- tests/Type/ResolutionTest.php | 2 +- tests/Type/ScalarSerializationTest.php | 14 ++++----- tests/Utils/AstFromValueTest.php | 6 ++-- 7 files changed, 40 insertions(+), 42 deletions(-) diff --git a/tests/Executor/Promise/ReactPromiseAdapterTest.php b/tests/Executor/Promise/ReactPromiseAdapterTest.php index e28ba3c..e007ae3 100644 --- a/tests/Executor/Promise/ReactPromiseAdapterTest.php +++ b/tests/Executor/Promise/ReactPromiseAdapterTest.php @@ -31,26 +31,24 @@ class ReactPromiseAdapterTest extends TestCase { $reactAdapter = new ReactPromiseAdapter(); - $this->assertSame( - true, + $this->assertTrue( $reactAdapter->isThenable(new ReactPromise(function () { })) ); - $this->assertSame(true, $reactAdapter->isThenable(new FulfilledPromise())); - $this->assertSame(true, $reactAdapter->isThenable(new RejectedPromise())); - $this->assertSame( - true, + $this->assertTrue($reactAdapter->isThenable(new FulfilledPromise())); + $this->assertTrue($reactAdapter->isThenable(new RejectedPromise())); + $this->assertTrue( $reactAdapter->isThenable(new LazyPromise(function () { })) ); - $this->assertSame(false, $reactAdapter->isThenable(false)); - $this->assertSame(false, $reactAdapter->isThenable(true)); - $this->assertSame(false, $reactAdapter->isThenable(1)); - $this->assertSame(false, $reactAdapter->isThenable(0)); - $this->assertSame(false, $reactAdapter->isThenable('test')); - $this->assertSame(false, $reactAdapter->isThenable('')); - $this->assertSame(false, $reactAdapter->isThenable([])); - $this->assertSame(false, $reactAdapter->isThenable(new \stdClass())); + $this->assertFalse($reactAdapter->isThenable(false)); + $this->assertFalse($reactAdapter->isThenable(true)); + $this->assertFalse($reactAdapter->isThenable(1)); + $this->assertFalse($reactAdapter->isThenable(0)); + $this->assertFalse($reactAdapter->isThenable('test')); + $this->assertFalse($reactAdapter->isThenable('')); + $this->assertFalse($reactAdapter->isThenable([])); + $this->assertFalse($reactAdapter->isThenable(new \stdClass())); } public function testConvertsReactPromisesToGraphQlOnes() : void diff --git a/tests/Language/SerializationTest.php b/tests/Language/SerializationTest.php index a55a509..403dbfb 100644 --- a/tests/Language/SerializationTest.php +++ b/tests/Language/SerializationTest.php @@ -51,7 +51,7 @@ class SerializationTest extends TestCase $expectedVars = get_object_vars($expected); $actualVars = get_object_vars($actual); - $this->assertSame(count($expectedVars), count($actualVars), $err); + $this->assertCount(count($expectedVars), $actualVars, $err); $this->assertEquals(array_keys($expectedVars), array_keys($actualVars), $err); foreach ($expectedVars as $name => $expectedValue) { diff --git a/tests/Server/QueryExecutionTest.php b/tests/Server/QueryExecutionTest.php index 3cba697..2cde99f 100644 --- a/tests/Server/QueryExecutionTest.php +++ b/tests/Server/QueryExecutionTest.php @@ -66,7 +66,7 @@ class QueryExecutionTest extends ServerTestCase $query = '{f1'; $result = $this->executeQuery($query); - $this->assertSame(null, $result->data); + $this->assertNull($result->data); $this->assertCount(1, $result->errors); $this->assertContains( 'Syntax Error: Expected Name, found ', diff --git a/tests/Server/ServerConfigTest.php b/tests/Server/ServerConfigTest.php index 1fc2be8..b02eb38 100644 --- a/tests/Server/ServerConfigTest.php +++ b/tests/Server/ServerConfigTest.php @@ -17,17 +17,17 @@ class ServerConfigTest extends TestCase public function testDefaults() : void { $config = ServerConfig::create(); - $this->assertEquals(null, $config->getSchema()); - $this->assertEquals(null, $config->getContext()); - $this->assertEquals(null, $config->getRootValue()); - $this->assertEquals(null, $config->getErrorFormatter()); - $this->assertEquals(null, $config->getErrorsHandler()); - $this->assertEquals(null, $config->getPromiseAdapter()); - $this->assertEquals(null, $config->getValidationRules()); - $this->assertEquals(null, $config->getFieldResolver()); - $this->assertEquals(null, $config->getPersistentQueryLoader()); - $this->assertEquals(false, $config->getDebug()); - $this->assertEquals(false, $config->getQueryBatching()); + $this->assertNull($config->getSchema()); + $this->assertNull($config->getContext()); + $this->assertNull($config->getRootValue()); + $this->assertNull($config->getErrorFormatter()); + $this->assertNull($config->getErrorsHandler()); + $this->assertNull($config->getPromiseAdapter()); + $this->assertNull($config->getValidationRules()); + $this->assertNull($config->getFieldResolver()); + $this->assertNull($config->getPersistentQueryLoader()); + $this->assertFalse($config->getDebug()); + $this->assertFalse($config->getQueryBatching()); } public function testAllowsSettingSchema() : void @@ -166,10 +166,10 @@ class ServerConfigTest extends TestCase $config = ServerConfig::create(); $config->setDebug(true); - $this->assertSame(true, $config->getDebug()); + $this->assertTrue($config->getDebug()); $config->setDebug(false); - $this->assertSame(false, $config->getDebug()); + $this->assertFalse($config->getDebug()); } public function testAcceptsArray() : void @@ -204,8 +204,8 @@ class ServerConfigTest extends TestCase $this->assertSame($arr['validationRules'], $config->getValidationRules()); $this->assertSame($arr['fieldResolver'], $config->getFieldResolver()); $this->assertSame($arr['persistentQueryLoader'], $config->getPersistentQueryLoader()); - $this->assertSame(true, $config->getDebug()); - $this->assertSame(true, $config->getQueryBatching()); + $this->assertTrue($config->getDebug()); + $this->assertTrue($config->getQueryBatching()); } public function testThrowsOnInvalidArrayKey() : void diff --git a/tests/Type/ResolutionTest.php b/tests/Type/ResolutionTest.php index 352372c..741b13e 100644 --- a/tests/Type/ResolutionTest.php +++ b/tests/Type/ResolutionTest.php @@ -287,7 +287,7 @@ class ResolutionTest extends TestCase ]; $this->assertEquals($expectedDescriptor, $eagerTypeResolution->getDescriptor()); - $this->assertSame(null, $eagerTypeResolution->resolveType('User')); + $this->assertNull($eagerTypeResolution->resolveType('User')); $this->assertSame([], $eagerTypeResolution->resolvePossibleTypes($this->node)); $this->assertSame([], $eagerTypeResolution->resolvePossibleTypes($this->content)); $this->assertSame([], $eagerTypeResolution->resolvePossibleTypes($this->mention)); diff --git a/tests/Type/ScalarSerializationTest.php b/tests/Type/ScalarSerializationTest.php index fa89e01..fce19bc 100644 --- a/tests/Type/ScalarSerializationTest.php +++ b/tests/Type/ScalarSerializationTest.php @@ -186,13 +186,13 @@ class ScalarSerializationTest extends TestCase { $boolType = Type::boolean(); - $this->assertSame(true, $boolType->serialize('string')); - $this->assertSame(false, $boolType->serialize('')); - $this->assertSame(true, $boolType->serialize('1')); - $this->assertSame(true, $boolType->serialize(1)); - $this->assertSame(false, $boolType->serialize(0)); - $this->assertSame(true, $boolType->serialize(true)); - $this->assertSame(false, $boolType->serialize(false)); + $this->assertTrue($boolType->serialize('string')); + $this->assertFalse($boolType->serialize('')); + $this->assertTrue($boolType->serialize('1')); + $this->assertTrue($boolType->serialize(1)); + $this->assertFalse($boolType->serialize(0)); + $this->assertTrue($boolType->serialize(true)); + $this->assertFalse($boolType->serialize(false)); // TODO: how should it behave on '0'? } diff --git a/tests/Utils/AstFromValueTest.php b/tests/Utils/AstFromValueTest.php index da5156c..2f56a53 100644 --- a/tests/Utils/AstFromValueTest.php +++ b/tests/Utils/AstFromValueTest.php @@ -126,7 +126,7 @@ class AstFromValueTest extends TestCase */ public function testDoesNotConvertsNonNullValuestoNullValue() : void { - $this->assertSame(null, AST::astFromValue(null, Type::nonNull(Type::boolean()))); + $this->assertNull(AST::astFromValue(null, Type::nonNull(Type::boolean()))); } /** @@ -141,10 +141,10 @@ class AstFromValueTest extends TestCase ); // Note: case sensitive - $this->assertEquals(null, AST::astFromValue('hello', $this->myEnum())); + $this->assertNull(AST::astFromValue('hello', $this->myEnum())); // Note: Not a valid enum value - $this->assertEquals(null, AST::astFromValue('VALUE', $this->myEnum())); + $this->assertNull(AST::astFromValue('VALUE', $this->myEnum())); } /**