From a0d269954534e09c0b9c0f73c927b6eb764c21d9 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Mon, 20 Jun 2011 16:49:53 +0000
Subject: some fixes on tests

---
 tests/unit/Web/THttpCookieCollectionTest.php |  2 +-
 tests/unit/Web/THttpRequestTest.php          | 14 +++++++-------
 tests/unit/Web/THttpResponseTest.php         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/unit/Web')

diff --git a/tests/unit/Web/THttpCookieCollectionTest.php b/tests/unit/Web/THttpCookieCollectionTest.php
index ece8f275..5af12736 100644
--- a/tests/unit/Web/THttpCookieCollectionTest.php
+++ b/tests/unit/Web/THttpCookieCollectionTest.php
@@ -10,7 +10,7 @@ class THttpCookieCollectionTest extends PHPUnit_Framework_TestCase {
 
   public function testConstruct() {
     $coll=new THttpCookieCollection();
-    self::assertType('THttpCookieCollection', $coll);
+    self::assertInstanceOf('THttpCookieCollection', $coll);
   }
 
   public function testInsertAt() {
diff --git a/tests/unit/Web/THttpRequestTest.php b/tests/unit/Web/THttpRequestTest.php
index a5f8b226..f33bac60 100644
--- a/tests/unit/Web/THttpRequestTest.php
+++ b/tests/unit/Web/THttpRequestTest.php
@@ -63,13 +63,13 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
 	public function testGetUrl() {
 		$request = new THttpRequest();
 		$request->init(null);
-		self::assertType('TUri', $request->getUrl());
+		self::assertInstanceOf('TUri', $request->getUrl());
 		// Try with $_SERVER['HTTP_HOST'] empty
 		$request=null;
 		$request = new THttpRequest();
 		$request->init(null);
 		$_SERVER['HTTP_HOST']='';
-		self::assertType('TUri', $request->getUrl());
+		self::assertInstanceOf('TUri', $request->getUrl());
 	}
 
 	public function testGetUrlManager() {
@@ -111,7 +111,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
 		$request->setUrlManager('goodmanager');
 		$request->init(null);
 		self::assertEquals ('goodmanager', $request->getUrlManager());
-		self::assertType ('TUrlManager',$request->getUrlManagerModule());
+		self::assertInstanceOf ('TUrlManager',$request->getUrlManagerModule());
 
 	}
 
@@ -203,7 +203,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3';
 		try {
 			$browser=$request->getBrowser();
-			self::assertType ('array', $browser);
+			self::assertInstanceOf ('array', $browser);
 			self::assertEquals('Firefox', $browser['browser']);
 			self::assertEquals('2.0.0.3', $browser['version']);
 		} catch (TPhpErrorException $e) {
@@ -261,7 +261,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
   	$request->init (null);
   	$request->setEnableCookieValidation (false);
   	$cookies=$request->getCookies();
-  	self::assertType('THttpCookieCollection', $cookies);
+  	self::assertInstanceOf('THttpCookieCollection', $cookies);
   	self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue());
   	$request = null;
 
@@ -273,7 +273,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
   	$request->init (null);
   	$request->setEnableCookieValidation (true);
   	$cookies=$request->getCookies();
-  	self::assertType('THttpCookieCollection', $cookies);
+  	self::assertInstanceOf('THttpCookieCollection', $cookies);
   	self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue());
   }
 
@@ -318,7 +318,7 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
   public function testGetIterator() {
     $request = new THttpRequest ();
     $request->init(null);
-    self::assertType ('TMapIterator', $request->getIterator());
+    self::assertInstanceOf ('TMapIterator', $request->getIterator());
   }
 
   public function testGetCount() {
diff --git a/tests/unit/Web/THttpResponseTest.php b/tests/unit/Web/THttpResponseTest.php
index 6cc453e4..8e40a2a0 100644
--- a/tests/unit/Web/THttpResponseTest.php
+++ b/tests/unit/Web/THttpResponseTest.php
@@ -90,7 +90,7 @@ class THttpResponseTest extends PHPUnit_Framework_TestCase {
   public function testGetCookies() {
     $response=new THttpResponse ();
     $response->init (null);
-    self::assertType('THttpCookieCollection', $response->getCookies());
+    self::assertInstanceOf('THttpCookieCollection', $response->getCookies());
     self::assertEquals(0, $response->getCookies()->getCount());
   }
 
-- 
cgit v1.2.3