X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fut_HttpUtil.phpt;h=6bf6e2e9177004916bc2890ba45b118f1a3b199b;hp=4fd2515f45912b29d97fabef58b88464c2eeb6dd;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=ba74942b44bb39de8a028a56524db5a3c37363d5

diff --git a/tests/ut_HttpUtil.phpt b/tests/ut_HttpUtil.phpt
index 4fd2515..6bf6e2e 100644
--- a/tests/ut_HttpUtil.phpt
+++ b/tests/ut_HttpUtil.phpt
@@ -10,6 +10,9 @@ skipif(!@include 'PHPUnit2/Framework/TestCase.php', 'need PHPUnit2');
 <?php
 echo "-TEST\n";
 
+error_reporting(E_ALL);
+ini_set('html_errors', 0);
+
 require_once 'PHPUnit2/Framework/TestSuite.php';
 require_once 'PHPUnit2/Framework/TestCase.php';
 require_once 'PHPUnit2/TextUI/ResultPrinter.php';
@@ -18,77 +21,91 @@ class HttpUtilTest extends PHPUnit2_Framework_TestCase
 {
     function test_date()
     {
+    	$this->assertEquals('Thu, 01 Jan 1970 00:00:01 GMT', HttpUtil::date(1));
     }
 
-    function test_buildUri()
+    function test_buildUrl()
     {
+    	$_SERVER['SERVER_NAME'] = 'www.example.com';
+    	$this->assertEquals('http://www.example.com/test.php?foo=bar', HttpUtil::buildUrl('/test.php?foo=bar', array('port' => 80)));
+    	$this->assertEquals('https://www.example.com/', HttpUtil::buildUrl('/', array('scheme' => 'https')));
+    	$this->assertEquals('ftp://ftp.example.com/pub', HttpUtil::buildUrl('/pub', array('host' => 'ftp.example.com', 'port' => 21)));
     }
 
     function test_negotiateLanguage()
     {
+    	$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en, de;q=0.5, it-IT; q = 0.5   ';
+    	$this->assertEquals('de', HttpUtil::negotiateLanguage(array('de','it'), $r));
+    	$this->assertEquals(array('de'=>0.5,'it'=>0.45), $r);
     }
 
     function test_negotiateCharset()
     {
+    	$_SERVER['HTTP_ACCEPT_CHARSET'] = '  iso-8859-1, Unicode ;q=0 , utf-8  ';
+    	$this->assertEquals('iso-8859-1', HttpUtil::negotiateCharset(array('utf-8','iso-8859-1'), $r));
+    	$this->assertEquals(array('iso-8859-1'=>1000.0,'utf-8'=>999.0), $r);
     }
 
     function test_negotiateContentType()
     {
+    	$_SERVER['HTTP_ACCEPT'] = ' text/xml+xhtml, text/html;q = .9,  *';
+    	$this->assertEquals('text/xml+xhtml', HttpUtil::negotiateContentType(array('text/xml+xhtml', 'text/html'), $r));
+    	$this->assertEquals(array('text/xml+xhtml'=>1000.0,'text/html'=>0.9), $r);
     }
 
     function test_matchModified()
     {
+    	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = 'Fri, 02 Jan 1970 00:00:01 GMT';
+    	$this->assertTrue(HttpUtil::matchModified(1));
+    	$this->assertFalse(HttpUtil::matchModified(2*24*60*60+1));
+    	unset($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+    	
+    	$_SERVER['HTTP_IF_UNMODIFIED_SINCE'] = 'Fri, 02 Jan 1970 00:00:01 GMT';
+    	$this->assertTrue(HttpUtil::matchModified(1, true));
+    	$this->assertFalse(HttpUtil::matchModified(2*24*60*60+1, true));
+    	unset($_SERVER['HTTP_IF_UNMODIFIED_SINCE']);
     }
 
     function test_matchEtag()
     {
+    	$_SERVER['HTTP_IF_NONE_MATCH'] = '"abc"';
+    	$this->assertTrue(HttpUtil::matchEtag('abc'));
+    	$this->assertFalse(HttpUtil::matchEtag('ABC'));
+    	unset($_SERVER['HTTP_IF_NONE_MATCH']);
+    	
+    	$_SERVER['HTTP_IF_MATCH'] = '"abc"';
+    	$this->assertTrue(HttpUtil::matchEtag('abc', true));
+    	$this->assertFalse(HttpUtil::matchEtag('ABC', true));
+    	unset($_SERVER['HTTP_IF_MATCH']);
+    	
+    	$_SERVER['HTTP_IF_NONE_MATCH'] = '*';
+    	$this->assertTrue(HttpUtil::matchEtag('abc'));
+    	$this->assertTrue(HttpUtil::matchEtag('ABC'));
+    	unset($_SERVER['HTTP_IF_NONE_MATCH']);
+    	
+    	$_SERVER['HTTP_IF_MATCH'] = '*';
+    	$this->assertTrue(HttpUtil::matchEtag('abc', true));
+    	$this->assertTrue(HttpUtil::matchEtag('ABC', true));
+    	unset($_SERVER['HTTP_IF_MATCH']);
     }
 
     function test_matchRequestHeader()
     {
-    }
-
-    function test_parseMessage()
-    {
-    }
-
-    function test_parseHeaders()
-    {
-    }
-
-    function test_chunkedDecode()
-    {
-    }
-
-    function test_gzEncode()
-    {
-    }
-
-    function test_gzDecode()
-    {
-    }
-
-    function test_deflate()
-    {
-    }
-
-    function test_inflate()
-    {
-    }
-
-    function test_compress()
-    {
-    }
-
-    function test_uncompress()
-    {
-    }
-
-    function test_support()
-    {
-    }
-
-
+    	$_SERVER['HTTP_FOO'] = 'FoObAr';
+    	$this->assertTrue(HttpUtil::matchRequestHeader('foo', 'foobar', false));
+    	$this->assertTrue(HttpUtil::matchRequestHeader('foo', 'FoObAr', true));
+    	$this->assertFalse(HttpUtil::matchRequestHeader('foo', 'foobar', true));
+    }
+    
+    function test_zlib()
+    {
+    	if ($support = http_support(HTTP_SUPPORT_ENCODINGS)) {
+    		$this->assertEquals(file_get_contents(__FILE__), http_inflate(http_deflate(file_get_contents(__FILE__), HTTP_DEFLATE_TYPE_GZIP)));
+    		$this->assertEquals(file_get_contents(__FILE__), http_inflate(http_deflate(file_get_contents(__FILE__))));
+		} else {
+			$this->assertFalse($support);
+		}
+	}
 }
 
 $s = new PHPUnit2_Framework_TestSuite('HttpUtilTest');
@@ -100,7 +117,8 @@ echo "Done\n";
 --EXPECTF--
 %sTEST
 
+
 Time: 0
 
-OK (18 tests)
+OK (9 tests)
 Done