diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/it.t | 4 | ||||
| -rwxr-xr-x | test/it_url.t | 59 |
2 files changed, 13 insertions, 50 deletions
@@ -468,7 +468,6 @@ is(it::any2utf8([1, true, false, null]), [1, true, false, null], "any2utf8 shoul is(it::any2utf8([it::utf8_decode('Müller') => it::utf8_decode('Müller')]), ['Müller' => 'Müller'], "it::any2utf8 latin1 keys"); is(it::any2utf8("\xc2\xad"), "", "it::any2utf8 remove soft hyphens"); -is(it::any2utf8("\u{0338}\u{0338}a\u{0338}b"), "a\u{0338}b", "it::any2utf8 remove combining characters at beginning"); foreach ([ 'a' => 'ä', 'e' => 'ë', 'i' => 'ï', 'o' => 'ö', 'u' => 'ü' ] as $src => $dst) { @@ -479,8 +478,7 @@ foreach ([ 'a' => 'ä', 'e' => 'ë', 'i' => 'ï', 'o' => 'ö', 'u' => 'ü' ] as } is(it::any2utf8("\x65\xcc\x81"), "é", "it::any2utf8 convert to normal form C"); -is(it::any2utf8("\xcc\xb8x"), "x", "bad (un-nomalizable) combining char"); -is(it::any2utf8(" \xcc\xb8x"), " x", "bad (un-normalizable) combining char"); +is(it::any2utf8("\u{0338}\u{0338}a\u{0338}b \u{0338}\u{0338}c"), "a\u{0338}b c", "it::any2utf8 remove combining chars at start and after blank"); foreach ([$dummy, false, true, null, 1, "a", "Ä", "/", []] as $var) is(it::json_decode(it::json_encode($var)), $var); diff --git a/test/it_url.t b/test/it_url.t index b86f711..215cb63 100755 --- a/test/it_url.t +++ b/test/it_url.t @@ -77,60 +77,25 @@ is( $php_self = $_SERVER['PHP_SELF']; $_SERVER['PHP_SELF'] = '/foo/bar/self.php'; list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = ["gna.ch", null, null]; -is( - it_url::absolute("/"), - 'http://gna.ch/', - 'it_url::absolute basic' -); - -is( - it_url::absolute("qux"), - 'http://gna.ch/foo/bar/qux', - 'it_url::absolute relative path' -); - -is( - it_url::absolute("qux", 'https', '/prefix'), - 'https://gna.ch/prefix/foo/bar/qux', - 'it_url::absolute relative path' -); +is(it_url::absolute("/"), 'http://gna.ch/', 'it_url::absolute basic'); +is(it_url::absolute("qux"), 'http://gna.ch/foo/bar/qux', 'it_url::absolute relative path'); +is(it_url::absolute("qux", 'https', '/prefix'), 'https://gna.ch/prefix/foo/bar/qux', 'it_url::absolute relative path'); +is(it_url::absolute("/https", "https"), 'https://gna.ch/https', 'it_url::absolute force https in http context'); +is(it_url::absolute("http://gna.ch/foo", "https"),'https://gna.ch/foo', 'it_url::absolute force https overwriting existing url'); list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = ["gna.ch:42", 42, null]; -is( - it_url::absolute("/port"), - 'http://gna.ch:42/port', - 'it_url::absolute with non-standard port' -); - -list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = ["gna.ch", 443, true]; -is( - it_url::absolute("/https"), - 'https://gna.ch/https', - 'it_url::absolute for https' -); - -list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = ["gna.ch", null, null]; -is( - it_url::absolute("/https", "https"), - 'https://gna.ch/https', - 'it_url::absolute force https in http context' -); +is(it_url::absolute("/port"), 'http://gna.ch:42/port', 'it_url::absolute with non-standard port'); list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = ["gna.ch", 443, true]; -is( - it_url::absolute("/foo", "http"), - 'http://gna.ch/foo', - 'it_url::absolute force http in https context' -); +is(it_url::absolute("/https"), 'https://gna.ch/https', 'it_url::absolute for https'); +is(it_url::absolute("http://gna.ch/"), 'http://gna.ch/', 'it_url::absolute leaves http: in url alone'); +is(it_url::absolute("/foo", "http"), 'http://gna.ch/foo', 'it_url::absolute force http in https context'); +is(it_url::absolute("http://gna.ch/", 'https'), 'https://gna.ch/', 'it_url::absolute overrides http: in url'); -list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = ["gna.ch", null, null]; -is( - it_url::absolute("http://gna.ch/foo", "https"), - 'https://gna.ch/foo', - 'it_url::absolute force https overwriting existing url' -); +list ($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['HTTPS']) = [null, null, null]; $_SERVER['PHP_SELF'] = $php_self; + is(it_url::is_reachable('http://search.ch/'), true, "is_reachable('http://www.search.ch/')"); is(it_url::is_reachable('http://search.ch/not_found'), false, "is_reachable('http://www.search.ch/not_found')"); is(it_url::is_reachable('http://bogus.url'), false, "is_reachable('http://bogus.url')"); |