diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-13 19:38:20 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-13 19:38:20 -0500 |
| commit | fb6b350c21f5f63991099ae2ef9f007c9786cb61 (patch) | |
| tree | aacf586d4912c29b2c8fcb5e4d5d1602065df685 | |
| parent | feed1441add9582d987c7480b92cc38946eedf15 (diff) | |
| download | forums-fb6b350c21f5f63991099ae2ef9f007c9786cb61.tar forums-fb6b350c21f5f63991099ae2ef9f007c9786cb61.tar.gz forums-fb6b350c21f5f63991099ae2ef9f007c9786cb61.tar.bz2 forums-fb6b350c21f5f63991099ae2ef9f007c9786cb61.tar.xz forums-fb6b350c21f5f63991099ae2ef9f007c9786cb61.zip | |
[ticket/9871] Split fast and slow version tests
PHPBB3-9871
| -rw-r--r-- | tests/version/version_fetch_test.php | 58 | ||||
| -rw-r--r-- | tests/version/version_test.php | 26 |
2 files changed, 58 insertions, 26 deletions
diff --git a/tests/version/version_fetch_test.php b/tests/version/version_fetch_test.php new file mode 100644 index 0000000000..b4912861f4 --- /dev/null +++ b/tests/version/version_fetch_test.php @@ -0,0 +1,58 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2014 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/* +* @group slow +*/ +class phpbb_version_helper_test extends phpbb_test_case +{ + public function setUp() + { + parent::setUp(); + + global $phpbb_root_path, $phpEx; + + include_once($phpbb_root_path . 'includes/functions.' . $phpEx); + + $this->cache = $this->getMockBuilder('\phpbb\cache\service') + ->disableOriginalConstructor() + ->getMock(); + + $this->version_helper = new \phpbb\version_helper( + $this->cache, + new \phpbb\config\config(array( + 'version' => '3.1.0', + )), + new \phpbb\user() + ); + } + + public function test_version_phpbb_com() + { + global $phpbb_root_path, $phpEx; + include_once($phpbb_root_path . 'includes/functions.' . $phpEx); + + if (!phpbb_checkdnsrr('version.phpbb.com', 'A')) + { + $this->markTestSkipped(sprintf( + 'Could not find a DNS record for hostname %s. ' . + 'Assuming network is down.', + 'version.phpbb.com' + )); + } + + $this->version_helper->get_versions(); + + // get_versions checks to make sure we got a valid versions file or + // throws an exception if we did not. We don't need to test anything + // here, but adding an assertion so we do not get a warning about no + // assertions in this test + $this->assertSame(true, true); + } +} diff --git a/tests/version/version_test.php b/tests/version/version_test.php index 87922d50b4..2e2398bd45 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -7,9 +7,6 @@ * */ -/* -* @group slow -*/ class phpbb_version_helper_test extends phpbb_test_case { public function setUp() @@ -318,27 +315,4 @@ class phpbb_version_helper_test extends phpbb_test_case $this->assertSame($expected, $version_helper->get_latest_on_current_branch()); } - - public function test_version_phpbb_com() - { - global $phpbb_root_path, $phpEx; - include_once($phpbb_root_path . 'includes/functions.' . $phpEx); - - if (!phpbb_checkdnsrr('version.phpbb.com', 'A')) - { - $this->markTestSkipped(sprintf( - 'Could not find a DNS record for hostname %s. ' . - 'Assuming network is down.', - 'version.phpbb.com' - )); - } - - $this->version_helper->get_versions(); - - // get_versions checks to make sure we got a valid versions file or - // throws an exception if we did not. We don't need to test anything - // here, but adding an assertion so we do not get a warning about no - // assertions in this test - $this->assertSame(true, true); - } } |