Skip to content

Commit 972c2dd

Browse files
committed
Apply hamcrest library
1 parent e8a484a commit 972c2dd

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/test/java/com/longcoding/moon/interceptors/impl/InitializeInterceptorTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
import com.longcoding.moon.helpers.Constant;
44
import com.longcoding.moon.models.RequestInfo;
55
import lombok.extern.slf4j.Slf4j;
6-
import org.junit.Assert;
76
import org.junit.Before;
87
import org.junit.Test;
98
import org.springframework.mock.web.MockHttpServletRequest;
109
import org.springframework.mock.web.MockHttpServletResponse;
1110
import org.springframework.util.MimeTypeUtils;
1211

12+
import static org.hamcrest.MatcherAssert.assertThat;
13+
import static org.hamcrest.Matchers.is;
14+
import static org.hamcrest.Matchers.equalTo;
15+
1316
@Slf4j
1417
public class InitializeInterceptorTest {
1518

@@ -31,31 +34,31 @@ public void initializeRequestWithApikey() {
3134
log.info("Initializes the request. And Check apiKey");
3235

3336
RequestInfo requestInfo = (RequestInfo) request.getAttribute(Constant.REQUEST_INFO_DATA);
34-
Assert.assertEquals("5000-5000-5000-5000", requestInfo.getHeaders().get("apikey"));
37+
assertThat(requestInfo.getHeaders().get("apikey"), equalTo("5000-5000-5000-5000"));
3538
}
3639

3740
@Test
3841
public void initializeRequestWithHeaders() {
3942
log.info("Initializes the request. And Check headers");
4043

4144
RequestInfo requestInfo = (RequestInfo) request.getAttribute(Constant.REQUEST_INFO_DATA);
42-
Assert.assertEquals(2, requestInfo.getHeaders().size());
45+
assertThat(requestInfo.getHeaders().size(), equalTo(2));
4346
}
4447

4548
@Test
4649
public void initializeRequestWithHttpMethod() {
47-
log.info("Initializes the request. And Check headers");
50+
log.info("Initializes the request. And Check http Method");
4851

4952
RequestInfo requestInfo = (RequestInfo) request.getAttribute(Constant.REQUEST_INFO_DATA);
50-
Assert.assertEquals("POST", requestInfo.getRequestMethod());
53+
assertThat(requestInfo.getRequestMethod(), equalTo("POST"));
5154
}
5255

5356
@Test
5457
public void initializeRequestWithQueryParam() {
5558
log.info("Initializes the request. And Check query parameters");
5659

5760
RequestInfo requestInfo = (RequestInfo) request.getAttribute(Constant.REQUEST_INFO_DATA);
58-
Assert.assertTrue(requestInfo.getQueryStringMap().containsKey("version"));
61+
assertThat(requestInfo.getQueryStringMap().containsKey("version"), is(true));
5962
}
6063

6164
}

0 commit comments

Comments
 (0)