Skip to content

enhance TkHtml test coverage and readability #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rultor merged 7 commits into from
Dec 13, 2025
Merged

enhance TkHtml test coverage and readability #1487

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fdf596
test: enhance TkHtml test coverage and readability
eshabakhov Oct 30, 2025
4874c39
test: code style fix
eshabakhov Dec 9, 2025
c315cbe
test: restructured methods
eshabakhov Dec 10, 2025
29f6f50
test: refactor
eshabakhov Dec 10, 2025
d193f71
test: fix test reason
eshabakhov Dec 11, 2025
2bc1c3c
test: fix test reason
eshabakhov Dec 11, 2025
7b213e0
test: remove redundant variables
eshabakhov Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 85 additions & 52 deletions src/test/java/org/takes/tk/TkHtmlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@
package org.takes.tk;

import org.cactoos.io.InputStreamOf;
import org.cactoos.iterable.IterableOf;
import org.cactoos.text.Joined;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.llorllale.cactoos.matchers.HasString;
import org.llorllale.cactoos.matchers.IsText;
import org.takes.Take;
import org.takes.rq.RqFake;
import org.takes.rs.RsBodyPrint;
import org.takes.rs.RsPrint;

/**
Expand All @@ -20,79 +27,54 @@
*/
final class TkHtmlTest {

@Test
void createsTextResponse() throws Exception {
final String body = "<html>hello, world!</html>";
/**
* Input Bodies for testing.
* @return The testing data
*/
static Iterable<Arguments> cases() {
return new IterableOf<>(
Arguments.arguments("<html>hello, world!</html>"),
Arguments.arguments("")
);
}

@ParameterizedTest
@MethodSource("cases")
void createsTextResponseFromInputString(final String body) throws Exception {
MatcherAssert.assertThat(
"TkHtml must create proper HTML response from string",
new RsPrint(new TkHtml(body).act(new RqFake())),
new IsText(
new Joined(
"\r\n",
"HTTP/1.1 200 OK",
String.format("Content-Length: %s", body.length()),
"Content-Type: text/html",
"",
body
)
)
this.textMatcher(body)
);
}

@Test
void createsTextResponseFromScalar() throws Exception {
final String body = "<html>hello, world!</html>";
@ParameterizedTest
@MethodSource("cases")
void createsTextResponseFromScalar(final String body) throws Exception {
MatcherAssert.assertThat(
"TkHtml must create proper HTML response from scalar supplier",
new RsPrint(new TkHtml(() -> body).act(new RqFake())),
new IsText(
new Joined(
"\r\n",
"HTTP/1.1 200 OK",
String.format("Content-Length: %s", body.length()),
"Content-Type: text/html",
"",
body
)
)
this.textMatcher(body)
);
}

@Test
void createsTextResponseFromByteArray() throws Exception {
final String body = "<html>hello, world!</html>";
@ParameterizedTest
@MethodSource("cases")
void createsTextResponseFromByteArray(final String body) throws Exception {
MatcherAssert.assertThat(
"TkHtml must create proper HTML response from byte array",
new RsPrint(new TkHtml(body.getBytes()).act(new RqFake())),
new IsText(
new Joined(
"\r\n",
"HTTP/1.1 200 OK",
String.format("Content-Length: %s", body.length()),
"Content-Type: text/html",
"",
body
)
)
this.textMatcher(body)
);
}

@Test
void createsTextResponseFromInputStream() throws Exception {
final String body = "<html>hello, world!</html>";
@ParameterizedTest
@MethodSource("cases")
void createsTextResponseFromInputStream(final String body) throws Exception {
MatcherAssert.assertThat(
"TkHtml must create proper HTML response from input stream",
new RsPrint(new TkHtml(new InputStreamOf(body)).act(new RqFake())),
new IsText(
new Joined(
"\r\n",
"HTTP/1.1 200 OK",
String.format("Content-Length: %s", body.length()),
"Content-Type: text/html",
"",
body
)
)
this.textMatcher(body)
);
}

Expand All @@ -112,4 +94,55 @@ void printsResourceMultipleTimes() throws Exception {
);
}

@Test
void startsTextResponseBodyWithHtmlTag() throws Exception {
MatcherAssert.assertThat(
"HTML response must start with <html> tag",
new RsBodyPrint(
new TkHtml("<html><body>Hello buddy!</body></html>").act(new RqFake())
).asString(),
Matchers.startsWith("<html>")
);
}

@Test
void endsTextResponseBodyWithHtmlTag() throws Exception {
MatcherAssert.assertThat(
"HTML response must end with </html> tag",
new RsBodyPrint(
new TkHtml("<html><body>Hello comrade!/body></html>").act(new RqFake())
).asString(),
Matchers.endsWith("</html>")
);
}

@Test
void failsOnNullInputScalar() {
Assertions.assertThrows(
IllegalStateException.class,
() -> MatcherAssert.assertThat(
"Must reject null input scalar body",
new RsPrint(new TkHtml(() -> null).act(new RqFake())),
this.textMatcher("Unreachable text")
)
);
}

/**
* Creates text matcher for HTML response.
* @param body Response body
* @return Text matcher
*/
private IsText textMatcher(final String body) {
return new IsText(
new Joined(
"\r\n",
"HTTP/1.1 200 OK",
String.format("Content-Length: %s", body.getBytes().length),
"Content-Type: text/html",
"",
body
)
);
}
}
Loading