From 17fed094dda896d83c2ab45eea5f03ca5c5491aa Mon Sep 17 00:00:00 2001 From: gggeek Date: Tue, 7 Apr 2015 12:03:03 +0100 Subject: [PATCH] Add a new test for verify_compat.php, refactor some test classes --- tests/5DemofilesTest.php | 74 +---------------------------------- tests/6DebuggerTest.php | 74 +---------------------------------- tests/7ExtraTest.php | 21 ++++++++++ tests/LocalFileTestCase.php | 77 +++++++++++++++++++++++++++++++++++++ tests/parse_args.php | 2 +- 5 files changed, 103 insertions(+), 145 deletions(-) create mode 100644 tests/7ExtraTest.php create mode 100644 tests/LocalFileTestCase.php diff --git a/tests/5DemofilesTest.php b/tests/5DemofilesTest.php index 4e79053..63708fe 100644 --- a/tests/5DemofilesTest.php +++ b/tests/5DemofilesTest.php @@ -1,46 +1,9 @@ testId = get_class($this) . '__' . $this->getName(); - - if ($result === NULL) { - $result = $this->createResult(); - } - - $this->collectCodeCoverageInformation = $result->getCollectCodeCoverageInformation(); - - parent::run($result); - - if ($this->collectCodeCoverageInformation) { - $coverage = new PHPUnit_Extensions_SeleniumCommon_RemoteCoverage( - $this->coverageScriptUrl, - $this->testId - ); - $result->getCodeCoverage()->append( - $coverage->get(), $this - ); - } - - // do not call this before to give the time to the Listeners to run - //$this->getStrategy()->endOfTest($this->session); - - return $result; - } - public function setUp() { $this->args = argParser::getArgs(); @@ -50,39 +13,6 @@ class DemoFilesTest extends PHPUnit_Framework_TestCase $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); } - protected function request($file, $method = 'GET', $payload = '') - { - $url = $this->baseUrl . $file; - - $ch = curl_init($url); - curl_setopt_array($ch, array( - CURLOPT_RETURNTRANSFER => true, - CURLOPT_FAILONERROR => true - )); - if ($method == 'POST') - { - curl_setopt_array($ch, array( - CURLOPT_POST => true, - CURLOPT_POSTFIELDS => $payload - )); - } - if ($this->collectCodeCoverageInformation) - { - curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID=true'); - } - if ($this->args['DEBUG'] > 0) { - curl_setopt($ch, CURLOPT_VERBOSE, 1); - } - $page = curl_exec($ch); - curl_close($ch); - - $this->assertNotFalse($page); - $this->assertNotContains('Fatal error', $page); - $this->assertNotContains('Notice:', $page); - - return $page; - } - public function testAgeSort() { $page = $this->request('client/agesort.php'); diff --git a/tests/6DebuggerTest.php b/tests/6DebuggerTest.php index f002180..db0e850 100644 --- a/tests/6DebuggerTest.php +++ b/tests/6DebuggerTest.php @@ -1,46 +1,9 @@ testId = get_class($this) . '__' . $this->getName(); - - if ($result === NULL) { - $result = $this->createResult(); - } - - $this->collectCodeCoverageInformation = $result->getCollectCodeCoverageInformation(); - - parent::run($result); - - if ($this->collectCodeCoverageInformation) { - $coverage = new PHPUnit_Extensions_SeleniumCommon_RemoteCoverage( - $this->coverageScriptUrl, - $this->testId - ); - $result->getCodeCoverage()->append( - $coverage->get(), $this - ); - } - - // do not call this before to give the time to the Listeners to run - //$this->getStrategy()->endOfTest($this->session); - - return $result; - } - public function setUp() { $this->args = argParser::getArgs(); @@ -50,39 +13,6 @@ class DebuggerTest extends PHPUnit_Framework_TestCase $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); } - protected function request($file, $method = 'GET', $payload = '') - { - $url = $this->baseUrl . $file; - - $ch = curl_init($url); - curl_setopt_array($ch, array( - CURLOPT_RETURNTRANSFER => true, - CURLOPT_FAILONERROR => true - )); - if ($method == 'POST') - { - curl_setopt_array($ch, array( - CURLOPT_POST => true, - CURLOPT_POSTFIELDS => $payload - )); - } - if ($this->collectCodeCoverageInformation) - { - curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID=true'); - } - if ($this->args['DEBUG'] > 0) { - curl_setopt($ch, CURLOPT_VERBOSE, 1); - } - $page = curl_exec($ch); - curl_close($ch); - - $this->assertNotFalse($page); - $this->assertNotContains('Fatal error', $page); - $this->assertNotContains('Notice:', $page); - - return $page; - } - public function testIndex() { $page = $this->request('index.php'); diff --git a/tests/7ExtraTest.php b/tests/7ExtraTest.php new file mode 100644 index 0000000..ff2d056 --- /dev/null +++ b/tests/7ExtraTest.php @@ -0,0 +1,21 @@ +args = argParser::getArgs(); + + $this->baseUrl = $this->args['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/tests/', $this->args['URI'] ); + + $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); + } + + public function testVerifyCompat() + { + $page = $this->request('verify_compat.php'); + } +} \ No newline at end of file diff --git a/tests/LocalFileTestCase.php b/tests/LocalFileTestCase.php new file mode 100644 index 0000000..688e0df --- /dev/null +++ b/tests/LocalFileTestCase.php @@ -0,0 +1,77 @@ +testId = get_class($this) . '__' . $this->getName(); + + if ($result === NULL) { + $result = $this->createResult(); + } + + $this->collectCodeCoverageInformation = $result->getCollectCodeCoverageInformation(); + + parent::run($result); + + if ($this->collectCodeCoverageInformation) { + $coverage = new PHPUnit_Extensions_SeleniumCommon_RemoteCoverage( + $this->coverageScriptUrl, + $this->testId + ); + $result->getCodeCoverage()->append( + $coverage->get(), $this + ); + } + + // do not call this before to give the time to the Listeners to run + //$this->getStrategy()->endOfTest($this->session); + + return $result; + } + + protected function request($file, $method = 'GET', $payload = '') + { + $url = $this->baseUrl . $file; + + $ch = curl_init($url); + curl_setopt_array($ch, array( + CURLOPT_RETURNTRANSFER => true, + CURLOPT_FAILONERROR => true + )); + if ($method == 'POST') + { + curl_setopt_array($ch, array( + CURLOPT_POST => true, + CURLOPT_POSTFIELDS => $payload + )); + } + if ($this->collectCodeCoverageInformation) + { + curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID=true'); + } + if ($this->args['DEBUG'] > 0) { + curl_setopt($ch, CURLOPT_VERBOSE, 1); + } + $page = curl_exec($ch); + curl_close($ch); + + $this->assertNotFalse($page); + $this->assertNotContains('Fatal error', $page); + $this->assertNotContains('Notice:', $page); + + return $page; + } + +} diff --git a/tests/parse_args.php b/tests/parse_args.php index b2e438e..6660b9e 100644 --- a/tests/parse_args.php +++ b/tests/parse_args.php @@ -1,7 +1,7 @@