diff --git a/src/main/java/org/takes/tk/TkProxy.java b/src/main/java/org/takes/tk/TkProxy.java index d745a4693..07743f7cd 100644 --- a/src/main/java/org/takes/tk/TkProxy.java +++ b/src/main/java/org/takes/tk/TkProxy.java @@ -23,7 +23,7 @@ */ package org.takes.tk; -import com.jcabi.http.request.ApacheRequest; +import com.jcabi.http.request.JdkRequest; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Arrays; @@ -53,11 +53,8 @@ * @version $Id$ * @since 0.25 * @checkstyle ClassDataAbstractionCouplingCheck (500 lines) - * @todo #377 We need the integration test for this class. - * The test should verify the different HTTP methods (GET, POST, etc), - * as well as the different combinations of request/response headers. */ -public class TkProxy implements Take { +public final class TkProxy implements Take { /** * Target host to which requests are forwarded. @@ -80,7 +77,7 @@ public TkProxy(final String target) { } @Override - public final Response act(final Request req) throws IOException { + public Response act(final Request req) throws IOException { final RqHref.Base base = new RqHref.Base(req); final String home = new RqHref.Smart(base).home().bare(); final String dest = String.format( @@ -102,7 +99,7 @@ public final Response act(final Request req) throws IOException { private com.jcabi.http.Request request(final Request req, final String dest) throws IOException { final String method = new RqMethod.Base(req).method(); - com.jcabi.http.Request proxied = new ApacheRequest(dest) + com.jcabi.http.Request proxied = new JdkRequest(dest) .method(method); final RqHeaders.Base headers = new RqHeaders.Base(req); for (final String name : headers.names()) { diff --git a/src/test/java/org/takes/tk/TkProxyTest.java b/src/test/java/org/takes/tk/TkProxyTest.java new file mode 100644 index 000000000..c314cb58d --- /dev/null +++ b/src/test/java/org/takes/tk/TkProxyTest.java @@ -0,0 +1,71 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2015 Yegor Bugayenko + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package org.takes.tk; + +import java.io.IOException; +import java.net.URI; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; +import org.takes.http.FtRemote; +import org.takes.rq.RqFake; +import org.takes.rs.RsPrint; + +/** + * Test case for {@link TkProxy}. + * @author Dragan Bozanovic (bozanovicdr@gmail.com) + * @version $Id$ + * @since 0.25 + * @todo #377 We need more tests for TkProxy. + * The tests should verify the different HTTP methods (GET, POST, etc), + * as well as the different combinations of request/response headers. + */ +public final class TkProxyTest { + + /** + * TkProxy can work. + * @throws Exception If some problem inside + */ + @Test + public void justWorks() throws Exception { + new FtRemote(new TkFixed("hello, world!")).exec( + new FtRemote.Script() { + @Override + public void exec(final URI home) throws IOException { + MatcherAssert.assertThat( + new RsPrint( + new TkProxy( + String.format( + "%s:%d", + home.getHost(), home.getPort() + ) + ).act(new RqFake()) + ).print(), + Matchers.containsString("hello") + ); + } + } + ); + } +}