Browse Source

Merge pull request #5395 from cakephp/3.0-asserts

Consolidate asserts
Mark S. 11 years ago
parent
commit
30dd298a37

+ 2 - 2
tests/TestCase/Cache/CacheTest.php

@@ -100,12 +100,12 @@ class CacheTest extends TestCase {
 		$config = ['engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_'];
 		Cache::config('libEngine', $config);
 		$engine = Cache::engine('libEngine');
-		$this->assertInstanceOf('\TestApp\Cache\Engine\TestAppCacheEngine', $engine);
+		$this->assertInstanceOf('TestApp\Cache\Engine\TestAppCacheEngine', $engine);
 
 		$config = ['engine' => 'TestPlugin.TestPluginCache', 'path' => TMP, 'prefix' => 'cake_test_'];
 		$result = Cache::config('pluginLibEngine', $config);
 		$engine = Cache::engine('pluginLibEngine');
-		$this->assertInstanceOf('\TestPlugin\Cache\Engine\TestPluginCacheEngine', $engine);
+		$this->assertInstanceOf('TestPlugin\Cache\Engine\TestPluginCacheEngine', $engine);
 
 		Cache::drop('libEngine');
 		Cache::drop('pluginLibEngine');

+ 9 - 9
tests/TestCase/Collection/CollectionTest.php

@@ -98,7 +98,7 @@ class CollectionTest extends TestCase {
 			return $value > 2;
 		});
 
-		$this->assertInstanceOf('\Cake\Collection\Collection', $filtered);
+		$this->assertInstanceOf('Cake\Collection\Collection', $filtered);
 		$filtered->each($callable);
 	}
 
@@ -115,7 +115,7 @@ class CollectionTest extends TestCase {
 			return $v > 2;
 		});
 		$this->assertEquals(['a' => 1, 'b' => 2], iterator_to_array($result));
-		$this->assertInstanceOf('\Cake\Collection\Collection', $result);
+		$this->assertInstanceOf('Cake\Collection\Collection', $result);
 	}
 
 /**
@@ -234,7 +234,7 @@ class CollectionTest extends TestCase {
 			$this->assertSame($collection, $it);
 			return $v * $v;
 		});
-		$this->assertInstanceOf('\Cake\Collection\Iterator\ReplaceIterator', $map);
+		$this->assertInstanceOf('Cake\Collection\Iterator\ReplaceIterator', $map);
 		$this->assertEquals(['a' => 1, 'b' => 4, 'c' => 9], iterator_to_array($map));
 	}
 
@@ -271,7 +271,7 @@ class CollectionTest extends TestCase {
 		$items = [['a' => ['b' => ['c' => 1]]], 2];
 		$collection = new Collection($items);
 		$map = $collection->extract('a.b.c');
-		$this->assertInstanceOf('\Cake\Collection\Iterator\ExtractIterator', $map);
+		$this->assertInstanceOf('Cake\Collection\Iterator\ExtractIterator', $map);
 		$this->assertEquals([1, null], iterator_to_array($map));
 	}
 
@@ -288,7 +288,7 @@ class CollectionTest extends TestCase {
 		];
 		$collection = new Collection($items);
 		$map = $collection->sortBy('a.b.c');
-		$this->assertInstanceOf('\Cake\Collection\Collection', $map);
+		$this->assertInstanceOf('Cake\Collection\Collection', $map);
 		$expected = [
 			2 => ['a' => ['b' => ['c' => 10]]],
 			1 => ['a' => ['b' => ['c' => 6]]],
@@ -355,7 +355,7 @@ class CollectionTest extends TestCase {
 			]
 		];
 		$this->assertEquals($expected, iterator_to_array($grouped));
-		$this->assertInstanceOf('\Cake\Collection\Collection', $grouped);
+		$this->assertInstanceOf('Cake\Collection\Collection', $grouped);
 
 		$grouped = $collection->groupBy(function ($element) {
 			return $element['parent_id'];
@@ -407,7 +407,7 @@ class CollectionTest extends TestCase {
 			2 => ['id' => 2, 'name' => 'bar', 'parent_id' => 11],
 		];
 		$this->assertEquals($expected, iterator_to_array($grouped));
-		$this->assertInstanceOf('\Cake\Collection\Collection', $grouped);
+		$this->assertInstanceOf('Cake\Collection\Collection', $grouped);
 
 		$grouped = $collection->indexBy(function ($element) {
 			return $element['id'];
@@ -453,7 +453,7 @@ class CollectionTest extends TestCase {
 			11 => 1
 		];
 		$this->assertEquals($expected, iterator_to_array($grouped));
-		$this->assertInstanceOf('\Cake\Collection\Collection', $grouped);
+		$this->assertInstanceOf('Cake\Collection\Collection', $grouped);
 
 		$grouped = $collection->countBy(function ($element) {
 			return $element['parent_id'];
@@ -876,7 +876,7 @@ class CollectionTest extends TestCase {
 		$items = [['a' => 1], ['b' => 2]];
 		$collection = new Collection($items);
 		$iterator = $collection->insert('c', [3, 4]);
-		$this->assertInstanceOf('\Cake\Collection\Iterator\InsertIterator', $iterator);
+		$this->assertInstanceOf('Cake\Collection\Iterator\InsertIterator', $iterator);
 		$this->assertEquals(
 			[['a' => 1, 'c' => 3], ['b' => 2, 'c' => 4]],
 			iterator_to_array($iterator)

+ 2 - 2
tests/TestCase/Database/ConnectionTest.php

@@ -634,7 +634,7 @@ class ConnectionTest extends TestCase {
  */
 	public function testLoggerDefault() {
 		$logger = $this->connection->logger();
-		$this->assertInstanceOf('\Cake\Database\Log\QueryLogger', $logger);
+		$this->assertInstanceOf('Cake\Database\Log\QueryLogger', $logger);
 		$this->assertSame($logger, $this->connection->logger());
 	}
 
