X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fut_HttpUtil.phpt;h=3c5f70ad36ef1a631655374772f07f189d0e6c2c;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hp=98a11e8e2d372fd6503b7984726982430c768dc9;hpb=bf87f6e654235acb023ca052a5e71faeb2635a3f;p=m6w6%2Fext-http diff --git a/tests/ut_HttpUtil.phpt b/tests/ut_HttpUtil.phpt index 98a11e8..3c5f70a 100644 --- a/tests/ut_HttpUtil.phpt +++ b/tests/ut_HttpUtil.phpt @@ -27,9 +27,9 @@ class HttpUtilTest extends PHPUnit2_Framework_TestCase 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', 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)); + $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()