From 1031b56f982f973f85cb3e1528f7bcbba662778f Mon Sep 17 00:00:00 2001 From: xue <> Date: Sun, 5 Aug 2007 23:39:29 +0000 Subject: fixed doc error. --- framework/Web/THttpRequest.php | 1 - tests/unit/Web/THttpRequestTest.php | 62 ++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php index 8fcb926e..a6941d5e 100644 --- a/framework/Web/THttpRequest.php +++ b/framework/Web/THttpRequest.php @@ -551,7 +551,6 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar * @param array GET parameters, null if not needed * @param boolean whether to encode the ampersand in URL, defaults to true. * @param boolean whether to encode the GET parameters (their names and values), defaults to false. - * @param boolean whether to use HTTPS even if the current request is sent via HTTP * @return string URL * @see TUrlManager::constructUrl */ diff --git a/tests/unit/Web/THttpRequestTest.php b/tests/unit/Web/THttpRequestTest.php index a73711e4..a5f8b226 100644 --- a/tests/unit/Web/THttpRequestTest.php +++ b/tests/unit/Web/THttpRequestTest.php @@ -12,7 +12,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { public static $app = null; public function setUp() { - + // Fake environment variables $_SERVER['HTTP_HOST'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost'; @@ -32,15 +32,15 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr,en-us;q=0.8,fr-fr;q=0.5,en;q=0.3'; $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip,deflate'; $_SERVER['HTTP_ACCEPT_CHARSET'] = 'ISO-8859-1,utf-8;q=0.7,*;q=0.7'; - + $_COOKIE['phpsessid']='0123456789abcdef'; - + $_FILES['userfile']=array ('name' => 'test.jpg','type' => 'image/jpg', 'size' => 10240, 'tmp_name' => 'tmpXXAZECZ', 'error'=>0); if(self::$app === null) { self::$app = new TApplication(dirname(__FILE__).'/app'); } } - + public function testInit() { $request = new THttpRequest(); $request->init(null); @@ -51,7 +51,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request = new THttpRequest(); $request->init(null); self::assertEquals('', $request->getUrlManager()); - + } public function testStripSlashes() { @@ -59,7 +59,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $data = 'some\\text\\with\\slashes'; self::assertEquals('sometextwithslashes', $request->stripSlashes($data)); } - + public function testGetUrl() { $request = new THttpRequest(); $request->init(null); @@ -77,7 +77,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); self::assertEquals(null, $request->getUrlManager()); } - + public function testSetUrlManager() { $request = new THttpRequest(); // Try invalid manager id @@ -86,11 +86,11 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); self::fail ('httprequest_urlmanager_inexist exception not thrown'); } catch (TConfigurationException $e) { - + } $request=null; - - + + // Try with valid module id, but not instance of TUrlManager $module=new TAssetManager(); self::$app->setModule('badmanager',$module); @@ -100,10 +100,10 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); self::fail ('httprequest_urlmanager_invalid exception not thrown'); } catch (TConfigurationException $e) { - + } $request=null; - + // Finally, try with a valid manager $module=new TUrlManager (); self::$app->setModule('goodmanager',$module); @@ -112,7 +112,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); self::assertEquals ('goodmanager', $request->getUrlManager()); self::assertType ('TUrlManager',$request->getUrlManagerModule()); - + } public function testSetUrlFormat() { @@ -123,7 +123,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { try { $request->setUrlFormat('Bad'); self::fail ('Bad Value exception not thrown'); - } catch (TInvalidDataValueException $e) {} + } catch (TInvalidDataValueException $e) {} } public function testGetRequestType() { @@ -153,7 +153,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); self::assertEquals('/demos/personal/index.php?page=Links', $request->getRequestUri()); } - + public function testGetBaseUrl() { $request = new THttpRequest(); $request->init(null); @@ -165,7 +165,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); self::assertEquals('/demos/personal/index.php', $request->getApplicationUrl()); } - + public function testGetAbsoluteApplicationUrl() { $request = new THttpRequest(); $request->init(null); @@ -208,7 +208,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { self::assertEquals('2.0.0.3', $browser['version']); } catch (TPhpErrorException $e) { // If not supported, skip test - if (strstr($e->getMessage(),'browscap ini directive not set')) + if (strstr($e->getMessage(),'browscap ini directive not set')) self::markTestSkipped('browscap ini directive not set in php.ini'); else self::fail ('Exception raised : '.$e->getMessage()); @@ -244,7 +244,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init(null); // Browser sent fr,en-us;q=0.8,fr-fr;q=0.5,en;q=0.3 // that means that browser want fr (1) first, next en-us (0.8), then fr-fr(0.5)n and last en (0.3) - // So, we expect method to return an array with these languages, and this order + // So, we expect method to return an array with these languages, and this order $acceptLanguages=array ('fr', 'en-us','fr-fr','en'); self::assertEquals($acceptLanguages, $request->getUserLanguages()); } @@ -264,7 +264,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { self::assertType('THttpCookieCollection', $cookies); self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue()); $request = null; - + // Test with cookie validation $security=new TSecurityManager(); self::$app->setModule ('security', $security); @@ -302,11 +302,11 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), true); self::assertEquals('/demos/personal/index.php?page=Home&param1=value1&param2=value2', $url); // Try without encode & - $url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false); + $url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false); self::assertEquals('/demos/personal/index.php?page=Home¶m1=value1¶m2=value2', $url); // Try to use HTTPS even if the current request is sent via HTTP - $url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false, false, true); - self::assertEquals('https', substr($url,0,5)); + //$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false, false, true); + //self::assertEquals('https', substr($url,0,5)); } public function testSetServiceID() { @@ -382,13 +382,13 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { self::assertTrue($request->contains('page')); self::assertFalse($request->contains('param')); } - + public function testClear() { $request = new THttpRequest (); $request->init(null); // Simulate a request with just a service $_GET['page']='Home'; - $request->resolveRequest(array('page')); + $request->resolveRequest(array('page')); $request->clear(); self::assertEquals(0,$request->getCount()); } @@ -434,14 +434,14 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { // Now, count should be zero self::assertEquals (0, $request->count()); } - + public function testGetSetID() { $request=new THttpRequest(); $request->init(null); $request->setID('testId'); self::assertEquals('testId', $request->getID()); } - + public function testGetSetUrlParamSeparator() { $request=new THttpRequest(); $request->init(null); @@ -455,7 +455,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->setUrlParamSeparator('&'); self::assertEquals('&', $request->getUrlParamSeparator()); } - + public function testGetServiceParameter() { $request=new THttpRequest(); $request->init(null); @@ -463,22 +463,22 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->resolveRequest(array('page')); self::assertEquals('Home', $request->getServiceParameter()); } - + public function testGetRequestResolved() { $request=new THttpRequest(); $request->init(null); self::assertFalse($request->getRequestResolved()); $_GET['page']='Home'; $request->resolveRequest(array('page')); - self::assertTrue($request->getRequestResolved()); + self::assertTrue($request->getRequestResolved()); } - + public function testRequestWithUrlMapping () { Prado::Using ('System.Web.TUrlMapping'); $confstr=''; $config=new TXmlDocument('1.0','utf8'); $config->loadFromString($confstr); - $module=new TUrlMapping (); + $module=new TUrlMapping (); self::$app->setModule('friendly-url',$module); if (isset ($_GET['page'])) unset ($_GET['page']); // Remove service from a previous test ! $_SERVER['REQUEST_URI'] = '/index.php/test/value2'; -- cgit v1.2.3