Changes suggested by dereuromark

Added tests for getDefaultProvider and getDefaultProviders
cakephp · Mar 6, 2017 · 6dd7479 · 6dd7479
1 parent a04924e
commit 6dd7479
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php
@@ -226,11 +226,11 @@ public function getProvider($name)
      */
     public static function getDefaultProvider($name)
     {
-        if (isset(self::$_defaultProviders[$name])) {
-            return self::$_defaultProviders[$name];
+        if (!isset(self::$_defaultProviders[$name])) {
+            return null;
         }
 
-        return null;
+        return self::$_defaultProviders[$name];
     }
 
     /**

diff --git a/tests/TestCase/Validation/ValidatorTest.php b/tests/TestCase/Validation/ValidatorTest.php
@@ -1894,4 +1894,21 @@ public function testAddingDefaultProvider()
         $validator = new Validator;
         $this->assertEquals($validator->providers(), ['test-provider'], 'Default provider `test-provider` is missing');
     }
+
+    /**
+     * Testing getting DefaultProvider(s)
+     *
+     * @return void
+     */
+    public function testGetDefaultProvider()
+    {
+        Validator::addDefaultProvider('test-provider', '\MyNameSpace\Validation\MyProvider');
+        $this->assertEquals(Validator::getDefaultProvider('test-provider'), '\MyNameSpace\Validation\MyProvider', 'Default provider `test-provider` is missing');
+
+        $this->assertNull(Validator::getDefaultProvider('invalid-provider'), 'Default provider (`invalid-provider`) should be missing');
+        $this->assertNull(Validator::getDefaultProvider(null), 'Default provider (null) should be missing');
+
+        Validator::addDefaultProvider('test-provider2', '\MyNameSpace\Validation\MySecondProvider');
+        $this->assertEquals(Validator::getDefaultProviders(), ['test-provider', 'test-provider2'], 'Default providers incorrect');
+    }
 }