From 606874e9a883ae547df198498fce6fca7b735466 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 10 Aug 2015 19:50:41 +0200 Subject: Fix TProperyValue::ensureEnum and some unit tests class names --- tests/unit/Web/THttpCookieCollectionTest.php | 2 +- tests/unit/Web/THttpRequestTest.php | 12 ++++++------ tests/unit/Web/THttpResponseTest.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/unit/Web') diff --git a/tests/unit/Web/THttpCookieCollectionTest.php b/tests/unit/Web/THttpCookieCollectionTest.php index 14b3f923..4ddc4da3 100644 --- a/tests/unit/Web/THttpCookieCollectionTest.php +++ b/tests/unit/Web/THttpCookieCollectionTest.php @@ -13,7 +13,7 @@ class THttpCookieCollectionTest extends PHPUnit_Framework_TestCase { public function testConstruct() { $coll=new THttpCookieCollection(); - self::assertInstanceOf('THttpCookieCollection', $coll); + self::assertInstanceOf('Prado\\Web\\THttpCookieCollection', $coll); } public function testInsertAt() { diff --git a/tests/unit/Web/THttpRequestTest.php b/tests/unit/Web/THttpRequestTest.php index 9b8168c3..f11e8c0f 100644 --- a/tests/unit/Web/THttpRequestTest.php +++ b/tests/unit/Web/THttpRequestTest.php @@ -72,13 +72,13 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { public function testGetUrl() { $request = new THttpRequest(); $request->init(null); - self::assertInstanceOf('TUri', $request->getUrl()); + self::assertInstanceOf('Prado\\Web\\TUri', $request->getUrl()); // Try with $_SERVER['HTTP_HOST'] empty $request=null; $request = new THttpRequest(); $request->init(null); $_SERVER['HTTP_HOST']=''; - self::assertInstanceOf('TUri', $request->getUrl()); + self::assertInstanceOf('Prado\\Web\\TUri', $request->getUrl()); } public function testGetUrlManager() { @@ -122,7 +122,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->setUrlManager('goodmanager'); $request->init(null); self::assertEquals ('goodmanager', $request->getUrlManager()); - self::assertInstanceOf ('TUrlManager',$request->getUrlManagerModule()); + self::assertInstanceOf ('Prado\\Web\\TUrlManager',$request->getUrlManagerModule()); } @@ -281,7 +281,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init (null); $request->setEnableCookieValidation (false); $cookies=$request->getCookies(); - self::assertInstanceOf('THttpCookieCollection', $cookies); + self::assertInstanceOf('Prado\\Web\\THttpCookieCollection', $cookies); self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue()); $request = null; @@ -293,7 +293,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { $request->init (null); $request->setEnableCookieValidation (true); $cookies=$request->getCookies(); - self::assertInstanceOf('THttpCookieCollection', $cookies); + self::assertInstanceOf('Prado\\Web\\THttpCookieCollection', $cookies); self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue()); } @@ -338,7 +338,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase { public function testGetIterator() { $request = new THttpRequest (); $request->init(null); - self::assertInstanceOf ('TMapIterator', $request->getIterator()); + self::assertInstanceOf ('Prado\\Collections\\TMapIterator', $request->getIterator()); } public function testGetCount() { diff --git a/tests/unit/Web/THttpResponseTest.php b/tests/unit/Web/THttpResponseTest.php index 9af89900..d9d4b30f 100644 --- a/tests/unit/Web/THttpResponseTest.php +++ b/tests/unit/Web/THttpResponseTest.php @@ -92,7 +92,7 @@ class THttpResponseTest extends PHPUnit_Framework_TestCase { public function testGetCookies() { $response=new THttpResponse (); $response->init (null); - self::assertInstanceOf('THttpCookieCollection', $response->getCookies()); + self::assertInstanceOf('Prado\\Web\\THttpCookieCollection', $response->getCookies()); self::assertEquals(0, $response->getCookies()->getCount()); } -- cgit v1.2.3