replace hamcrest with assertj

hapifhir · May 22, 2024 · b5f0d3f · b5f0d3f
1 parent 66138f9
commit b5f0d3f
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/...src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptorTest.java b/...src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptorTest.java
@@ -71,10 +71,6 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -522,7 +518,7 @@ public void testGetInvalidResourceNoAcceptHeader() throws Exception {
 		assertEquals(404, status.getStatusLine().getStatusCode());
 
 		assertThat(responseContent).doesNotContainPattern("(?s)<span class='hlTagName'>OperationOutcome</span>.*Unknown resource type 'Foobar' - Server knows how to handle");
-		assertThat(responseContent, (stringContainsInOrder("Unknown resource type 'Foobar'")));
+		assertThat(responseContent).contains("Unknown resource type 'Foobar'");
 		assertEquals(Constants.CT_FHIR_XML_NEW + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
 
 	}
@@ -844,7 +840,7 @@ public void testPrettyPrintDefaultsToTrue() throws Exception {
 		status.close();
 		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
+		assertThat(responseContent).containsSubsequence("<body>", "<pre>", "<div", "</pre>");
 	}
 
 	/**
@@ -880,7 +876,7 @@ public void testPrettyPrintDefaultsToTrueWithExplicitTrue() throws Exception {
 		status.close();
 		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
+		assertThat(responseContent).containsSubsequence("<body>", "<pre>", "<div", "</pre>");
 	}
 
 	@Test
@@ -926,7 +922,7 @@ public void testShowRequest() throws Exception {
 		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
 		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, (containsStringIgnoringCase("Accept")));
+		assertThat(responseContent).containsIgnoringCase("Accept");
 		assertThat(responseContent).doesNotContainIgnoringCase("Content-Type");
 	}
 
@@ -943,8 +939,8 @@ public void testShowRequestAndResponse() throws Exception {
 		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
 		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, (containsStringIgnoringCase("Accept")));
-		assertThat(responseContent, (containsStringIgnoringCase("Content-Type")));
+		assertThat(responseContent).containsIgnoringCase("Accept");
+		assertThat(responseContent).containsIgnoringCase("Content-Type");
 	}
 
 	@Test
@@ -960,7 +956,7 @@ public void testShowResponse() throws Exception {
 		assertEquals(200, status.getStatusLine().getStatusCode());
 		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
 		assertThat(responseContent).doesNotContainIgnoringCase("Accept");
-		assertThat(responseContent, (containsStringIgnoringCase("Content-Type")));
+		assertThat(responseContent).containsIgnoringCase("Content-Type");
 	}
 
 	@Test