Stricter tests for configuring Tables with Validator(s)

cakephp · Jan 30, 2015 · 3397cd0 · 3397cd0
1 parent bc6a55a
commit 3397cd0
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/tests/TestCase/ORM/TableRegistryTest.php b/tests/TestCase/ORM/TableRegistryTest.php
@@ -331,10 +331,12 @@ public function testConfigAndBuild()
      */
     public function testConfigWithSingleValidator()
     {
-        TableRegistry::config('users', ['validator' => new Validator()]);
+        $validator = new Validator();
+
+        TableRegistry::config('users', ['validator' => $validator]);
         $table = TableRegistry::get('users');
 
-        $this->assertInstanceOf('Cake\Validation\Validator', $table->validator('default'));
+        $this->assertSame($table->validator('default'), $validator);
     }
 
     /**
@@ -344,18 +346,22 @@ public function testConfigWithSingleValidator()
      */
     public function testConfigWithMultipleValidators()
     {
+        $validator1 = new Validator();
+        $validator2 = new Validator();
+        $validator3 = new Validator();
+
         TableRegistry::config('users', [
             'validator' => [
-                'default' => new Validator(),
-                'secondary' => new Validator(),
-                'tertiary' => new Validator(),
+                'default' => $validator1,
+                'secondary' => $validator2,
+                'tertiary' => $validator3,
             ]
         ]);
         $table = TableRegistry::get('users');
 
-        $this->assertInstanceOf('Cake\Validation\Validator', $table->validator('default'));
-        $this->assertInstanceOf('Cake\Validation\Validator', $table->validator('secondary'));
-        $this->assertInstanceOf('Cake\Validation\Validator', $table->validator('tertiary'));
+        $this->assertSame($table->validator('default'), $validator1);
+        $this->assertSame($table->validator('secondary'), $validator2);
+        $this->assertSame($table->validator('tertiary'), $validator3);
     }
 
     /**