From f0329a04eb73824aac93df66bba179bf44008501 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 6 Jun 2016 18:21:12 +0200
Subject: [PATCH] fix tests

---
 tests/bug61444.phpt     |  2 +-
 tests/negotiate001.phpt | 35 ++++++++++++++++++++---------------
 tests/url002.phpt       |  4 ++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/tests/bug61444.phpt b/tests/bug61444.phpt
index 28d267c..5362c71 100644
--- a/tests/bug61444.phpt
+++ b/tests/bug61444.phpt
@@ -29,7 +29,7 @@ DONE
 --EXPECT--
 http://www.example.com/foobar?bar.baz=blah&utm_source=google&utm_campaign=somethingelse&blat
 
-http://www.example.com/foobar?bar.baz=blah&utm_source=changed&utm_campaign=somethingelse
+http://www.example.com/foobar?bar.baz=blah&utm_source=changed&utm_campaign=somethingelse&blat
 
 http://www.google.com/foobar?bar.baz=blah&utm_source=google&utm_campaign=somethingelse&blat
 
diff --git a/tests/negotiate001.phpt b/tests/negotiate001.phpt
index f628cdf..b4757c0 100644
--- a/tests/negotiate001.phpt
+++ b/tests/negotiate001.phpt
@@ -11,43 +11,48 @@ HTTP_ACCEPT_LANGUAGE=de-DE,de-AT;q=0.9,en;q=0.8,fr;q=0
 CONTENT TYPE
 
 <?php
+
+function dump($ctr) {
+	print_r(array_map(function($v){return round($v,2);}, $ctr));
+}
+
 $ct = http\Env::negotiateContentType(array("text/html","text/xml","text/json"), $ctr);
-echo "$ct: "; print_r($ctr);
+echo "$ct: "; dump($ctr);
 $ct = http\Env::negotiateContentType(array("text/xml","text/json"), $ctr);
-echo "$ct: "; print_r($ctr);
+echo "$ct: "; dump($ctr);
 $ct = http\Env::negotiateContentType(array("text/json"), $ctr);
-echo "$ct: "; print_r($ctr);
+echo "$ct: "; dump($ctr);
 ?>
 
 CHARSET
 
 <?php
 $cs = http\Env::negotiateCharset(array("utf-8", "iso-8859-1", "iso-8859-15"), $csr);
-echo "$cs: "; print_r($csr);
+echo "$cs: "; dump($csr);
 $cs = http\Env::negotiateCharset(array("iso-8859-1", "iso-8859-15"), $csr);
-echo "$cs: "; print_r($csr);
+echo "$cs: "; dump($csr);
 $cs = http\Env::negotiateCharset(array("utf-16", "iso-8859-15", "iso-8859-2"), $csr);
-echo "$cs: "; print_r($csr);
+echo "$cs: "; dump($csr);
 ?>
 
 ENCODING
 
 <?php
 $ce = http\Env::negotiateEncoding(array("gzip", "deflate", "sdch"), $cer);
-echo "$ce: "; print_r($cer);
+echo "$ce: "; dump($cer);
 $ce = http\Env::negotiateEncoding(array("", "sdch"), $cer);
-echo "$ce: "; print_r($cer);
+echo "$ce: "; dump($cer);
 ?>
 
 LANGUAGE
 
 <?php
 $ln = http\Env::negotiateLanguage(array("de", "en", "fr"), $lnr);
-echo "$ln: "; print_r($lnr);
+echo "$ln: "; dump($lnr);
 $ln = http\Env::negotiateLanguage(array("de-DE", "de-AT", "en"), $lnr);
-echo "$ln: "; print_r($lnr);
+echo "$ln: "; dump($lnr);
 $ln = http\Env::negotiateLanguage(array("nl", "fr", "en"), $lnr);
-echo "$ln: "; print_r($lnr);
+echo "$ln: "; dump($lnr);
 ?>
 
 CUSTOM
@@ -55,7 +60,7 @@ CUSTOM
 <?php
 $cc = http\Env::negotiate("a, a.b;q=0.9, c.d;q=0, *.* ; q=0.1",
     array("a.x", "c.d", "c.e", "a.b"), ".", $ccr);
-echo "$cc: "; print_r($ccr);
+echo "$cc: "; dump($ccr);
 ?>
 DONE
 --EXPECT--
@@ -103,7 +108,7 @@ LANGUAGE
 
 de: Array
 (
-    [de] => 0.99
+    [de] => 0.97
     [en] => 0.8
 )
 de-DE: Array
@@ -122,7 +127,7 @@ CUSTOM
 a.b: Array
 (
     [a.b] => 0.9
-    [c.e] => 0.1
-    [a.x] => 0.1
+    [c.e] => 0.08
+    [a.x] => 0.08
 )
 DONE
diff --git a/tests/url002.phpt b/tests/url002.phpt
index 704ede2..de336a7 100644
--- a/tests/url002.phpt
+++ b/tests/url002.phpt
@@ -13,7 +13,7 @@ $u = "http://user:pass@www.example.com:8080/path/file.ext".
 var_dump($u === (string) new http\Url($u));
 
 $url = new http\Url($u, 
-	array("path" => "changed", "query" => "foo=&added=this"), 
+	array("path" => "changed", "query" => "bar&foo=&added=this"), 
 	http\Url::JOIN_PATH |
 	http\Url::JOIN_QUERY |
 	http\Url::STRIP_AUTH |
@@ -40,6 +40,6 @@ NULL
 string(15) "www.example.com"
 int(8080)
 string(13) "/path/changed"
-string(38) "more%5B0%5D=1&more%5B1%5D=2&added=this"
+string(47) "foo=&more%5B0%5D=1&more%5B1%5D=2&bar&added=this"
 NULL
 DONE
-- 
2.30.2