NonNull test: fixed naming for consistency

This commit is contained in:
Vladimir Razuvaev 2018-08-08 01:43:23 +07:00
parent d9aee43129
commit 03d7d1851c

View File

@ -19,13 +19,13 @@ class NonNullTest extends TestCase
public $syncError; public $syncError;
/** @var \Exception */ /** @var \Exception */
public $nonNullSyncError; public $syncNonNullError;
/** @var \Exception */ /** @var \Exception */
public $promiseError; public $promiseError;
/** @var \Exception */ /** @var \Exception */
public $nonNullPromiseError; public $promiseNonNullError;
public $throwingData; public $throwingData;
public $nullingData; public $nullingData;
@ -34,31 +34,31 @@ class NonNullTest extends TestCase
public function setUp() public function setUp()
{ {
$this->syncError = new UserError('sync'); $this->syncError = new UserError('sync');
$this->nonNullSyncError = new UserError('nonNullSync'); $this->syncNonNullError = new UserError('syncNonNull');
$this->promiseError = new UserError('promise'); $this->promiseError = new UserError('promise');
$this->nonNullPromiseError = new UserError('nonNullPromise'); $this->promiseNonNullError = new UserError('promiseNonNull');
$this->throwingData = [ $this->throwingData = [
'sync' => function () { 'sync' => function () {
throw $this->syncError; throw $this->syncError;
}, },
'nonNullSync' => function () { 'syncNonNull' => function () {
throw $this->nonNullSyncError; throw $this->syncNonNullError;
}, },
'promise' => function () { 'promise' => function () {
return new Deferred(function () { return new Deferred(function () {
throw $this->promiseError; throw $this->promiseError;
}); });
}, },
'nonNullPromise' => function () { 'promiseNonNull' => function () {
return new Deferred(function () { return new Deferred(function () {
throw $this->nonNullPromiseError; throw $this->promiseNonNullError;
}); });
}, },
'nest' => function () { 'syncNest' => function () {
return $this->throwingData; return $this->throwingData;
}, },
'nonNullNest' => function () { 'syncNonNullNest' => function () {
return $this->throwingData; return $this->throwingData;
}, },
'promiseNest' => function () { 'promiseNest' => function () {
@ -66,7 +66,7 @@ class NonNullTest extends TestCase
return $this->throwingData; return $this->throwingData;
}); });
}, },
'nonNullPromiseNest' => function () { 'promiseNonNullNest' => function () {
return new Deferred(function () { return new Deferred(function () {
return $this->throwingData; return $this->throwingData;
}); });
@ -77,7 +77,7 @@ class NonNullTest extends TestCase
'sync' => function () { 'sync' => function () {
return null; return null;
}, },
'nonNullSync' => function () { 'syncNonNull' => function () {
return null; return null;
}, },
'promise' => function () { 'promise' => function () {
@ -85,15 +85,15 @@ class NonNullTest extends TestCase
return null; return null;
}); });
}, },
'nonNullPromise' => function () { 'promiseNonNull' => function () {
return new Deferred(function () { return new Deferred(function () {
return null; return null;
}); });
}, },
'nest' => function () { 'syncNest' => function () {
return $this->nullingData; return $this->nullingData;
}, },
'nonNullNest' => function () { 'syncNonNullNest' => function () {
return $this->nullingData; return $this->nullingData;
}, },
'promiseNest' => function () { 'promiseNest' => function () {
@ -101,7 +101,7 @@ class NonNullTest extends TestCase
return $this->nullingData; return $this->nullingData;
}); });
}, },
'nonNullPromiseNest' => function () { 'promiseNonNullNest' => function () {
return new Deferred(function () { return new Deferred(function () {
return $this->nullingData; return $this->nullingData;
}); });
@ -113,13 +113,13 @@ class NonNullTest extends TestCase
'fields' => function() use (&$dataType) { 'fields' => function() use (&$dataType) {
return [ return [
'sync' => ['type' => Type::string()], 'sync' => ['type' => Type::string()],
'nonNullSync' => ['type' => Type::nonNull(Type::string())], 'syncNonNull' => ['type' => Type::nonNull(Type::string())],
'promise' => Type::string(), 'promise' => Type::string(),
'nonNullPromise' => Type::nonNull(Type::string()), 'promiseNonNull' => Type::nonNull(Type::string()),
'nest' => $dataType, 'syncNest' => $dataType,
'nonNullNest' => Type::nonNull($dataType), 'syncNonNullNest' => Type::nonNull($dataType),
'promiseNest' => $dataType, 'promiseNest' => $dataType,
'nonNullPromiseNest' => Type::nonNull($dataType), 'promiseNonNullNest' => Type::nonNull($dataType),
]; ];
} }
]); ]);
@ -186,8 +186,8 @@ class NonNullTest extends TestCase
// nulls a synchronously returned object that contains a non-nullable field that throws synchronously // nulls a synchronously returned object that contains a non-nullable field that throws synchronously
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
nonNullSync, syncNonNull,
} }
} }
'; ';
@ -196,10 +196,10 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => null 'syncNest' => null
], ],
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullSyncError->getMessage(), [new SourceLocation(4, 11)]) FormattedError::create($this->syncNonNullError->getMessage(), [new SourceLocation(4, 11)])
] ]
]; ];
$this->assertArraySubset($expected, Executor::execute($this->schema, $ast, $this->throwingData, null, [], 'Q')->toArray()); $this->assertArraySubset($expected, Executor::execute($this->schema, $ast, $this->throwingData, null, [], 'Q')->toArray());
@ -209,8 +209,8 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
nonNullPromise, promiseNonNull,
} }
} }
'; ';
@ -219,10 +219,10 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => null 'syncNest' => null
], ],
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullPromiseError->getMessage(), [new SourceLocation(4, 11)]) FormattedError::create($this->promiseNonNullError->getMessage(), [new SourceLocation(4, 11)])
] ]
]; ];
@ -234,7 +234,7 @@ class NonNullTest extends TestCase
$doc = ' $doc = '
query Q { query Q {
promiseNest { promiseNest {
nonNullSync, syncNonNull,
} }
} }
'; ';
@ -246,7 +246,7 @@ class NonNullTest extends TestCase
'promiseNest' => null 'promiseNest' => null
], ],
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullSyncError->getMessage(), [new SourceLocation(4, 11)]) FormattedError::create($this->syncNonNullError->getMessage(), [new SourceLocation(4, 11)])
] ]
]; ];
@ -258,7 +258,7 @@ class NonNullTest extends TestCase
$doc = ' $doc = '
query Q { query Q {
promiseNest { promiseNest {
nonNullPromise, promiseNonNull,
} }
} }
'; ';
@ -270,7 +270,7 @@ class NonNullTest extends TestCase
'promiseNest' => null 'promiseNest' => null
], ],
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullPromiseError->getMessage(), [new SourceLocation(4, 11)]) FormattedError::create($this->promiseNonNullError->getMessage(), [new SourceLocation(4, 11)])
] ]
]; ];
@ -284,10 +284,10 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
sync sync
promise promise
nest { syncNest {
sync sync
promise promise
} }
@ -299,7 +299,7 @@ class NonNullTest extends TestCase
promiseNest { promiseNest {
sync sync
promise promise
nest { syncNest {
sync sync
promise promise
} }
@ -315,10 +315,10 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => [ 'syncNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
'nest' => [ 'syncNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
], ],
@ -330,7 +330,7 @@ class NonNullTest extends TestCase
'promiseNest' => [ 'promiseNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
'nest' => [ 'syncNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
], ],
@ -363,45 +363,45 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullSync syncNonNull
} }
} }
} }
} }
} }
promiseNest { promiseNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullSync syncNonNull
} }
} }
} }
} }
} }
anotherNest: nest { anotherNest: syncNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullPromise promiseNonNull
} }
} }
} }
} }
} }
anotherPromiseNest: promiseNest { anotherPromiseNest: promiseNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullPromise promiseNonNull
} }
} }
} }
@ -414,16 +414,16 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => null, 'syncNest' => null,
'promiseNest' => null, 'promiseNest' => null,
'anotherNest' => null, 'anotherNest' => null,
'anotherPromiseNest' => null, 'anotherPromiseNest' => null,
], ],
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullSyncError->getMessage(), [new SourceLocation(8, 19)]), FormattedError::create($this->syncNonNullError->getMessage(), [new SourceLocation(8, 19)]),
FormattedError::create($this->nonNullSyncError->getMessage(), [new SourceLocation(19, 19)]), FormattedError::create($this->syncNonNullError->getMessage(), [new SourceLocation(19, 19)]),
FormattedError::create($this->nonNullPromiseError->getMessage(), [new SourceLocation(30, 19)]), FormattedError::create($this->promiseNonNullError->getMessage(), [new SourceLocation(30, 19)]),
FormattedError::create($this->nonNullPromiseError->getMessage(), [new SourceLocation(41, 19)]), FormattedError::create($this->promiseNonNullError->getMessage(), [new SourceLocation(41, 19)]),
] ]
]; ];
@ -471,8 +471,8 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
nonNullSync, syncNonNull,
} }
} }
'; ';
@ -481,11 +481,11 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => null 'syncNest' => null
], ],
'errors' => [ 'errors' => [
[ [
'debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullSync.', 'debugMessage' => 'Cannot return null for non-nullable field DataType.syncNonNull.',
'locations' => [['line' => 4, 'column' => 11]] 'locations' => [['line' => 4, 'column' => 11]]
] ]
] ]
@ -497,8 +497,8 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
nonNullPromise, promiseNonNull,
} }
} }
'; ';
@ -507,11 +507,11 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => null, 'syncNest' => null,
], ],
'errors' => [ 'errors' => [
[ [
'debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullPromise.', 'debugMessage' => 'Cannot return null for non-nullable field DataType.promiseNonNull.',
'locations' => [['line' => 4, 'column' => 11]] 'locations' => [['line' => 4, 'column' => 11]]
], ],
] ]
@ -528,7 +528,7 @@ class NonNullTest extends TestCase
$doc = ' $doc = '
query Q { query Q {
promiseNest { promiseNest {
nonNullSync, syncNonNull,
} }
} }
'; ';
@ -541,7 +541,7 @@ class NonNullTest extends TestCase
], ],
'errors' => [ 'errors' => [
[ [
'debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullSync.', 'debugMessage' => 'Cannot return null for non-nullable field DataType.syncNonNull.',
'locations' => [['line' => 4, 'column' => 11]] 'locations' => [['line' => 4, 'column' => 11]]
], ],
] ]
@ -558,7 +558,7 @@ class NonNullTest extends TestCase
$doc = ' $doc = '
query Q { query Q {
promiseNest { promiseNest {
nonNullPromise, promiseNonNull,
} }
} }
'; ';
@ -571,7 +571,7 @@ class NonNullTest extends TestCase
], ],
'errors' => [ 'errors' => [
[ [
'debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullPromise.', 'debugMessage' => 'Cannot return null for non-nullable field DataType.promiseNonNull.',
'locations' => [['line' => 4, 'column' => 11]] 'locations' => [['line' => 4, 'column' => 11]]
], ],
] ]
@ -587,10 +587,10 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
sync sync
promise promise
nest { syncNest {
sync sync
promise promise
} }
@ -602,7 +602,7 @@ class NonNullTest extends TestCase
promiseNest { promiseNest {
sync sync
promise promise
nest { syncNest {
sync sync
promise promise
} }
@ -618,10 +618,10 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => [ 'syncNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
'nest' => [ 'syncNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
], ],
@ -633,7 +633,7 @@ class NonNullTest extends TestCase
'promiseNest' => [ 'promiseNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
'nest' => [ 'syncNest' => [
'sync' => null, 'sync' => null,
'promise' => null, 'promise' => null,
], ],
@ -653,45 +653,45 @@ class NonNullTest extends TestCase
{ {
$doc = ' $doc = '
query Q { query Q {
nest { syncNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullSync syncNonNull
} }
} }
} }
} }
} }
promiseNest { promiseNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullSync syncNonNull
} }
} }
} }
} }
} }
anotherNest: nest { anotherNest: syncNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullPromise promiseNonNull
} }
} }
} }
} }
} }
anotherPromiseNest: promiseNest { anotherPromiseNest: promiseNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullNest { syncNonNullNest {
nonNullPromiseNest { promiseNonNullNest {
nonNullPromise promiseNonNull
} }
} }
} }
@ -704,16 +704,16 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'data' => [ 'data' => [
'nest' => null, 'syncNest' => null,
'promiseNest' => null, 'promiseNest' => null,
'anotherNest' => null, 'anotherNest' => null,
'anotherPromiseNest' => null, 'anotherPromiseNest' => null,
], ],
'errors' => [ 'errors' => [
['debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullSync.', 'locations' => [ ['line' => 8, 'column' => 19]]], ['debugMessage' => 'Cannot return null for non-nullable field DataType.syncNonNull.', 'locations' => [ ['line' => 8, 'column' => 19]]],
['debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullSync.', 'locations' => [ ['line' => 19, 'column' => 19]]], ['debugMessage' => 'Cannot return null for non-nullable field DataType.syncNonNull.', 'locations' => [ ['line' => 19, 'column' => 19]]],
['debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullPromise.', 'locations' => [ ['line' => 30, 'column' => 19]]], ['debugMessage' => 'Cannot return null for non-nullable field DataType.promiseNonNull.', 'locations' => [ ['line' => 30, 'column' => 19]]],
['debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullPromise.', 'locations' => [ ['line' => 41, 'column' => 19]]], ['debugMessage' => 'Cannot return null for non-nullable field DataType.promiseNonNull.', 'locations' => [ ['line' => 41, 'column' => 19]]],
] ]
]; ];
@ -729,12 +729,12 @@ class NonNullTest extends TestCase
public function testNullsTheTopLevelIfSyncNonNullableFieldThrows() public function testNullsTheTopLevelIfSyncNonNullableFieldThrows()
{ {
$doc = ' $doc = '
query Q { nonNullSync } query Q { syncNonNull }
'; ';
$expected = [ $expected = [
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullSyncError->getMessage(), [new SourceLocation(2, 17)]) FormattedError::create($this->syncNonNullError->getMessage(), [new SourceLocation(2, 17)])
] ]
]; ];
$actual = Executor::execute($this->schema, Parser::parse($doc), $this->throwingData)->toArray(); $actual = Executor::execute($this->schema, Parser::parse($doc), $this->throwingData)->toArray();
@ -744,14 +744,14 @@ class NonNullTest extends TestCase
public function testNullsTheTopLevelIfAsyncNonNullableFieldErrors() public function testNullsTheTopLevelIfAsyncNonNullableFieldErrors()
{ {
$doc = ' $doc = '
query Q { nonNullPromise } query Q { promiseNonNull }
'; ';
$ast = Parser::parse($doc); $ast = Parser::parse($doc);
$expected = [ $expected = [
'errors' => [ 'errors' => [
FormattedError::create($this->nonNullPromiseError->getMessage(), [new SourceLocation(2, 17)]), FormattedError::create($this->promiseNonNullError->getMessage(), [new SourceLocation(2, 17)]),
] ]
]; ];
@ -762,13 +762,13 @@ class NonNullTest extends TestCase
{ {
// nulls the top level if sync non-nullable field returns null // nulls the top level if sync non-nullable field returns null
$doc = ' $doc = '
query Q { nonNullSync } query Q { syncNonNull }
'; ';
$expected = [ $expected = [
'errors' => [ 'errors' => [
[ [
'debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullSync.', 'debugMessage' => 'Cannot return null for non-nullable field DataType.syncNonNull.',
'locations' => [['line' => 2, 'column' => 17]] 'locations' => [['line' => 2, 'column' => 17]]
], ],
] ]
@ -782,7 +782,7 @@ class NonNullTest extends TestCase
public function testNullsTheTopLevelIfAsyncNonNullableFieldResolvesNull() public function testNullsTheTopLevelIfAsyncNonNullableFieldResolvesNull()
{ {
$doc = ' $doc = '
query Q { nonNullPromise } query Q { promiseNonNull }
'; ';
$ast = Parser::parse($doc); $ast = Parser::parse($doc);
@ -790,7 +790,7 @@ class NonNullTest extends TestCase
$expected = [ $expected = [
'errors' => [ 'errors' => [
[ [
'debugMessage' => 'Cannot return null for non-nullable field DataType.nonNullPromise.', 'debugMessage' => 'Cannot return null for non-nullable field DataType.promiseNonNull.',
'locations' => [['line' => 2, 'column' => 17]] 'locations' => [['line' => 2, 'column' => 17]]
], ],
] ]