You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2019/06/11 09:39:14 UTC

svn commit: r1861017 [30/36] - in /httpcomponents/site/httpcomponents-client-4.5.x: ./ fluent-hc/ fluent-hc/apidocs/ fluent-hc/apidocs/org/apache/http/client/fluent/ fluent-hc/apidocs/org/apache/http/client/fluent/class-use/ fluent-hc/xref-test/ fluent...

Modified: httpcomponents/site/httpcomponents-client-4.5.x/httpclient/xref-test/org/apache/http/client/utils/TestURIUtils.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.5.x/httpclient/xref-test/org/apache/http/client/utils/TestURIUtils.html?rev=1861017&r1=1861016&r2=1861017&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.5.x/httpclient/xref-test/org/apache/http/client/utils/TestURIUtils.html (original)
+++ httpcomponents/site/httpcomponents-client-4.5.x/httpclient/xref-test/org/apache/http/client/utils/TestURIUtils.html Tue Jun 11 09:39:03 2019
@@ -42,306 +42,318 @@
 <a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.junit.Assert;
 <a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
 <a class="jxr_linenumber" name="L36" href="#L36">36</a>  
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.http.client.utils.URIUtils.DROP_FRAGMENT_AND_NORMALIZE;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.http.client.utils.URIUtils.NORMALIZE;
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * This TestCase contains test methods for URI resolving according to RFC 3986.</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * The examples are listed in section "5.4 Reference Resolution Examples"</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="TestURIUtils" href="../../../../../org/apache/http/client/utils/TestURIUtils.html#TestURIUtils">TestURIUtils</a> {
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> URI baseURI = URI.create(<span class="jxr_string">"http://a/b/c/d;p?q"</span>);
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>      @Test
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewrite() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>          <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1);
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff"</span>), target).toString());
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>          Assert.assertEquals(<span class="jxr_string">"/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff"</span>), <strong class="jxr_keyword">null</strong>).toString());
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>          Assert.assertEquals(<span class="jxr_string">"/"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>                  URI.create(<span class="jxr_string">"http://thishost//"</span>), <strong class="jxr_keyword">null</strong>).toString());
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>          Assert.assertEquals(<span class="jxr_string">"/stuff/morestuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>                  URI.create(<span class="jxr_string">"http://thishost//stuff///morestuff"</span>), <strong class="jxr_keyword">null</strong>).toString());
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff#crap"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff#crap"</span>), target, NORMALIZE).toString());
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>                  URI.create(<span class="jxr_string">"http://thishost#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/#crap"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>                  URI.create(<span class="jxr_string">"http://thishost#crap"</span>), target, NORMALIZE).toString());
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>          Assert.assertEquals(<span class="jxr_string">"/stuff/"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>                  URI.create(<span class="jxr_string">"http://thishost//////////////stuff/"</span>), <strong class="jxr_keyword">null</strong>).toString());
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>                  URI.create(<span class="jxr_string">"http://thathost/stuff"</span>)).toString());
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>                  URI.create(<span class="jxr_string">"http://thathost/stuff#fragment"</span>)).toString());
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>                  URI.create(<span class="jxr_string">"http://userinfo@thathost/stuff#fragment"</span>)).toString());
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>                  URI.create(<span class="jxr_string">"http://thathost"</span>)).toString());
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>                  URI.create(<span class="jxr_string">"http://ThatHost"</span>)).toString());
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>          Assert.assertEquals(<span class="jxr_string">"http://That_Host/"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>                  URI.create(<span class="jxr_string">"http://That_Host"</span>)).toString());
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>          Assert.assertEquals(<span class="jxr_string">"http://thishost/Fragment_identifier%23Examples"</span>,
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>                  URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>                          URI.create(<span class="jxr_string">"http://thishost/Fragment_identifier%23Examples"</span>)).toString());
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>      }
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>      @Test
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewritePort() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>          HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, 8080); <em class="jxr_comment">// port should be copied</em>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost:8080/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>                  URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost:8080/stuff#crap"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>                  URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, NORMALIZE).toString());
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>          target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1); <em class="jxr_comment">// input port should be dropped</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>                  URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff#crap"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>                  URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, NORMALIZE).toString());
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>      }
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>     @Test
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewriteScheme() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1, <span class="jxr_string">"file"</span>); <em class="jxr_comment">// scheme should be copied</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>         Assert.assertEquals(<span class="jxr_string">"file://thathost/stuff"</span>, URIUtils.rewriteURI(
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>                 URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>     }
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>     @Test
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewriteForRoute() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>         <strong class="jxr_keyword">final</strong> HttpHost target1 = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"foo"</span>, 80);
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <strong class="jxr_keyword">final</strong> HttpHost target2 = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"foo"</span>, 443, <span class="jxr_string">"https"</span>);
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>         <strong class="jxr_keyword">final</strong> HttpHost proxy = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"bar"</span>, 8888);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>         <em class="jxr_comment">// Direct route</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/test"</span>), URIUtils
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1), <strong class="jxr_keyword">true</strong>));
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>         <em class="jxr_comment">// Direct route</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/"</span>), URIUtils
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">""</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1), <strong class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.http.client.utils.URIUtils.DROP_FRAGMENT;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.http.client.utils.URIUtils.DROP_FRAGMENT_AND_NORMALIZE;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.http.client.utils.URIUtils.NORMALIZE;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * This TestCase contains test methods for URI resolving according to RFC 3986.</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * The examples are listed in section "5.4 Reference Resolution Examples"</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="TestURIUtils" href="../../../../../org/apache/http/client/utils/TestURIUtils.html#TestURIUtils">TestURIUtils</a> {
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> URI baseURI = URI.create(<span class="jxr_string">"http://a/b/c/d;p?q"</span>);
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>      @Test
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewrite() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>          <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1);
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff"</span>), target).toString());
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>          Assert.assertEquals(<span class="jxr_string">"/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff"</span>), <strong class="jxr_keyword">null</strong>).toString());
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>          Assert.assertEquals(<span class="jxr_string">"/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>                  URI.create(<span class="jxr_string">"http://thishost//"</span>), <strong class="jxr_keyword">null</strong>).toString());
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>          Assert.assertEquals(<span class="jxr_string">"/stuff/morestuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>                  URI.create(<span class="jxr_string">"http://thishost//stuff///morestuff"</span>), <strong class="jxr_keyword">null</strong>).toString());
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff#crap"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>                  URI.create(<span class="jxr_string">"http://thishost/stuff#crap"</span>), target, NORMALIZE).toString());
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>                  URI.create(<span class="jxr_string">"http://thishost#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/#crap"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>                  URI.create(<span class="jxr_string">"http://thishost#crap"</span>), target, NORMALIZE).toString());
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>          Assert.assertEquals(<span class="jxr_string">"/stuff/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>                  URI.create(<span class="jxr_string">"http://thishost//////////////stuff/"</span>), <strong class="jxr_keyword">null</strong>).toString());
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>                  URI.create(<span class="jxr_string">"http://thathost/stuff"</span>)).toString());
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>                  URI.create(<span class="jxr_string">"http://thathost/stuff#fragment"</span>)).toString());
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>                  URI.create(<span class="jxr_string">"http://userinfo@thathost/stuff#fragment"</span>)).toString());
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>                  URI.create(<span class="jxr_string">"http://thathost"</span>)).toString());
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>                  URI.create(<span class="jxr_string">"http://ThatHost"</span>)).toString());
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>          Assert.assertEquals(<span class="jxr_string">"http://That_Host/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>                  URI.create(<span class="jxr_string">"http://That_Host"</span>)).toString());
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>          Assert.assertEquals(<span class="jxr_string">"http://thishost/Fragment_identifier%23Examples"</span>,
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>                  URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>                          URI.create(<span class="jxr_string">"http://thishost/Fragment_identifier%23Examples"</span>)).toString());
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>      }
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>      @Test
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewriteWithEmptyPath() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>          <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1);
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>              URI.create(<span class="jxr_string">"http://thathost"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>          Assert.assertEquals(<span class="jxr_string">"http://thathost/"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>              URI.create(<span class="jxr_string">"http://thathost"</span>), target, DROP_FRAGMENT).toString());
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>      }
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>      @Test
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewritePort() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>         HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, 8080); <em class="jxr_comment">// port should be copied</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>         Assert.assertEquals(<span class="jxr_string">"http://thathost:8080/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>                 URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>         Assert.assertEquals(<span class="jxr_string">"http://thathost:8080/stuff#crap"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>                 URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, NORMALIZE).toString());
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>         target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1); <em class="jxr_comment">// input port should be dropped</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>                 URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>         Assert.assertEquals(<span class="jxr_string">"http://thathost/stuff#crap"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>                 URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, NORMALIZE).toString());
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>     }
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>     @Test
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewriteScheme() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>         <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"thathost"</span>, -1, <span class="jxr_string">"file"</span>); <em class="jxr_comment">// scheme should be copied</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>         Assert.assertEquals(<span class="jxr_string">"file://thathost/stuff"</span>, URIUtils.rewriteURI(
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>                 URI.create(<span class="jxr_string">"http://thishost:80/stuff#crap"</span>), target, DROP_FRAGMENT_AND_NORMALIZE).toString());
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>     }
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>     @Test
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRewriteForRoute() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="L121" href="#L121">121</a> 
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <em class="jxr_comment">// Via proxy</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo/test"</span>), URIUtils
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1, proxy), <strong class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <strong class="jxr_keyword">final</strong> HttpHost target1 = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"foo"</span>, 80);
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <strong class="jxr_keyword">final</strong> HttpHost target2 = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"foo"</span>, 443, <span class="jxr_string">"https"</span>);
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>         <strong class="jxr_keyword">final</strong> HttpHost proxy = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"bar"</span>, 8888);
 <a class="jxr_linenumber" name="L125" href="#L125">125</a> 
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <em class="jxr_comment">// Via proxy</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo:80/test"</span>), URIUtils
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1, proxy), <strong class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <em class="jxr_comment">// Direct route</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/test"</span>), URIUtils
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1), <strong class="jxr_keyword">true</strong>));
 <a class="jxr_linenumber" name="L129" href="#L129">129</a> 
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>         <em class="jxr_comment">// Via proxy tunnel</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/test"</span>), URIUtils
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"https://foo:443/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target2, <strong class="jxr_keyword">null</strong>, proxy, <strong class="jxr_keyword">true</strong>), <strong class="jxr_keyword">true</strong>));
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>     }
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>     @Test
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNormalization() {
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>         Assert.assertEquals(<span class="jxr_string">"example://a/b/c/%7Bfoo%7D"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"eXAMPLE://a/./b/../b/%63/%7bfoo%7d"</span>).toString());
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/%3C"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/%3c"</span>).toString());
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"HTTP://www.EXAMPLE.com/"</span>).toString());
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/a%2F"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/a%2f"</span>).toString());
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/?q=%26"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/?q=%26"</span>).toString());
-<a class="jxr_linenumber" name="L142" href="#L142">142</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/%23?q=%26"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/%23?q=%26"</span>).toString());
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/blah-(%20-blah-%20&amp;%20-blah-%20)-blah/"</span>,
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>                 URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/blah-%28%20-blah-%20%26%20-blah-%20%29-blah/"</span>).toString());
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>         <em class="jxr_comment">// Direct route</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/"</span>), URIUtils
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">""</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1), <strong class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         <em class="jxr_comment">// Via proxy</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo/test"</span>), URIUtils
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1, proxy), <strong class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         <em class="jxr_comment">// Via proxy</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://foo:80/test"</span>), URIUtils
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target1, proxy), <strong class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>         <em class="jxr_comment">// Via proxy tunnel</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/test"</span>), URIUtils
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>                 .rewriteURIForRoute(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"https://foo:443/test"</span>), <strong class="jxr_keyword">new</strong> HttpRoute(target2, <strong class="jxr_keyword">null</strong>, proxy, <strong class="jxr_keyword">true</strong>), <strong class="jxr_keyword">true</strong>));
 <a class="jxr_linenumber" name="L145" href="#L145">145</a>     }
 <a class="jxr_linenumber" name="L146" href="#L146">146</a> 
 <a class="jxr_linenumber" name="L147" href="#L147">147</a>     @Test
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testResolve() {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>         Assert.assertEquals(<span class="jxr_string">"g:h"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g:h"</span>).toString());
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g"</span>).toString());
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./g"</span>).toString());
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g/"</span>).toString());
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"/g"</span>).toString());
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>         Assert.assertEquals(<span class="jxr_string">"http://g/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"//g"</span>).toString());
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"?y"</span>).toString());
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?y#f"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"?y#f"</span>)
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>                 .toString());
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y"</span>).toString());
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?q#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"#s"</span>)
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>                 .toString());
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g#s"</span>).toString());
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y#s"</span>)
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>                 .toString());
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/;x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">";x"</span>).toString());
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g;x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x"</span>).toString());
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g;x?y#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x?y#s"</span>)
-<a class="jxr_linenumber" name="L167" href="#L167">167</a>                 .toString());
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?q"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">""</span>).toString());
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"."</span>).toString());
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./"</span>).toString());
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">".."</span>).toString());
-<a class="jxr_linenumber" name="L172" href="#L172">172</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../"</span>).toString());
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../g"</span>).toString());
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>         Assert.assertEquals(<span class="jxr_string">"http://a/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../.."</span>).toString());
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>         Assert.assertEquals(<span class="jxr_string">"http://a/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../"</span>).toString());
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../g"</span>).toString());
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../../g"</span>).toString());
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../../../g"</span>)
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNormalization() {
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>         Assert.assertEquals(<span class="jxr_string">"example://a/b/c/%7Bfoo%7D"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"eXAMPLE://a/./b/../b/%63/%7bfoo%7d"</span>).toString());
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/%3C"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/%3c"</span>).toString());
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"HTTP://www.EXAMPLE.com/"</span>).toString());
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/a%2F"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/a%2f"</span>).toString());
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/?q=%26"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/?q=%26"</span>).toString());
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/%23?q=%26"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/%23?q=%26"</span>).toString());
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>         Assert.assertEquals(<span class="jxr_string">"http://www.example.com/blah-(%20-blah-%20&amp;%20-blah-%20)-blah/"</span>,
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>                 URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http://www.example.com/blah-%28%20-blah-%20%26%20-blah-%20%29-blah/"</span>).toString());
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>     }
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>     @Test
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testResolve() {
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>         Assert.assertEquals(<span class="jxr_string">"g:h"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g:h"</span>).toString());
+<a class="jxr_linenumber" name="L162" href="#L162">162</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g"</span>).toString());
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./g"</span>).toString());
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g/"</span>).toString());
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"/g"</span>).toString());
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>         Assert.assertEquals(<span class="jxr_string">"http://g/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"//g"</span>).toString());
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"?y"</span>).toString());
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?y#f"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"?y#f"</span>)
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>                 .toString());
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y"</span>).toString());
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?q#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"#s"</span>)
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>                 .toString());
+<a class="jxr_linenumber" name="L173" href="#L173">173</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g#s"</span>).toString());
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y#s"</span>)
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>                 .toString());
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/;x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">";x"</span>).toString());
+<a class="jxr_linenumber" name="L177" href="#L177">177</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g;x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x"</span>).toString());
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g;x?y#s"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x?y#s"</span>)
 <a class="jxr_linenumber" name="L179" href="#L179">179</a>                 .toString());
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"/./g"</span>).toString());
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"/../g"</span>).toString());
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g."</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g."</span>).toString());
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/.g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">".g"</span>).toString());
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g.."</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g.."</span>).toString());
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/..g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"..g"</span>).toString());
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./../g"</span>).toString());
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./g/."</span>).toString());
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g/h"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g/./h"</span>).toString());
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/h"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g/../h"</span>).toString());
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g;x=1/y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x=1/./y"</span>)
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/d;p?q"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">""</span>).toString());
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"."</span>).toString());
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./"</span>).toString());
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">".."</span>).toString());
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../"</span>).toString());
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../g"</span>).toString());
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>         Assert.assertEquals(<span class="jxr_string">"http://a/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../.."</span>).toString());
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>         Assert.assertEquals(<span class="jxr_string">"http://a/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../"</span>).toString());
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../g"</span>).toString());
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../../g"</span>).toString());
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"../../../../g"</span>)
 <a class="jxr_linenumber" name="L191" href="#L191">191</a>                 .toString());
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x=1/../y"</span>)
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>                 .toString());
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y/./x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y/./x"</span>)
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>                 .toString());
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y/../x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y/../x"</span>)
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>                 .toString());
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g#s/./x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g#s/./x"</span>)
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>                 .toString());
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g#s/../x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g#s/../x"</span>)
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>                 .toString());
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>         Assert.assertEquals(<span class="jxr_string">"http:g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http:g"</span>).toString());
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>         <em class="jxr_comment">// examples from section 5.2.4</em>
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>         Assert.assertEquals(<span class="jxr_string">"http://s/a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI,
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>                 <span class="jxr_string">"http://s/a/b/c/./../../g"</span>).toString());
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>         Assert.assertEquals(<span class="jxr_string">"http://s/mid/6"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI,
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>                 <span class="jxr_string">"http://s/mid/content=5/../6"</span>).toString());
-<a class="jxr_linenumber" name="L208" href="#L208">208</a>     }
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>     @Test
-<a class="jxr_linenumber" name="L211" href="#L211">211</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testResolveOpaque() {
-<a class="jxr_linenumber" name="L212" href="#L212">212</a>         Assert.assertEquals(<span class="jxr_string">"example://a/b/c/%7Bfoo%7D"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"eXAMPLE://a/./b/../b/%63/%7bfoo%7d"</span>).toString());
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>         Assert.assertEquals(<span class="jxr_string">"file://localhost/etc/fstab"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file://localhost/etc/fstab"</span>).toString());
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>         Assert.assertEquals(<span class="jxr_string">"file:///etc/fstab"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file:///etc/fstab"</span>).toString());
-<a class="jxr_linenumber" name="L215" href="#L215">215</a>         Assert.assertEquals(<span class="jxr_string">"file://localhost/c:/WINDOWS/clock.avi"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file://localhost/c:/WINDOWS/clock.avi"</span>).toString());
-<a class="jxr_linenumber" name="L216" href="#L216">216</a>         Assert.assertEquals(<span class="jxr_string">"file:///c:/WINDOWS/clock.avi"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file:///c:/WINDOWS/clock.avi"</span>).toString());
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>         Assert.assertEquals(<span class="jxr_string">"file://hostname/path/to/the%20file.txt"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file://hostname/path/to/the%20file.txt"</span>).toString());
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>         Assert.assertEquals(<span class="jxr_string">"file:///c:/path/to/the%20file.txt"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file:///c:/path/to/the%20file.txt"</span>).toString());
-<a class="jxr_linenumber" name="L219" href="#L219">219</a>         Assert.assertEquals(<span class="jxr_string">"urn:issn:1535-3613"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"urn:issn:1535-3613"</span>).toString());
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>         Assert.assertEquals(<span class="jxr_string">"mailto:user@example.com"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"mailto:user@example.com"</span>).toString());
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>         Assert.assertEquals(<span class="jxr_string">"ftp://example.org/resource.txt"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"ftp://example.org/resource.txt"</span>).toString());
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>     }
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>     @Test
-<a class="jxr_linenumber" name="L225" href="#L225">225</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testExtractHost() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>),
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost/abcd"</span>)));
-<a class="jxr_linenumber" name="L228" href="#L228">228</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>),
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost/abcd%3A"</span>)));
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 
-<a class="jxr_linenumber" name="L231" href="#L231">231</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>),
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host/abcd"</span>)));
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>),
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host/abcd%3A"</span>)));
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"/./g"</span>).toString());
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>         Assert.assertEquals(<span class="jxr_string">"http://a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"/../g"</span>).toString());
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g."</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g."</span>).toString());
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/.g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">".g"</span>).toString());
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g.."</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g.."</span>).toString());
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/..g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"..g"</span>).toString());
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./../g"</span>).toString());
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g/"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"./g/."</span>).toString());
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g/h"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g/./h"</span>).toString());
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/h"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g/../h"</span>).toString());
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g;x=1/y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x=1/./y"</span>)
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>                 .toString());
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/y"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g;x=1/../y"</span>)
+<a class="jxr_linenumber" name="L205" href="#L205">205</a>                 .toString());
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y/./x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y/./x"</span>)
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>                 .toString());
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g?y/../x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g?y/../x"</span>)
+<a class="jxr_linenumber" name="L209" href="#L209">209</a>                 .toString());
+<a class="jxr_linenumber" name="L210" href="#L210">210</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g#s/./x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g#s/./x"</span>)
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>                 .toString());
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>         Assert.assertEquals(<span class="jxr_string">"http://a/b/c/g#s/../x"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"g#s/../x"</span>)
+<a class="jxr_linenumber" name="L213" href="#L213">213</a>                 .toString());
+<a class="jxr_linenumber" name="L214" href="#L214">214</a>         Assert.assertEquals(<span class="jxr_string">"http:g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"http:g"</span>).toString());
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>         <em class="jxr_comment">// examples from section 5.2.4</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>         Assert.assertEquals(<span class="jxr_string">"http://s/a/g"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI,
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>                 <span class="jxr_string">"http://s/a/b/c/./../../g"</span>).toString());
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>         Assert.assertEquals(<span class="jxr_string">"http://s/mid/6"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI,
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>                 <span class="jxr_string">"http://s/mid/content=5/../6"</span>).toString());
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>     }
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>     @Test
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testResolveOpaque() {
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>         Assert.assertEquals(<span class="jxr_string">"example://a/b/c/%7Bfoo%7D"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"eXAMPLE://a/./b/../b/%63/%7bfoo%7d"</span>).toString());
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>         Assert.assertEquals(<span class="jxr_string">"file://localhost/etc/fstab"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file://localhost/etc/fstab"</span>).toString());
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>         Assert.assertEquals(<span class="jxr_string">"file:///etc/fstab"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file:///etc/fstab"</span>).toString());
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>         Assert.assertEquals(<span class="jxr_string">"file://localhost/c:/WINDOWS/clock.avi"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file://localhost/c:/WINDOWS/clock.avi"</span>).toString());
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>         Assert.assertEquals(<span class="jxr_string">"file:///c:/WINDOWS/clock.avi"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file:///c:/WINDOWS/clock.avi"</span>).toString());
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>         Assert.assertEquals(<span class="jxr_string">"file://hostname/path/to/the%20file.txt"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file://hostname/path/to/the%20file.txt"</span>).toString());
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>         Assert.assertEquals(<span class="jxr_string">"file:///c:/path/to/the%20file.txt"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"file:///c:/path/to/the%20file.txt"</span>).toString());
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>         Assert.assertEquals(<span class="jxr_string">"urn:issn:1535-3613"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"urn:issn:1535-3613"</span>).toString());
+<a class="jxr_linenumber" name="L232" href="#L232">232</a>         Assert.assertEquals(<span class="jxr_string">"mailto:user@example.com"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"mailto:user@example.com"</span>).toString());
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>         Assert.assertEquals(<span class="jxr_string">"ftp://example.org/resource.txt"</span>, URIUtils.resolve(<strong class="jxr_keyword">this</strong>.baseURI, <span class="jxr_string">"ftp://example.org/resource.txt"</span>).toString());
+<a class="jxr_linenumber" name="L234" href="#L234">234</a>     }
 <a class="jxr_linenumber" name="L235" href="#L235">235</a> 
-<a class="jxr_linenumber" name="L236" href="#L236">236</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8),
-<a class="jxr_linenumber" name="L237" href="#L237">237</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:8/abcd"</span>)));
-<a class="jxr_linenumber" name="L238" href="#L238">238</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,8),
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host:8/abcd"</span>)));
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>         <em class="jxr_comment">// URI seems to OK with missing port number</em>
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,-1),URIUtils.extractHost(
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:/abcd"</span>)));
-<a class="jxr_linenumber" name="L244" href="#L244">244</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,-1),URIUtils.extractHost(
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host:/abcd"</span>)));
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://user:pass@localhost:8080/abcd"</span>)));
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,8080),
-<a class="jxr_linenumber" name="L250" href="#L250">250</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://user:pass@local_host:8080/abcd"</span>)));
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),URIUtils.extractHost(
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://@localhost:8080/abcd"</span>)));
-<a class="jxr_linenumber" name="L254" href="#L254">254</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,8080),URIUtils.extractHost(
-<a class="jxr_linenumber" name="L255" href="#L255">255</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://@local_host:8080/abcd"</span>)));
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"[2a00:1450:400c:c01::69]"</span>,8080),
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://[2a00:1450:400c:c01::69]:8080/"</span>)));
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:8080/;sessionid=stuff/abcd"</span>)));
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:8080;sessionid=stuff/abcd"</span>)));
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,-1),
-<a class="jxr_linenumber" name="L265" href="#L265">265</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:;sessionid=stuff/abcd"</span>)));
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>         Assert.assertEquals(<strong class="jxr_keyword">null</strong>,
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://:80/robots.txt"</span>)));
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>         Assert.assertEquals(<strong class="jxr_keyword">null</strong>,
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://some%20domain:80/robots.txt"</span>)));
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>     }
+<a class="jxr_linenumber" name="L236" href="#L236">236</a>     @Test
+<a class="jxr_linenumber" name="L237" href="#L237">237</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testExtractHost() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L238" href="#L238">238</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>),
+<a class="jxr_linenumber" name="L239" href="#L239">239</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost/abcd"</span>)));
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>),
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost/abcd%3A"</span>)));
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>),
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host/abcd"</span>)));
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>),
+<a class="jxr_linenumber" name="L246" href="#L246">246</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host/abcd%3A"</span>)));
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8),
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:8/abcd"</span>)));
+<a class="jxr_linenumber" name="L250" href="#L250">250</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,8),
+<a class="jxr_linenumber" name="L251" href="#L251">251</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host:8/abcd"</span>)));
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 
+<a class="jxr_linenumber" name="L253" href="#L253">253</a>         <em class="jxr_comment">// URI seems to OK with missing port number</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,-1),URIUtils.extractHost(
+<a class="jxr_linenumber" name="L255" href="#L255">255</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:/abcd"</span>)));
+<a class="jxr_linenumber" name="L256" href="#L256">256</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,-1),URIUtils.extractHost(
+<a class="jxr_linenumber" name="L257" href="#L257">257</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://local_host:/abcd"</span>)));
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://user:pass@localhost:8080/abcd"</span>)));
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,8080),
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://user:pass@local_host:8080/abcd"</span>)));
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),URIUtils.extractHost(
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://@localhost:8080/abcd"</span>)));
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"local_host"</span>,8080),URIUtils.extractHost(
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>                 <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://@local_host:8080/abcd"</span>)));
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"[2a00:1450:400c:c01::69]"</span>,8080),
+<a class="jxr_linenumber" name="L270" href="#L270">270</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://[2a00:1450:400c:c01::69]:8080/"</span>)));
 <a class="jxr_linenumber" name="L271" href="#L271">271</a> 
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>     @Test
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHttpLocationWithRelativeFragment() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>         <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, -1, <span class="jxr_string">"http"</span>);
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>         <strong class="jxr_keyword">final</strong> URI requestURI = <strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"/stuff#blahblah"</span>);
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>         <strong class="jxr_keyword">final</strong> URI location = URIUtils.resolve(requestURI, target, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>         <strong class="jxr_keyword">final</strong> URI expectedURI = <strong class="jxr_keyword">new</strong> URIBuilder(requestURI)
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>                 .setHost(target.getHostName())
-<a class="jxr_linenumber" name="L280" href="#L280">280</a>                 .setScheme(target.getSchemeName())
-<a class="jxr_linenumber" name="L281" href="#L281">281</a>                 .build();
-<a class="jxr_linenumber" name="L282" href="#L282">282</a>         Assert.assertEquals(expectedURI, location);
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>     }
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 
-<a class="jxr_linenumber" name="L285" href="#L285">285</a>     @Test
-<a class="jxr_linenumber" name="L286" href="#L286">286</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHttpLocationWithAbsoluteFragment() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L287" href="#L287">287</a>         <strong class="jxr_keyword">final</strong> HttpHost target = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 80, <span class="jxr_string">"http"</span>);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:8080/;sessionid=stuff/abcd"</span>)));
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,8080),
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:8080;sessionid=stuff/abcd"</span>)));
+<a class="jxr_linenumber" name="L276" href="#L276">276</a>         Assert.assertEquals(<strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>,-1),
+<a class="jxr_linenumber" name="L277" href="#L277">277</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://localhost:;sessionid=stuff/abcd"</span>)));
+<a class="jxr_linenumber" name="L278" href="#L278">278</a>         Assert.assertEquals(<strong class="jxr_keyword">null</strong>,
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>                 URIUtils.extractHost(<strong class="jxr_keyword">new</strong> URI(<span class="jxr_string">"http://:80/robots.txt"</span>)));

[... 118 lines stripped ...]