Skip to content
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

Use Hamcrest assertions instead of JUnit in tests/functional/jax-rs-multiple-apps (#1749) #5634

Merged
merged 1 commit into from
Dec 11, 2022
Merged

Use Hamcrest assertions instead of JUnit in tests/functional/jax-rs-multiple-apps (#1749) #5634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions ...jax-rs-multiple-apps/src/test/java/io/helidon/tests/functional/multipleapps/MainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.hasKey;

@HelidonTest
@Disabled("3.0.0-JAKARTA")
Expand All @@ -46,13 +46,13 @@ void testHelloWorld1() {
.request()
.header("who", "World 1")
.get();
assertEquals(response.getStatus(), 200);
assertTrue(response.getHeaders().containsKey("sharedfilter"));
assertTrue(response.getHeaders().containsKey("filter1"));
assertFalse(response.getHeaders().containsKey("filter2"));
assertThat(response.getStatus(), is(200));
assertThat(response.getHeaders(), hasKey("sharedfilter"));
assertThat(response.getHeaders(), hasKey("filter1"));
assertThat(response.getHeaders(), not(hasKey("filter2")));
JsonObject jsonObject = response.readEntity(JsonObject.class);
assertEquals("Hello World 1!", jsonObject.getString("message"),
"default message");
assertThat("default message", jsonObject.getString("message"),
is("Hello World 1!"));
}

@Test
Expand All @@ -62,14 +62,14 @@ void testHelloWorld2() {
.request()
.header("who", "World 2")
.get();
assertEquals(response.getStatus(), 200);
assertTrue(response.getHeaders().containsKey("sharedfilter"));
assertTrue(response.getHeaders().containsKey("filter2"));
assertTrue(response.getHeaders().containsKey("filter3")); // MyFeature
assertFalse(response.getHeaders().containsKey("filter1"));
assertThat(response.getStatus(), is(200));
assertThat(response.getHeaders(), hasKey("sharedfilter"));
assertThat(response.getHeaders(), hasKey("filter2"));
assertThat(response.getHeaders(), hasKey("filter3")); // MyFeature
assertThat(response.getHeaders(), not(hasKey("filter1")));
JsonObject jsonObject = response.readEntity(JsonObject.class);
assertEquals("Hello World 2!", jsonObject.getString("message"),
"default message");
assertThat("default message", jsonObject.getString("message"),
is("Hello World 2!"));
}

@Test
Expand Down