Change config constant name to be package specific

pear · May 5, 2012 · 2a27d97 · 2a27d97
1 parent d5930e2
commit 2a27d97
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -19,7 +19,7 @@
 	</testsuites>
 	<php>
 		<includePath>lib/HTTP2</includePath>
-		<const name="TEST_URL" value="http://local/www/mike/pear/HTTP_Header2/tests/response.php'"/>
+		<const name="HTTP_HEADER2_TEST_URL" value="http://local/www/mike/pear/HTTP_Header2/tests/response.php'"/>
-		<const name="CACHE_TEST_URL" value="http://local/www/mike/pear/HTTP_Header2/tests/cacheresponse.php"/>
+		<const name="HTTP_HEADER2_CACHE_TEST_URL" value="http://local/www/mike/pear/HTTP_Header2/tests/cacheresponse.php"/>
 	</php>
 </phpunit>
diff --git a/tests/HTTP_Header2Test.php b/tests/HTTP_Header2Test.php
@@ -73,7 +73,7 @@ function testgetHeader()
 
     function testsendHeaders()
     {
-        $url = new Net_URL2(TEST_URL);
+        $url = new Net_URL2(HTTP_HEADER2_TEST_URL);
         $url->setQueryVariable('X-Foo', 'blablubb');
 
         $r = new HTTP_Request2($url);
@@ -85,7 +85,7 @@ function testsendHeaders()
 
     function testsendStatusCode()
     {
-        $url = new Net_URL2(TEST_URL);
+        $url = new Net_URL2(HTTP_HEADER2_TEST_URL);
         $r = new HTTP_Request2($url);
 
         $r->setMethod(HTTP_Request2::METHOD_GET);
@@ -108,7 +108,7 @@ function testdateToTimestamp()
 
     function testredirect()
     {
-        $url = new Net_URL2(TEST_URL);
+        $url = new Net_URL2(HTTP_HEADER2_TEST_URL);
         $url->setQueryVariable('redirect', 'response.php?abc=123');
 
         $r = new HTTP_Request2($url);

diff --git a/tests/HTTP_Header2_CacheTest.php b/tests/HTTP_Header2_CacheTest.php
@@ -46,7 +46,7 @@ function testexitIfCached()
     {
         $http = new HTTP2();
 
-        $r = new HTTP_Request2(CACHE_TEST_URL);
+        $r = new HTTP_Request2(HTTP_HEADER2_CACHE_TEST_URL);
         $r->setMethod(HTTP_Request2::METHOD_GET);
         $r->setHeader('If-Modified-Since', $http->date());
         $response = $r->send();
@@ -59,7 +59,7 @@ function testexitIfCached()
 
     function testget()
     {
-        $r = new HTTP_Request2(CACHE_TEST_URL);
+        $r = new HTTP_Request2(HTTP_HEADER2_CACHE_TEST_URL);
         $r->setMethod(HTTP_Request2::METHOD_GET);
         $response = $r->send();
         $this->assertEquals(200, $response->getStatus(), 'HTTP 200 Ok (simple plain GET)');
@@ -72,7 +72,7 @@ function testget()
 
     function testhead()
     {
-        $r = new HTTP_Request2(CACHE_TEST_URL);
+        $r = new HTTP_Request2(HTTP_HEADER2_CACHE_TEST_URL);
         $r->setMethod(HTTP_Request2::METHOD_HEAD);
         $response = $r->send();
         $this->assertEquals(200, $response->getStatus(), 'HTTP 200 Ok (simple plain GET)');
@@ -87,7 +87,7 @@ function testpost()
     {
         $http = new HTTP2();
 
-        $r = new HTTP_Request2(CACHE_TEST_URL);
+        $r = new HTTP_Request2(HTTP_HEADER2_CACHE_TEST_URL);
         $r->setMethod(HTTP_Request2::METHOD_GET);
         $response = $r->send();
         $lm = $response->getHeader('last-modified');