Changeset 29932

Timestamp:

10/17/2014 12:40:06 AM (10 years ago)

Author:

boonebgorges

Message:

Add expectedIncorrectUsage flags for unit tests that generate invalid dates.

Since [29925], passing an invalid date to WP_Date_Query will generate a
_doing_it_wrong() notice. The current changeset adds the
@expectedIncorrectUsage flag to those existing unit tests that generate
invalid dates, such as those that test canonical redirect and is_404()
conditionals.

Fixes #25834.

Location:

trunk/tests/phpunit/tests

Files:

• canonical.php (modified) (2 diffs)
• query/conditionals.php (modified) (1 diff)
• query/results.php (modified) (1 diff)

trunk/tests/phpunit/tests/canonical.php

@@ -107 +107 @@
      * @dataProvider data
      */
-    function test($test_url, $expected, $ticket = 0) {
+    function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
+        $this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, (array) $expected_doing_it_wrong );
+
         if ( $ticket )
             $this->knownWPBug( $ticket );
@@ -247 +249 @@
 
             array( '/2012/13/', '/2012/'),
-            array( '/2012/11/51/', '/2012/11/'),
+            array( '/2012/11/51/', '/2012/11/', 0, array( 'WP_Date_Query' ) ),
 
             // Authors

trunk/tests/phpunit/tests/query/conditionals.php

@@ -604 +604 @@
     // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?attachment=$matches[1]&feed=$matches[2]',
 
+    /**
+     * @expectedIncorrectUsage WP_Date_Query
+     */
     function test_bad_dates() {
         $this->go_to( '/2013/13/13/' );

trunk/tests/phpunit/tests/query/results.php

@@ -574 +574 @@
         $this->assertFalse( $this->q->is_month );
         $this->assertTrue( $this->q->is_year );
-
+    }
+
+    /**
+     * @ticket 10935
+     * @expectedIncorrectUsage WP_Date_Query
+     */
+    public function test_query_is_date_with_bad_date() {
         $this->q->query( array(
             'year' => '2007',