@@ -659,7 +659,7 @@ class ConnectionTest extends TestCase {
 		$this->connection->logQueries(true);
 		$this->connection->logger($logger);
 		$st = $this->connection->prepare('SELECT 1');
-		$this->assertInstanceOf('\Cake\Database\Log\LoggingStatement', $st);
+		$this->assertInstanceOf('Cake\Database\Log\LoggingStatement', $st);
 		$this->assertSame($logger, $st->logger());
 
 		$this->connection->logQueries(false);

+ 11 - 11
tests/TestCase/Database/FunctionsBuilderTest.php

@@ -40,7 +40,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testArbitrary() {
 		$function = $this->functions->MyFunc(['b' => 'literal']);
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals('MyFunc', $function->name());
 		$this->assertEquals('MyFunc(b)', $function->sql(new ValueBinder));
 	}
@@ -52,7 +52,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testSum() {
 		$function = $this->functions->sum('total');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals('SUM(total)', $function->sql(new ValueBinder));
 	}
 
@@ -63,7 +63,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testAvg() {
 		$function = $this->functions->avg('salary');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals('AVG(salary)', $function->sql(new ValueBinder));
 	}
 
@@ -74,7 +74,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testMAX() {
 		$function = $this->functions->max('created');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals('MAX(created)', $function->sql(new ValueBinder));
 	}
 
@@ -85,7 +85,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testMin() {
 		$function = $this->functions->min('created');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals('MIN(created)', $function->sql(new ValueBinder));
 	}
 
@@ -96,7 +96,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testCount() {
 		$function = $this->functions->count('*');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals('COUNT(*)', $function->sql(new ValueBinder));
 	}
 
@@ -107,7 +107,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testConcat() {
 		$function = $this->functions->concat(['title' => 'literal', ' is a string']);
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals("CONCAT(title, :c0)", $function->sql(new ValueBinder));
 	}
 
@@ -118,7 +118,7 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testCoalesce() {
 		$function = $this->functions->coalesce(['NULL' => 'literal', '1', '2']);
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals("COALESCE(NULL, :c0, :c1)", $function->sql(new ValueBinder));
 	}
 
@@ -129,15 +129,15 @@ class FunctionsBuilderTest extends TestCase {
  */
 	public function testNow() {
 		$function = $this->functions->now();
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals("NOW()", $function->sql(new ValueBinder));
 
 		$function = $this->functions->now('date');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals("CURRENT_DATE()", $function->sql(new ValueBinder));
 
 		$function = $this->functions->now('time');
-		$this->assertInstanceOf('\Cake\Database\Expression\FunctionExpression', $function);
+		$this->assertInstanceOf('Cake\Database\Expression\FunctionExpression', $function);
 		$this->assertEquals("CURRENT_TIME()", $function->sql(new ValueBinder));
 	}
 }

+ 1 - 1
tests/TestCase/Database/TypeTest.php

@@ -67,7 +67,7 @@ class TypeTest extends TestCase {
  */
 	public function testBuildBasicTypes($name) {
 		$type = Type::build($name);
-		$this->assertInstanceOf('\Cake\Database\Type', $type);
+		$this->assertInstanceOf('Cake\Database\Type', $type);
 		$this->assertEquals($name, $type->getName());
 	}
 

+ 1 - 1
tests/TestCase/Event/EventManagerTraitTest.php

@@ -66,7 +66,7 @@ class EventManagerTraitTest extends TestCase {
 	public function testDispatchEvent() {
 		$event = $this->subject->dispatchEvent('some.event', ['foo' => 'bar']);
 
-		$this->assertInstanceOf('\Cake\Event\Event', $event);
+		$this->assertInstanceOf('Cake\Event\Event', $event);
 		$this->assertSame($this->subject, $event->subject);
 		$this->assertEquals('some.event', $event->name);
 		$this->assertEquals(['foo' => 'bar'], $event->data);

+ 1 - 1
tests/TestCase/ORM/Association/BelongsToManyTest.php

@@ -141,7 +141,7 @@ class BelongsToManyTest extends TestCase {
 			'targetTable' => $this->tag
 		]);
 		$junction = $assoc->junction();
-		$this->assertInstanceOf('\Cake\ORM\Table', $junction);
+		$this->assertInstanceOf('Cake\ORM\Table', $junction);
 		$this->assertEquals('ArticlesTags', $junction->alias());
 		$this->assertEquals('articles_tags', $junction->table());
 		$this->assertSame($this->article, $junction->association('Articles')->target());

+ 7 - 7
tests/TestCase/ORM/QueryTest.php

@@ -1070,7 +1070,7 @@ class QueryTest extends TestCase {
 
 		$this->assertCount(3, $results);
 		foreach ($results as $r) {
-			$this->assertInstanceOf('\Cake\ORM\Entity', $r);
+			$this->assertInstanceOf('Cake\ORM\Entity', $r);
 		}
 
 		$first = $results[0];
@@ -1100,7 +1100,7 @@ class QueryTest extends TestCase {
 
 		$first = $results[0];
 		foreach ($first->articles as $r) {
-			$this->assertInstanceOf('\Cake\ORM\Entity', $r);
+			$this->assertInstanceOf('Cake\ORM\Entity', $r);
 		}
 
 		$this->assertCount(2, $first->articles);
@@ -1143,7 +1143,7 @@ class QueryTest extends TestCase {
 
 		$first = $results[0];
 		foreach ($first->tags as $r) {
-			$this->assertInstanceOf('\Cake\ORM\Entity', $r);
+			$this->assertInstanceOf('Cake\ORM\Entity', $r);
 		}
 
 		$this->assertCount(2, $first->tags);
@@ -1181,7 +1181,7 @@ class QueryTest extends TestCase {
 
 		$this->assertCount(3, $results);
 		$first = $results[0];
-		$this->assertInstanceOf('\Cake\ORM\Entity', $first->author);
+		$this->assertInstanceOf('Cake\ORM\Entity', $first->author);
 		$expected = ['id' => 1, 'name' => 'mariano'];
 		$this->assertEquals($expected, $first->author->toArray());
 	}
@@ -1208,7 +1208,7 @@ class QueryTest extends TestCase {
 
 		$this->assertCount(4, $results);
 		$first = $results[0];
-		$this->assertInstanceOf('\Cake\ORM\Entity', $first->articles[0]->author);
+		$this->assertInstanceOf('Cake\ORM\Entity', $first->articles[0]->author);
 		$expected = ['id' => 1, 'name' => 'mariano'];
 		$this->assertEquals($expected, $first->articles[0]->author->toArray());
 		$this->assertTrue(isset($results[3]->articles));
@@ -1630,7 +1630,7 @@ class QueryTest extends TestCase {
 		$query = new Query($this->connection, $table);
 		$query->select()->formatResults(function ($results, $q) use ($query) {
 			$this->assertSame($query, $q);
-			$this->assertInstanceOf('\Cake\ORM\ResultSet', $results);
+			$this->assertInstanceOf('Cake\ORM\ResultSet', $results);
 			return $results->indexBy('id');
 		});
 		$this->assertEquals([1, 2, 3, 4], array_keys($query->toArray()));
@@ -1646,7 +1646,7 @@ class QueryTest extends TestCase {
 		$query = new Query($this->connection, $table);
 		$query->select()->formatResults(function ($results, $q) use ($query) {
 			$this->assertSame($query, $q);
-			$this->assertInstanceOf('\Cake\ORM\ResultSet', $results);
+			$this->assertInstanceOf('Cake\ORM\ResultSet', $results);
 			return $results->indexBy('id');
 		});
 

+ 4 - 4
tests/TestCase/ORM/TableRegistryTest.php

@@ -191,14 +191,14 @@ class TableRegistryTest extends TestCase {
  */
 	public function testGetWithConventions() {
 		$table = TableRegistry::get('articles');
-		$this->assertInstanceOf('\TestApp\Model\Table\ArticlesTable', $table);
+		$this->assertInstanceOf('TestApp\Model\Table\ArticlesTable', $table);
 		$table = TableRegistry::get('Articles');
-		$this->assertInstanceOf('\TestApp\Model\Table\ArticlesTable', $table);
+		$this->assertInstanceOf('TestApp\Model\Table\ArticlesTable', $table);
 
 		$table = TableRegistry::get('authors');
-		$this->assertInstanceOf('\TestApp\Model\Table\AuthorsTable', $table);
+		$this->assertInstanceOf('TestApp\Model\Table\AuthorsTable', $table);
 		$table = TableRegistry::get('Authors');
-		$this->assertInstanceOf('\TestApp\Model\Table\AuthorsTable', $table);
+		$this->assertInstanceOf('TestApp\Model\Table\AuthorsTable', $table);
 	}
 
 /**

+ 11 - 11
tests/TestCase/ORM/TableTest.php

@@ -445,7 +445,7 @@ class TableTest extends TestCase {
 		$options = ['foreignKey' => 'fake_id', 'conditions' => ['a' => 'b']];
 		$table = new Table(['table' => 'dates']);
 		$belongsTo = $table->belongsTo('user', $options);
-		$this->assertInstanceOf('\Cake\ORM\Association\BelongsTo', $belongsTo);
+		$this->assertInstanceOf('Cake\ORM\Association\BelongsTo', $belongsTo);
 		$this->assertSame($belongsTo, $table->association('user'));
 		$this->assertEquals('user', $belongsTo->name());
 		$this->assertEquals('fake_id', $belongsTo->foreignKey());
@@ -462,7 +462,7 @@ class TableTest extends TestCase {
 		$options = ['foreignKey' => 'user_id', 'conditions' => ['b' => 'c']];
 		$table = new Table(['table' => 'users']);
 		$hasOne = $table->hasOne('profile', $options);
-		$this->assertInstanceOf('\Cake\ORM\Association\HasOne', $hasOne);
+		$this->assertInstanceOf('Cake\ORM\Association\HasOne', $hasOne);
 		$this->assertSame($hasOne, $table->association('profile'));
 		$this->assertEquals('profile', $hasOne->name());
 		$this->assertEquals('user_id', $hasOne->foreignKey());
@@ -483,7 +483,7 @@ class TableTest extends TestCase {
 		];
 		$table = new Table(['table' => 'authors']);
 		$hasMany = $table->hasMany('article', $options);
-		$this->assertInstanceOf('\Cake\ORM\Association\HasMany', $hasMany);
+		$this->assertInstanceOf('Cake\ORM\Association\HasMany', $hasMany);
 		$this->assertSame($hasMany, $table->association('article'));
 		$this->assertEquals('article', $hasMany->name());
 		$this->assertEquals('author_id', $hasMany->foreignKey());
@@ -506,7 +506,7 @@ class TableTest extends TestCase {
 		];
 		$table = new Table(['table' => 'authors', 'connection' => $this->connection]);
 		$belongsToMany = $table->belongsToMany('tag', $options);
-		$this->assertInstanceOf('\Cake\ORM\Association\BelongsToMany', $belongsToMany);
+		$this->assertInstanceOf('Cake\ORM\Association\BelongsToMany', $belongsToMany);
 		$this->assertSame($belongsToMany, $table->association('tag'));
 		$this->assertEquals('tag', $belongsToMany->name());
 		$this->assertEquals('thing_id', $belongsToMany->foreignKey());
@@ -539,22 +539,22 @@ class TableTest extends TestCase {
 		$associations = $table->associations();
 
 		$belongsTo = $associations->get('users');
-		$this->assertInstanceOf('\Cake\ORM\Association\BelongsTo', $belongsTo);
+		$this->assertInstanceOf('Cake\ORM\Association\BelongsTo', $belongsTo);
 		$this->assertEquals('users', $belongsTo->name());
 		$this->assertEquals('fake_id', $belongsTo->foreignKey());
 		$this->assertEquals(['a' => 'b'], $belongsTo->conditions());
 		$this->assertSame($table, $belongsTo->source());
 
 		$hasOne = $associations->get('profiles');
-		$this->assertInstanceOf('\Cake\ORM\Association\HasOne', $hasOne);
+		$this->assertInstanceOf('Cake\ORM\Association\HasOne', $hasOne);
 		$this->assertEquals('profiles', $hasOne->name());
 
 		$hasMany = $associations->get('authors');
-		$this->assertInstanceOf('\Cake\ORM\Association\hasMany', $hasMany);
+		$this->assertInstanceOf('Cake\ORM\Association\hasMany', $hasMany);
 		$this->assertEquals('authors', $hasMany->name());
 
 		$belongsToMany = $associations->get('tags');
-		$this->assertInstanceOf('\Cake\ORM\Association\BelongsToMany', $belongsToMany);
+		$this->assertInstanceOf('Cake\ORM\Association\BelongsToMany', $belongsToMany);
 		$this->assertEquals('tags', $belongsToMany->name());
 		$this->assertSame('things_tags', $belongsToMany->junction()->table());
 	}
@@ -1162,7 +1162,7 @@ class TableTest extends TestCase {
 	public function testBehaviors() {
 		$table = TableRegistry::get('article');
 		$result = $table->behaviors();
-		$this->assertInstanceOf('\Cake\ORM\BehaviorRegistry', $result);
+		$this->assertInstanceOf('Cake\ORM\BehaviorRegistry', $result);
 	}
 
 /**
@@ -2066,7 +2066,7 @@ class TableTest extends TestCase {
 		$table = new Table();
 		$validator = $table->validator();
 		$this->assertSame($table, $validator->provider('table'));
-		$this->assertInstanceOf('\Cake\Validation\Validator', $validator);
+		$this->assertInstanceOf('Cake\Validation\Validator', $validator);
 		$default = $table->validator('default');
 		$this->assertSame($validator, $default);
 	}
@@ -2081,7 +2081,7 @@ class TableTest extends TestCase {
 		$table->expects($this->once())->method('validationForOtherStuff')
 			->will($this->returnArgument(0));
 		$other = $table->validator('forOtherStuff');
-		$this->assertInstanceOf('\Cake\Validation\Validator', $other);
+		$this->assertInstanceOf('Cake\Validation\Validator', $other);
 		$this->assertNotSame($other, $table->validator());
 		$this->assertSame($table, $other->provider('table'));
 	}

+ 3 - 3
tests/TestCase/TestSuite/TestCaseTest.php

@@ -372,11 +372,11 @@ class TestCaseTest extends TestCase {
 		$TestPluginComment = $this->getMockForModel('TestPlugin.TestPluginComments');
 
 		$result = TableRegistry::get('TestPlugin.TestPluginComments');
-		$this->assertInstanceOf('\TestPlugin\Model\Table\TestPluginCommentsTable', $result);
+		$this->assertInstanceOf('TestPlugin\Model\Table\TestPluginCommentsTable', $result);
 
 		$TestPluginComment = $this->getMockForModel('TestPlugin.TestPluginComments', array('save'));
 
-		$this->assertInstanceOf('\TestPlugin\Model\Table\TestPluginCommentsTable', $TestPluginComment);
+		$this->assertInstanceOf('TestPlugin\Model\Table\TestPluginCommentsTable', $TestPluginComment);
 		$this->assertEquals('\Cake\ORM\Entity', $TestPluginComment->entityClass());
 		$TestPluginComment->expects($this->at(0))
 			->method('save')
@@ -390,7 +390,7 @@ class TestCaseTest extends TestCase {
 		$this->assertFalse($TestPluginComment->save($entity));
 
 		$TestPluginAuthors = $this->getMockForModel('TestPlugin.Authors', array('doSomething'));
-		$this->assertInstanceOf('\TestPlugin\Model\Table\AuthorsTable', $TestPluginAuthors);
+		$this->assertInstanceOf('TestPlugin\Model\Table\AuthorsTable', $TestPluginAuthors);
 		$this->assertEquals('TestPlugin\Model\Entity\Author', $TestPluginAuthors->entityClass());
 	}
 

+ 3 - 3
tests/TestCase/Validation/ValidatorTest.php

@@ -33,7 +33,7 @@ class ValidatorTest extends TestCase {
 		$validator = new Validator;
 		$validator->add('title', 'not-empty', ['rule' => 'notEmpty']);
 		$set = $validator->field('title');
-		$this->assertInstanceOf('\Cake\Validation\ValidationSet', $set);
+		$this->assertInstanceOf('Cake\Validation\ValidationSet', $set);
 		$this->assertCount(1, $set);
 
 		$validator->add('title', 'another', ['rule' => 'alphanumeric']);
@@ -54,7 +54,7 @@ class ValidatorTest extends TestCase {
 		$this->assertFalse($validator->hasField('foo'));
 
 		$field = $validator->field('foo');
-		$this->assertInstanceOf('\Cake\Validation\ValidationSet', $field);
+		$this->assertInstanceOf('Cake\Validation\ValidationSet', $field);
 		$this->assertCount(0, $field);
 		$this->assertTrue($validator->hasField('foo'));
 	}
@@ -635,7 +635,7 @@ class ValidatorTest extends TestCase {
 			]
 		]);
 		$set = $validator->field('title');
-		$this->assertInstanceOf('\Cake\Validation\ValidationSet', $set);
+		$this->assertInstanceOf('Cake\Validation\ValidationSet', $set);
 		$this->assertCount(2, $set);
 	}
 

+ 1 - 1
tests/TestCase/View/Helper/StringTemplateTraitTest.php

@@ -122,7 +122,7 @@ class StringTemplateTraitTest extends TestCase {
 		];
 		$this->Template->templates($templates);
 		$result = $this->Template->templater();
-		$this->assertInstanceOf('\Cake\View\StringTemplate', $result);
+		$this->assertInstanceOf('Cake\View\StringTemplate', $result);
 	}
 
 }