X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fnegotiate001.phpt;h=b4757c0d2e726b46a94a9a31f6d4aff6cda80434;hb=6de53548089307e1e035a2b1a949b7e3304e1698;hp=d7bd755d300733b245c26168e8a06feacf758aed;hpb=40b8f999b7705c5474030aa67530a8b293f9ea8c;p=m6w6%2Fext-http

diff --git a/tests/negotiate001.phpt b/tests/negotiate001.phpt
index d7bd755..b4757c0 100644
--- a/tests/negotiate001.phpt
+++ b/tests/negotiate001.phpt
@@ -11,43 +11,56 @@ 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
+
+<?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: "; dump($ccr);
 ?>
 DONE
 --EXPECT--
@@ -95,7 +108,7 @@ LANGUAGE
 
 de: Array
 (
-    [de] => 0.99
+    [de] => 0.97
     [en] => 0.8
 )
 de-DE: Array
@@ -108,4 +121,13 @@ en: Array
 (
     [en] => 0.8
 )
+
+CUSTOM
+
+a.b: Array
+(
+    [a.b] => 0.9
+    [c.e] => 0.08
+    [a.x] => 0.08
+)
 DONE