Skip to content

Commit

Permalink
Use Hamcrest assertions instead of JUnit in tests/functional/jax-rs-m…
Browse files Browse the repository at this point in the history
…ultiple-apps (#1749) (#5634)
  • Loading branch information
Captain1653 authored Dec 11, 2022
1 parent 4436137 commit e0072a5
Showing 1 changed file with 16 additions and 16 deletions.
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

0 comments on commit e0072a5

Please sign in to comment.