Changeset 36218

Timestamp:

01/07/2016 10:16:47 AM (10 years ago)

Author:

swissspidy

Message:

Tests: Fix unit tests after [36217].

See #35236.

File:

• trunk/tests/phpunit/tests/rewrite/rewriteTags.php (modified) (7 diffs)

trunk/tests/phpunit/tests/rewrite/rewriteTags.php

@@ -8 +8 @@
     protected $rewritereplace;
     protected $queryreplace;
+    protected $wp_rewrite;
 
     public function setUp() {
         global $wp_rewrite;
+        $this->wp_rewrite = $wp_rewrite;
+        $wp_rewrite       = new WP_Rewrite();
+        $wp_rewrite->init();
+
         $this->rewritecode    = $wp_rewrite->rewritecode;
         $this->rewritereplace = $wp_rewrite->rewritereplace;
@@ -18 +23 @@
     public function tearDown() {
         global $wp_rewrite;
-        $wp_rewrite->rewritecode    = $this->rewritecode;
-        $wp_rewrite->rewritereplace = $this->rewritereplace;
-        $wp_rewrite->queryreplace   = $this->queryreplace;
+        $wp_rewrite = $this->wp_rewrite;
     }
 
@@ -44 +47 @@
 
         add_rewrite_tag( $tag, $regex );
-        $this->assertNotContains( $tag, $wp_rewrite->rewritecode );
-        $this->assertNotContains( $regex, $wp_rewrite->rewritereplace );
-        $this->assertNotContains( $tag . '=', $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $this->rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( $this->rewritereplace, $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( $this->queryreplace, $wp_rewrite->queryreplace );
     }
 
@@ -52 +55 @@
         global $wp_rewrite;
 
+        $rewritecode   = $wp_rewrite->rewritecode;
+        $rewritecode[] = '%foo%';
         add_rewrite_tag( '%foo%', 'bar' );
 
-        $this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
-        $this->assertSame( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
-        $this->assertSame( array_merge( $this->queryreplace, array( 'foo=' ) ), $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( array_merge( $this->queryreplace, array( 'foo=' ) ), $wp_rewrite->queryreplace );
     }
 
@@ -62 +67 @@
         global $wp_rewrite;
 
+        $rewritecode   = $wp_rewrite->rewritecode;
+        $rewritecode[] = '%foo%';
         add_rewrite_tag( '%foo%', 'bar', 'baz=' );
 
-        $this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
-        $this->assertSame( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
-        $this->assertSame( array_merge( $this->queryreplace, array( 'baz=' ) ), $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( array_merge( $this->queryreplace, array( 'baz=' ) ), $wp_rewrite->queryreplace );
     }
 
@@ -83 +90 @@
         global $wp_rewrite;
 
+        $rewritecode   = $wp_rewrite->rewritecode;
+        $rewritecode[] = '%foo%';
         add_rewrite_tag( '%foo%', 'bar', 'baz=' );
-        $this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
-        $this->assertSame( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
-        $this->assertSame( array_merge( $this->queryreplace, array( 'baz=' ) ), $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( array_merge( $this->queryreplace, array( 'baz=' ) ), $wp_rewrite->queryreplace );
 
         remove_rewrite_tag( '%foo%' );
-        $this->assertSame( $this->rewritecode, $wp_rewrite->rewritecode );
-        $this->assertSame( $this->rewritereplace, $wp_rewrite->rewritereplace );
-        $this->assertSame( $this->queryreplace, $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $this->rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( $this->rewritereplace, $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( $this->queryreplace, $wp_rewrite->queryreplace );
     }
 
@@ -111 +120 @@
         global $wp_rewrite;
 
+        $rewritecode      = $wp_rewrite->rewritecode;
+        $rewritecode[]    = '%foo%';
+        $rewritereplace   = $wp_rewrite->rewritereplace;
+        $rewritereplace[] = '([0-9]{1,2})';
         add_rewrite_tag( '%foo%', '([0-9]{1,2})', 'post_type=foo&name=' );
-        $this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
-        $this->assertSame( array_merge( $this->rewritereplace, array( '([0-9]{1,2})' ) ), $wp_rewrite->rewritereplace );
-        $this->assertSame( array_merge( $this->queryreplace, array( 'post_type=foo&name=' ) ), $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( $rewritereplace, $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( array_merge( $this->queryreplace, array( 'post_type=foo&name=' ) ), $wp_rewrite->queryreplace );
 
         remove_rewrite_tag( '%foo%' );
-        $this->assertSame( $this->rewritecode, $wp_rewrite->rewritecode );
-        $this->assertSame( $this->rewritereplace, $wp_rewrite->rewritereplace );
-        $this->assertSame( $this->queryreplace, $wp_rewrite->queryreplace );
+        $this->assertEqualSets( $this->rewritecode, $wp_rewrite->rewritecode );
+        $this->assertEqualSets( $this->rewritereplace, $wp_rewrite->rewritereplace );
+        $this->assertEqualSets( $this->queryreplace, $wp_rewrite->queryreplace );
 
         $this->assertNotContains( '%foo%', $wp_rewrite->rewritecode );