Util/Common: move dataProviders below the corresponding tests

Author: benno5020

tests/Core/Util/Common/IsCamelCapsTest.php

@@ -21,6 +21,23 @@ final class IsCamelCapsTest extends TestCase
 {
 
 
+    /**
+     * Test valid public function/method names.
+     *
+     * @param string $name   The tested name.
+     * @param bool   $strict Value of the $strict flag.
+     *
+     * @dataProvider dataValidNotClassFormatPublic
+     *
+     * @return void
+     */
+    public function testValidNotClassFormatPublic($name, $strict)
+    {
+        $this->assertTrue(Common::isCamelCaps($name, false, true, $strict));
+
+    }//end testValidNotClassFormatPublic()
+
+
     /**
      * Data provider.
      *
@@ -49,20 +66,19 @@ public static function dataValidNotClassFormatPublic()
 
 
     /**
-     * Test valid public function/method names.
+     * Test invalid public function/method names.
      *
-     * @param string $name   The tested name.
-     * @param bool   $strict Value of the $strict flag.
+     * @param string $name The tested name.
      *
-     * @dataProvider dataValidNotClassFormatPublic
+     * @dataProvider dataInvalidNotClassFormatPublic
      *
      * @return void
      */
-    public function testValidNotClassFormatPublic($name, $strict)
+    public function testInvalidNotClassFormatPublic($name)
     {
-        $this->assertTrue(Common::isCamelCaps($name, false, true, $strict));
+        $this->assertFalse(Common::isCamelCaps($name, false, true, true));
 
-    }//end testValidNotClassFormatPublic()
+    }//end testInvalidNotClassFormatPublic()
 
 
     /**
@@ -124,19 +140,20 @@ public static function dataInvalidNotClassFormatPublic()
 
 
     /**
-     * Test invalid public function/method names.
+     * Test valid private method names.
      *
-     * @param string $name The tested name.
+     * @param string $name   The tested name.
+     * @param bool   $strict Value of the $strict flag.
      *
-     * @dataProvider dataInvalidNotClassFormatPublic
+     * @dataProvider dataValidNotClassFormatPrivate
      *
      * @return void
      */
-    public function testInvalidNotClassFormatPublic($name)
+    public function testValidNotClassFormatPrivate($name, $strict)
     {
-        $this->assertFalse(Common::isCamelCaps($name, false, true, true));
+        $this->assertTrue(Common::isCamelCaps($name, false, false, $strict));
 
-    }//end testInvalidNotClassFormatPublic()
+    }//end testValidNotClassFormatPrivate()
 
 
     /**
@@ -175,20 +192,20 @@ public static function dataValidNotClassFormatPrivate()
 
 
     /**
-     * Test valid private method names.
+     * Test invalid private method names.
      *
      * @param string $name   The tested name.
      * @param bool   $strict Value of the $strict flag.
      *
-     * @dataProvider dataValidNotClassFormatPrivate
+     * @dataProvider dataInvalidNotClassFormatPrivate
      *
      * @return void
      */
-    public function testValidNotClassFormatPrivate($name, $strict)
+    public function testInvalidNotClassFormatPrivate($name, $strict)
     {
-        $this->assertTrue(Common::isCamelCaps($name, false, false, $strict));
+        $this->assertFalse(Common::isCamelCaps($name, false, false, $strict));
 
-    }//end testValidNotClassFormatPrivate()
+    }//end testInvalidNotClassFormatPrivate()
 
 
     /**
@@ -255,20 +272,20 @@ public static function dataInvalidNotClassFormatPrivate()
 
 
     /**
-     * Test invalid private method names.
+     * Test valid class names.
      *
      * @param string $name   The tested name.
      * @param bool   $strict Value of the $strict flag.
      *
-     * @dataProvider dataInvalidNotClassFormatPrivate
+     * @dataProvider dataValidClassFormatPublic
      *
      * @return void
      */
-    public function testInvalidNotClassFormatPrivate($name, $strict)
+    public function testValidClassFormatPublic($name, $strict)
     {
-        $this->assertFalse(Common::isCamelCaps($name, false, false, $strict));
+        $this->assertTrue(Common::isCamelCaps($name, true, true, $strict));
 
-    }//end testInvalidNotClassFormatPrivate()
+    }//end testValidClassFormatPublic()
 
 
     /**
@@ -320,29 +337,28 @@ public static function dataValidClassFormatPublic()
 
 
     /**
-     * Test valid class names.
+     * Test invalid class names.
      *
-     * @param string $name   The tested name.
-     * @param bool   $strict Value of the $strict flag.
+     * @param string $name The tested name.
      *
-     * @dataProvider dataValidClassFormatPublic
+     * @dataProvider dataInvalidClassFormat
      *
      * @return void
      */
