Changeset 36714 for trunk/tests/phpunit/tests/canonical.php

Timestamp:

02/25/2016 09:55:57 PM (10 years ago)

Author:

johnbillion

Message:

Canonical: Improve the method names and inline docs for canonical redirect tests.

File:

• trunk/tests/phpunit/tests/canonical.php (modified) (3 diffs)

trunk/tests/phpunit/tests/canonical.php

@@ -24 +24 @@
 
         /**
-         * @dataProvider data
+         * @dataProvider data_canonical
          */
-        function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
+        function test_canonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
 
                 if ( false !== strpos( $test_url, '%d' ) ) {
@@ -38 +38 @@
         }
 
-        function data() {
+        function data_canonical() {
                 /* Data format:
-                 * [0]: $test_url,
+                 * [0]: Test URL.
                  * [1]: expected results: Any of the following can be used
                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
@@ -46 +46 @@
                  *      (string) expected redirect location
                  * [2]: (optional) The ticket the test refers to, Can be skipped if unknown.
+                 * [3]: (optional) Array of class/function names expected to throw `_doing_it_wrong()` notices.
                  */