#35 reproduced

yegor256 · May 5, 2017 · 3fdbe60 · 3fdbe60
1 parent 7cb451d
commit 3fdbe60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/io/jare/tk/TkRelay.java b/src/main/java/io/jare/tk/TkRelay.java
@@ -79,15 +79,15 @@ public Response act(final Request req) throws IOException {
         if (!param.hasNext()) {
             throw new HttpException(
                 HttpURLConnection.HTTP_BAD_REQUEST,
-                "parameter \"u\" is mandatory"
+                "Parameter \"u\" is mandatory"
             );
         }
         final String target = param.next().trim();
         if (!TkRelay.PTN.matcher(target).matches()) {
             throw new HttpException(
                 HttpURLConnection.HTTP_BAD_REQUEST,
                 String.format(
-                    "target URL \"%s\" is not compliant with RFC3986",
+                    "Target URL \"%s\" is not compliant with RFC3986",
                     target
                 )
             );
@@ -100,7 +100,7 @@ public Response act(final Request req) throws IOException {
                 HttpURLConnection.HTTP_BAD_REQUEST,
                 String.format(
                     // @checkstyle LineLength (1 line)
-                    "domain \"%s\" is not registered, check your account at www.jare.io",
+                    "Domain \"%s\" is not registered, check your account at www.jare.io",
                     host
                 )
             );

diff --git a/src/test/java/io/jare/tk/TkRelayTest.java b/src/test/java/io/jare/tk/TkRelayTest.java
@@ -23,6 +23,7 @@
 package io.jare.tk;
 
 import io.jare.fake.FkBase;
+import java.net.URLEncoder;
 import java.util.Arrays;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -81,15 +82,21 @@ public void sendsRequestThrough() throws Exception {
     @Test
     public void sendsRequestThroughToHome() throws Exception {
         final Take target = new TkFork(
-            new FkRegex("/", new TkText("it's home"))
+            new FkRegex("/.*", new TkText("it's home"))
         );
         new FtRemote(target).exec(
             home -> MatcherAssert.assertThat(
                 new RsPrint(
                     new TkRelay(new FkBase()).act(
                         new RqFake(
                             Arrays.asList(
-                                String.format("GET /?u=%s", home),
+                                String.format(
+                                    "GET /?u=%s",
+                                    URLEncoder.encode(
+                                        home.resolve("/альфа").toASCIIString(),
+                                        "UTF-8"
+                                    )
+                                ),
                                 "Host: localhost "
                             ),
                             ""