X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2F6DebuggerTest.php;h=db0e850c690657d8fae433cdfe783d7114445928;hb=17fed094dda896d83c2ab45eea5f03ca5c5491aa;hp=f0021808772c8534cbcb3c0dcb13cbb39c99fe80;hpb=8ef5517baf3fd7da0dd84bb3f0f7525d93567103;p=plcapi.git 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');