X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fut_HttpUtil.phpt;h=98a11e8e2d372fd6503b7984726982430c768dc9;hp=bbd61e08831ea20a632c70d43e82d7c28c08739c;hb=bf87f6e654235acb023ca052a5e71faeb2635a3f;hpb=f559a71c841e00ef7ca30bace5419c1a6bebca3f diff --git a/tests/ut_HttpUtil.phpt b/tests/ut_HttpUtil.phpt index bbd61e0..98a11e8 100644 --- a/tests/ut_HttpUtil.phpt +++ b/tests/ut_HttpUtil.phpt @@ -24,12 +24,12 @@ class HttpUtilTest extends PHPUnit2_Framework_TestCase $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::buildUri('/test.php?foo=bar', null, null, 80)); - $this->assertEquals('https://www.example.com/', HttpUtil::buildUri('/', 'https')); - $this->assertEquals('ftp://ftp.example.com/pub', HttpUtil::buildUri('/pub', null, 'ftp.example.com', 21)); + $this->assertEquals('http://www.example.com/test.php?foo=bar', HttpUtil::buildUrl('/test.php?foo=bar', null, null, 80)); + $this->assertEquals('https://www.example.com/', HttpUtil::buildUrl('/', 'https')); + $this->assertEquals('ftp://ftp.example.com/pub', HttpUtil::buildUrl('/pub', null, 'ftp.example.com', 21)); } function test_negotiateLanguage()