Index: trunk/tests/phpunit/tests/category/wpListCategories.php
===================================================================
--- trunk/tests/phpunit/tests/category/wpListCategories.php (revision 46586)
+++ trunk/tests/phpunit/tests/category/wpListCategories.php (revision 51462)
@@ -15,5 +15,5 @@
);
- $this->assertContains( 'class="cat-item cat-item-' . $c . '"', $found );
+ $this->assertStringContainsString( 'class="cat-item cat-item-' . $c . '"', $found );
}
@@ -97,9 +97,9 @@
remove_filter( 'list_cats', array( $this, 'list_cats_callback' ) );
- $this->assertContains( "cat-item-$c2", $found );
- $this->assertContains( 'Test Cat 2', $found );
-
- $this->assertNotContains( "cat-item-$c1", $found );
- $this->assertNotContains( 'Test Cat 1', $found );
+ $this->assertStringContainsString( "cat-item-$c2", $found );
+ $this->assertStringContainsString( 'Test Cat 2', $found );
+
+ $this->assertStringNotContainsString( "cat-item-$c1", $found );
+ $this->assertStringNotContainsString( 'Test Cat 1', $found );
}
@@ -129,6 +129,6 @@
);
- $this->assertContains( "cat-item-$c", $found );
- $this->assertContains( '0', $found );
+ $this->assertStringContainsString( "cat-item-$c", $found );
+ $this->assertStringContainsString( '0', $found );
}
@@ -145,5 +145,5 @@
);
- $this->assertContains( "
All", $found );
+ $this->assertStringContainsString( "All", $found );
}
@@ -164,5 +164,5 @@
);
- $this->assertContains( "All", $found );
+ $this->assertStringContainsString( "All", $found );
}
@@ -193,5 +193,5 @@
$pt_archive = get_post_type_archive_link( 'wptests_pt' );
- $this->assertContains( "All", $found );
+ $this->assertStringContainsString( "All", $found );
}
@@ -222,5 +222,5 @@
$pt_archive = get_post_type_archive_link( 'wptests_pt2' );
- $this->assertContains( "All", $found );
+ $this->assertStringContainsString( "All", $found );
}
@@ -248,5 +248,5 @@
$url = home_url( '/' );
- $this->assertContains( "All", $found );
+ $this->assertStringContainsString( "All", $found );
}
@@ -274,5 +274,5 @@
$url = home_url( '/' );
- $this->assertContains( "All", $found );
+ $this->assertStringContainsString( "All", $found );
}
@@ -287,5 +287,5 @@
);
- $this->assertContains( 'Categories', $found );
+ $this->assertStringContainsString( 'Categories', $found );
}
@@ -301,5 +301,5 @@
);
- $this->assertNotContains( 'Categories', $found );
+ $this->assertStringNotContainsString( 'Categories', $found );
}
@@ -315,5 +315,5 @@
);
- $this->assertContains( 'Categories', $found );
+ $this->assertStringContainsString( 'Categories', $found );
}
@@ -332,5 +332,5 @@
);
- $this->assertContains( 'Categories', $found );
+ $this->assertStringContainsString( 'Categories', $found );
}
@@ -350,5 +350,5 @@
);
- $this->assertNotContains( '', $found );
+ $this->assertStringNotContainsString( '', $found );
}
@@ -380,7 +380,7 @@
$actual = wp_list_categories( $args );
- $this->assertNotContains( '', $actual );
-
- $this->assertNotContains( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+
+ $this->assertStringNotContainsString( '', $actual );
}
@@ -432,9 +432,9 @@
);
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
-
- $this->assertNotContains( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+
+ $this->assertStringNotContainsString( '', $actual );
}
@@ -512,15 +512,15 @@
);
- $this->assertContains( '', $actual );
-
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
-
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
+ $this->assertStringContainsString( '', $actual );
+
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
}
@@ -598,15 +598,15 @@
);
- $this->assertContains( '', $actual );
-
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
-
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
- $this->assertNotContains( '', $actual );
+ $this->assertStringContainsString( '', $actual );
+
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
+ $this->assertStringNotContainsString( '', $actual );
}