From ead348053b6f73b85425eaa780c6f336c0514fb3 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Thu, 9 Jun 2016 05:40:45 +0000 Subject: [PATCH] Tests: Move `get_blog_details()` tests to their own file See #36566. git-svn-id: https://develop.svn.wordpress.org/trunk@37665 602fd350-edb4-49c9-b593-d223f7449a82 --- .../tests/multisite/getBlogDetails.php | 87 +++++++++++++++++++ tests/phpunit/tests/multisite/site.php | 76 ---------------- 2 files changed, 87 insertions(+), 76 deletions(-) create mode 100644 tests/phpunit/tests/multisite/getBlogDetails.php diff --git a/tests/phpunit/tests/multisite/getBlogDetails.php b/tests/phpunit/tests/multisite/getBlogDetails.php new file mode 100644 index 0000000000..6308f2d0b7 --- /dev/null +++ b/tests/phpunit/tests/multisite/getBlogDetails.php @@ -0,0 +1,87 @@ + array( 'domain' => 'wordpress.org', 'path' => '/' ), + 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/' ), + ); + + foreach ( $network_ids as &$id ) { + $id = self::factory()->network->create( $id ); + } + unset( $id ); + + $ids = array( + 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/', 'title' => 'Test 1', 'site_id' => $network_ids['wordpress.org/'] ), + 'wordpress.org/foo/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'title' => 'Test 2', 'site_id' => $network_ids['wordpress.org/'] ), + 'wordpress.org/foo/bar/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/bar/', 'title' => 'Test 3', 'site_id' => $network_ids['wordpress.org/'] ), + 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/', 'title' => 'Test 4', 'site_id' => $network_ids['make.wordpress.org/'] ), + 'make.wordpress.org/foo/' => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/', 'title' => 'Test 5', 'site_id' => $network_ids['make.wordpress.org/'] ), + ); + + foreach ( $ids as &$id ) { + $id = self::factory()->blog->create( $id ); + } + unset( $id ); + + // Retrieve site details by passing only a blog ID. + $site = get_blog_details( $ids['wordpress.org/'] ); + $this->assertEquals( $ids['wordpress.org/'], $site->blog_id ); + $this->assertEquals( 'Test 1', $site->blogname ); + + $site = get_blog_details( $ids['wordpress.org/foo/'] ); + $this->assertEquals( $ids['wordpress.org/foo/'], $site->blog_id ); + $this->assertEquals( 'Test 2', $site->blogname ); + + $site = get_blog_details( 999 ); + $this->assertFalse( $site ); + + // Retrieve site details by passing an array containing blog_id. + $site = get_blog_details( array( 'blog_id' => $ids['wordpress.org/foo/bar/'] ) ); + $this->assertEquals( $ids['wordpress.org/foo/bar/'], $site->blog_id ); + $this->assertEquals( 'Test 3', $site->blogname ); + + $site = get_blog_details( array( 'blog_id' => $ids['make.wordpress.org/'] ) ); + $this->assertEquals( $ids['make.wordpress.org/'], $site->blog_id ); + $this->assertEquals( 'Test 4', $site->blogname ); + + $site = get_blog_details( array( 'blog_id' => 999 ) ); + $this->assertFalse( $site ); + + // Retrieve site details by passing an array containing domain and path. + $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/' ) ); + $this->assertEquals( $ids['wordpress.org/'], $site->blog_id ); + $this->assertEquals( 'Test 1', $site->blogname ); + + $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/foo/' ) ); + $this->assertEquals( $ids['wordpress.org/foo/'], $site->blog_id ); + $this->assertEquals( 'Test 2', $site->blogname ); + + $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/foo/bar/' ) ); + $this->assertEquals( $ids['wordpress.org/foo/bar/'], $site->blog_id ); + $this->assertEquals( 'Test 3', $site->blogname ); + + $site = get_blog_details( array( 'domain' => 'make.wordpress.org', 'path' => '/' ) ); + $this->assertEquals( $ids['make.wordpress.org/'], $site->blog_id ); + $this->assertEquals( 'Test 4', $site->blogname ); + + $site = get_blog_details( array( 'domain' => 'make.wordpress.org', 'path' => '/foo/' ) ); + $this->assertEquals( $ids['make.wordpress.org/foo/'], $site->blog_id ); + $this->assertEquals( 'Test 5', $site->blogname ); + + $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/zxy/' ) ); + $this->assertFalse( $site ); + } +} + +endif; diff --git a/tests/phpunit/tests/multisite/site.php b/tests/phpunit/tests/multisite/site.php index b810045fa6..e944197f7b 100644 --- a/tests/phpunit/tests/multisite/site.php +++ b/tests/phpunit/tests/multisite/site.php @@ -601,82 +601,6 @@ class Tests_Multisite_Site extends WP_UnitTestCase { $this->assertEquals( 'bar', $details->blogname ); } - /** - * @ticket 29845 - */ - function test_get_blog_details() { - $network_ids = array( - 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/' ), - 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/' ), - ); - - foreach ( $network_ids as &$id ) { - $id = self::factory()->network->create( $id ); - } - unset( $id ); - - $ids = array( - 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/', 'title' => 'Test 1', 'site_id' => $network_ids['wordpress.org/'] ), - 'wordpress.org/foo/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'title' => 'Test 2', 'site_id' => $network_ids['wordpress.org/'] ), - 'wordpress.org/foo/bar/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/bar/', 'title' => 'Test 3', 'site_id' => $network_ids['wordpress.org/'] ), - 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/', 'title' => 'Test 4', 'site_id' => $network_ids['make.wordpress.org/'] ), - 'make.wordpress.org/foo/' => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/', 'title' => 'Test 5', 'site_id' => $network_ids['make.wordpress.org/'] ), - ); - - foreach ( $ids as &$id ) { - $id = self::factory()->blog->create( $id ); - } - unset( $id ); - - // Retrieve site details by passing only a blog ID. - $site = get_blog_details( $ids['wordpress.org/'] ); - $this->assertEquals( $ids['wordpress.org/'], $site->blog_id ); - $this->assertEquals( 'Test 1', $site->blogname ); - - $site = get_blog_details( $ids['wordpress.org/foo/'] ); - $this->assertEquals( $ids['wordpress.org/foo/'], $site->blog_id ); - $this->assertEquals( 'Test 2', $site->blogname ); - - $site = get_blog_details( 999 ); - $this->assertFalse( $site ); - - // Retrieve site details by passing an array containing blog_id. - $site = get_blog_details( array( 'blog_id' => $ids['wordpress.org/foo/bar/'] ) ); - $this->assertEquals( $ids['wordpress.org/foo/bar/'], $site->blog_id ); - $this->assertEquals( 'Test 3', $site->blogname ); - - $site = get_blog_details( array( 'blog_id' => $ids['make.wordpress.org/'] ) ); - $this->assertEquals( $ids['make.wordpress.org/'], $site->blog_id ); - $this->assertEquals( 'Test 4', $site->blogname ); - - $site = get_blog_details( array( 'blog_id' => 999 ) ); - $this->assertFalse( $site ); - - // Retrieve site details by passing an array containing domain and path. - $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/' ) ); - $this->assertEquals( $ids['wordpress.org/'], $site->blog_id ); - $this->assertEquals( 'Test 1', $site->blogname ); - - $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/foo/' ) ); - $this->assertEquals( $ids['wordpress.org/foo/'], $site->blog_id ); - $this->assertEquals( 'Test 2', $site->blogname ); - - $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/foo/bar/' ) ); - $this->assertEquals( $ids['wordpress.org/foo/bar/'], $site->blog_id ); - $this->assertEquals( 'Test 3', $site->blogname ); - - $site = get_blog_details( array( 'domain' => 'make.wordpress.org', 'path' => '/' ) ); - $this->assertEquals( $ids['make.wordpress.org/'], $site->blog_id ); - $this->assertEquals( 'Test 4', $site->blogname ); - - $site = get_blog_details( array( 'domain' => 'make.wordpress.org', 'path' => '/foo/' ) ); - $this->assertEquals( $ids['make.wordpress.org/foo/'], $site->blog_id ); - $this->assertEquals( 'Test 5', $site->blogname ); - - $site = get_blog_details( array( 'domain' => 'wordpress.org', 'path' => '/zxy/' ) ); - $this->assertFalse( $site ); - } - /** * Test the original and cached responses for a created and then deleted site when * the blog ID is requested through get_blog_id_from_url().