-    public function testValidClassFormatPublic($name, $strict)
+    public function testInvalidClassFormat($name)
     {
-        $this->assertTrue(Common::isCamelCaps($name, true, true, $strict));
+        $this->assertFalse(Common::isCamelCaps($name, true));
 
-    }//end testValidClassFormatPublic()
+    }//end testInvalidClassFormat()
 
 
-    /**
-     * Data provider.
-     *
-     * @see testInvalidClassFormat()
-     *
-     * @return array<string, array<string, string>>
-     */
+     /**
+      * Data provider.
+      *
+      * @see testInvalidClassFormat()
+      *
+      * @return array<string, array<string, string>>
+      */
     public static function dataInvalidClassFormat()
     {
         return [
@@ -364,19 +380,23 @@ public static function dataInvalidClassFormat()
 
 
     /**
-     * Test invalid class names.
+     * Test invalid class names with the private flag set.
      *
-     * @param string $name The tested name.
+     * Note that the private flag is ignored if the class format
+     * flag is set, so these names are all invalid.
      *
-     * @dataProvider dataInvalidClassFormat
+     * @param string $name   The tested name.
+     * @param bool   $public Value of the $public flag.
+     *
+     * @dataProvider dataInvalidClassFormatPrivate
      *
      * @return void
      */
-    public function testInvalidClassFormat($name)
+    public function testInvalidClassFormatPrivate($name, $public)
     {
-        $this->assertFalse(Common::isCamelCaps($name, true));
+            $this->assertFalse(Common::isCamelCaps($name, true, $public));
 
-    }//end testInvalidClassFormat()
+    }//end testInvalidClassFormatPrivate()
 
 
     /**
@@ -411,23 +431,19 @@ public static function dataInvalidClassFormatPrivate()
 
 
     /**
-     * Test invalid class names with the private flag set.
-     *
-     * Note that the private flag is ignored if the class format
-     * flag is set, so these names are all invalid.
+     * Test valid strings with default arguments.
      *
-     * @param string $name   The tested name.
-     * @param bool   $public Value of the $public flag.
+     * @param string $name The tested name.
      *
-     * @dataProvider dataInvalidClassFormatPrivate
+     * @dataProvider dataValidDefaultArguments
      *
      * @return void
      */
-    public function testInvalidClassFormatPrivate($name, $public)
+    public function testValidDefaultArguments($name)
     {
-            $this->assertFalse(Common::isCamelCaps($name, true, $public));
+        $this->assertTrue(Common::isCamelCaps($name));
 
-    }//end testInvalidClassFormatPrivate()
+    }//end testValidDefaultArguments()
 
 
     /**
@@ -452,19 +468,19 @@ public static function dataValidDefaultArguments()
 
 
     /**
-     * Test valid strings with default arguments.
+     * Test invalid strings with default arguments.
      *
      * @param string $name The tested name.
      *
-     * @dataProvider dataValidDefaultArguments
+     * @dataProvider dataInvalidDefaultArguments
      *
      * @return void
      */
-    public function testValidDefaultArguments($name)
+    public function testInvalidDefaultArguments($name)
     {
-        $this->assertTrue(Common::isCamelCaps($name));
+        $this->assertFalse(Common::isCamelCaps($name));
 
-    }//end testValidDefaultArguments()
+    }//end testInvalidDefaultArguments()
 
 
     /**
@@ -494,20 +510,4 @@ public static function dataInvalidDefaultArguments()
     }//end dataInvalidDefaultArguments()
 
 
-    /**
-     * Test invalid strings with default arguments.
-     *
-     * @param string $name The tested name.
-     *
-     * @dataProvider dataInvalidDefaultArguments
-     *
-     * @return void
-     */
-    public function testInvalidDefaultArguments($name)
-    {
-        $this->assertFalse(Common::isCamelCaps($name));
-
-    }//end testInvalidDefaultArguments()
-
-
 }//end class