Skip to content

Commit f773a5a

Browse files
committed
Trying to simplify coverage cookie test
1 parent 181c452 commit f773a5a

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

PHPUnit/Extensions/SeleniumCommon/RemoteCoverage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function get()
2323
if (is_array($coverageData)) {
2424
return $this->matchLocalAndRemotePaths($coverageData);
2525
} else {
26-
throw new Exception('Empty or invalid code coverage data received from url "' . $url . '"');
26+
throw new Exception('Empty or invalid code coverage data received from url "' . $url . '" (' . var_export($buffer, true) . ')');
2727
}
2828
}
2929
}

Tests/Selenium2TestCase/Coverage/CookieTest.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
class Tests_Selenium2TestCase_Coverage_CookieTest extends Tests_Selenium2TestCase_BaseTestCase
33
{
44
// this is a dummy URL (no server at that port), but Firefox still sets domain cookie, which is what's needed
5-
protected $coverageScriptUrl = 'http://127.0.0.1:8081/';
6-
7-
public static function setUpBeforeClass()
8-
{
9-
self::shareSession(true);
10-
}
5+
protected $coverageScriptUrl = 'http://127.0.0.1:8082';
116

127
public function run(PHPUnit_Framework_TestResult $result = NULL)
138
{
@@ -24,12 +19,12 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
2419
$result->getCodeCoverage()->clear();
2520
}
2621

27-
protected function getTestIdCookie ()
22+
protected function getTestIdCookie()
2823
{
2924
return $this->prepareSession()->cookie()->get('PHPUNIT_SELENIUM_TEST_ID');
3025
}
3126

32-
public function testTestIdCookieIsSet ()
27+
public function testTestIdCookieIsSet()
3328
{
3429
$this->url('/');
3530
return $this->getTestIdCookie();
@@ -38,7 +33,7 @@ public function testTestIdCookieIsSet ()
3833
/**
3934
* @depends testTestIdCookieIsSet
4035
*/
41-
public function testTestsHaveUniqueTestIdCookies ($previousTestIdCookie)
36+
public function testTestsHaveUniqueTestIdCookies($previousTestIdCookie)
4237
{
4338
$this->url('/');
4439
$this->assertNotEquals($this->getTestIdCookie(), $previousTestIdCookie);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a:3:{s:85:"/home/giorgio/code/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/ExitHandler.php";a:2:{s:3:"md5";s:32:"9da156828a8b6591d6905664624e29fb";s:8:"coverage";a:9:{i:10;i:1;i:18;i:1;i:19;i:1;i:26;i:-1;i:27;i:-1;i:28;i:-1;i:29;i:-1;i:30;i:-1;i:32;i:1;}}s:83:"/home/giorgio/code/phpunit-selenium/Tests/Selenium2TestCase/Coverage/DummyClass.php";a:2:{s:3:"md5";s:32:"7c8088a34547c159e7bf27f792211bb6";s:8:"coverage";a:6:{i:3;i:1;i:6;i:1;i:7;i:-2;i:11;i:-1;i:12;i:-2;i:14;i:1;}}s:83:"/home/giorgio/code/phpunit-selenium/Tests/Selenium2TestCase/Coverage/singleFile.php";a:2:{s:3:"md5";s:32:"01983b91b1db9d6d59e48111c6b0fe5a";s:8:"coverage";a:4:{i:5;i:1;i:6;i:1;i:7;i:1;i:9;i:1;}}}
1+
a:3:{s:85:"/home/giorgio/code/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/ExitHandler.php";a:2:{s:3:"md5";s:32:"9da156828a8b6591d6905664624e29fb";s:8:"coverage";a:9:{i:10;i:1;i:18;i:1;i:19;i:1;i:26;i:-1;i:27;i:-1;i:28;i:-1;i:29;i:-1;i:30;i:-1;i:32;i:1;}}s:83:"/home/giorgio/code/phpunit-selenium/Tests/Selenium2TestCase/Coverage/DummyClass.php";a:2:{s:3:"md5";s:32:"7c8088a34547c159e7bf27f792211bb6";s:8:"coverage";a:6:{i:3;i:1;i:6;i:1;i:7;i:-2;i:11;i:-1;i:12;i:-2;i:14;i:1;}}s:83:"/home/giorgio/code/phpunit-selenium/Tests/Selenium2TestCase/Coverage/singleFile.php";a:2:{s:3:"md5";s:32:"01983b91b1db9d6d59e48111c6b0fe5a";s:8:"coverage";a:4:{i:5;i:1;i:6;i:1;i:7;i:1;i:9;i:1;}}}

0 commit comments

Comments
 (0)