summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Gass2012-03-26 15:41:08 +0000
committerNathan Gass2012-03-26 15:41:08 +0000
commit52239c6482d10cbea631befd8f96b74425731b72 (patch)
tree1b70426f9196f3c5e068deffdbebf10eebab0236
parent0147e6e3aea620a54b0c3f6c932c658ee72a45a0 (diff)
downloaditools-52239c6482d10cbea631befd8f96b74425731b72.tar.gz
itools-52239c6482d10cbea631befd8f96b74425731b72.tar.bz2
itools-52239c6482d10cbea631befd8f96b74425731b72.zip
make get and get_multi tests encoding agnostic
-rwxr-xr-xtests/it_url.t24
1 files changed, 10 insertions, 14 deletions
diff --git a/tests/it_url.t b/tests/it_url.t
index e8507aa..ee683ce 100755
--- a/tests/it_url.t
+++ b/tests/it_url.t
@@ -87,25 +87,22 @@ is(
$url = new it_url('http://www.gna.ch/');
$page = $url->get();
-is(
- it::match('(</html>)', $page),
- '</html>',
+ok(
+ strpos($page, '</html>'), #UTF8SAFE
'$url->get with url in constructor'
);
$url = new it_url('http://bogus.url');
$page = $url->get('http://www.gna.ch/');
-is(
- it::match('(</html>)', $page),
- '</html>',
+ok(
+ strpos($page, '</html>'), #UTF8SAFE
'$url->get(url) with url as string arg'
);
$url = new it_url('http://bogus.url');
$page = $url->get(array('url' => 'http://www.gna.ch/'));
-is(
- it::match('(</html>)', $page),
- '</html>',
+ok(
+ strpos($page, '</html>'), #UTF8SAFE
'$url->get(\'url\' => url) with url as named arg'
);
is(
@@ -121,15 +118,14 @@ is(
unset($url, $page);
$page = it_url::get('http://www.gna.ch/');
-is(
- it::match('(</html>)', $page),
- '</html>',
+ok(
+ strpos($page, '</html>'), #UTF8SAFE
'it_url::get() static call'
);
$pages = it_url::get_multi('urls' => array('a' => 'http://www.gna.ch/', 'b' => 'http://search.ch/'));
-ok(it::match('</html>', $pages['a']), 'it_url::get_multi got first url');
-ok(it::match('</html>', $pages['b']), 'it_url::get_multi got second url');
+ok(strpos($pages['a'], '</html>'), 'it_url::get_multi got first url'); #UTF8SAFE
+ok(strpos($pages['b'], '</html>'), 'it_url::get_multi got second url'); #UTF8SAFE
is(count($pages), 2, 'it_url::get_multi no additional array elements');
?>