Refactor assertions to use assertThat with appropriate matchers (helidon-io#9503)

abdelhak-zaaim · web-flow · commit a5868d613327 · 2024-11-25T11:10:56.000-08:00
diff --git a/inject/tests/resources-inject/src/test/java/io/helidon/inject/tests/inject/interceptor/InterceptorRuntimeTest.java b/inject/tests/resources-inject/src/test/java/io/helidon/inject/tests/inject/interceptor/InterceptorRuntimeTest.java
@@ -59,7 +59,6 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class InterceptorRuntimeTest {
@@ -91,9 +90,10 @@ void createNoArgBasedInterceptorSource() throws Exception {
         assertThat(file.exists(), is(true));
         String java = Files.readString(file.toPath());
         String expected = loadStringFromResource("expected/ximpl-interceptor._java_");
-        assertEquals(
-                expected.replaceFirst("#DATE#", Integer.toString(Calendar.getInstance().get(Calendar.YEAR))),
-                java);
+        assertThat(
+            java,
+            is(expected.replaceFirst("#DATE#", Integer.toString(Calendar.getInstance().get(Calendar.YEAR))))
+        );
     }
 
     @Test
@@ -104,9 +104,10 @@ void createInterfaceBasedInterceptorSource() throws Exception {
         assertThat(file.exists(), is(true));
         String java = Files.readString(file.toPath());
         String expected = loadStringFromResource("expected/yimpl-interceptor._java_");
-        assertEquals(
-                expected.replaceFirst("#DATE#", Integer.toString(Calendar.getInstance().get(Calendar.YEAR))),
-                java);
+        assertThat(
+            java,
+            is(expected.replaceFirst("#DATE#", Integer.toString(Calendar.getInstance().get(Calendar.YEAR))))
+        );
     }
 
     @Test
diff --git a/inject/tools/src/test/java/io/helidon/inject/tools/ActivatorCreatorDefaultTest.java b/inject/tools/src/test/java/io/helidon/inject/tools/ActivatorCreatorDefaultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
@@ -67,7 +66,7 @@ void codegenHelloActivator() {
                 .build();
 
         ToolsException te = assertThrows(ToolsException.class, () -> activatorCreator.createModuleActivators(req));
-        assertEquals("Failed in create", te.getMessage());
+        assertThat(te.getMessage(), is("Failed in create"));
 
         ActivatorCreatorRequest req2 = ActivatorCreatorRequest.builder()
                 .serviceTypeNames(Collections.singletonList(TypeName.create(HelloInjectionWorldImpl.class)))
diff --git a/microprofile/scheduling/src/test/java/io/helidon/microprofile/scheduling/InvalidStateTest.java b/microprofile/scheduling/src/test/java/io/helidon/microprofile/scheduling/InvalidStateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class InvalidStateTest {
@@ -124,7 +125,7 @@ void assertDeploymentException(Class<? extends Throwable> expected, Map<String,
         } catch (AssertionFailedError e) {
             throw e;
         } catch (Throwable e) {
-            assertEquals(expected, e.getClass());
+            assertThat(e, instanceOf(expected));
         }
     }
 }
diff --git a/tests/functional/request-scope-cdi/src/test/java/io/helidon/tests/functional/requestscopecdi/SecretTest.java b/tests/functional/request-scope-cdi/src/test/java/io/helidon/tests/functional/requestscopecdi/SecretTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @HelidonTest
 class SecretTest {
@@ -43,6 +42,6 @@ public void testSecrets() {
                 .get();
         assertThat(r.getStatus(), is(Response.Status.OK.getStatusCode()));
         JsonObject o = r.readEntity(JsonObject.class);
-        assertEquals(o.get("secret1"), o.get("secret2"));
+        assertThat(o.get("secret1"), is(o.get("secret2")));
     }
 }
diff --git a/webclient/tests/http1/src/test/java/io/helidon/webclient/tests/HttpProxyTest.java b/webclient/tests/http1/src/test/java/io/helidon/webclient/tests/HttpProxyTest.java
@@ -40,7 +40,6 @@
 import static io.helidon.http.Method.GET;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -90,7 +89,7 @@ void testDefaultIsSystem1() {
         try {
             ProxySelector.setDefault(ProxySelector.of(new InetSocketAddress(PROXY_HOST, proxyPort)));
             Proxy proxy = Proxy.builder().build();
-            assertEquals(ProxyType.SYSTEM, proxy.type());
+            assertThat(proxy.type(), is(ProxyType.SYSTEM));
             successVerify(proxy, clientHttp1);
         } finally {
             ProxySelector.setDefault(original);
@@ -103,7 +102,7 @@ void testDefaultIsSystem2() {
         try {
             ProxySelector.setDefault(ProxySelector.of(new InetSocketAddress(PROXY_HOST, proxyPort)));
             Proxy proxy = Proxy.builder().build();
-            assertEquals(ProxyType.SYSTEM, proxy.type());
+            assertThat(proxy.type(), is(ProxyType.SYSTEM));
             successVerify(proxy, clientHttp2);
         } finally {
             ProxySelector.setDefault(original);
diff --git a/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/Http2ErrorHandlingWithOutputStreamTest.java b/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/Http2ErrorHandlingWithOutputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,6 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @ServerTest
@@ -141,15 +140,15 @@ static void router(HttpRouting.Builder router) {
     void testOk() {
         var response = request("/");
 
-        assertEquals(200, response.statusCode());
+        assertThat(response.statusCode(), is(200));
         assertThat(response.body(), is("ok"));
     }
 
     @Test
     void testGetOutputStreamThenError_expect_CustomErrorHandlerMessage() {
         var response = request("/get-outputStream");
 
-        assertEquals(418, response.statusCode());
+        assertThat(response.statusCode(), is(418));
         assertThat(response.body(), is("TeaPotIAm"));
         assertThat(response.headers().firstValue(ERROR_HEADER_NAME.lowerCase()), is(Optional.of("err")));
         assertThat(response.headers().firstValue(MAIN_HEADER_NAME.lowerCase()), is(emptyOptional()));
@@ -159,7 +158,7 @@ void testGetOutputStreamThenError_expect_CustomErrorHandlerMessage() {
     void testGetOutputStreamWriteOnceThenError_expect_CustomErrorHandlerMessage() {
         var response = request("/get-outputStream-writeOnceThenError");
 
-        assertEquals(418, response.statusCode());
+        assertThat(response.statusCode(), is(418));
         assertThat(response.body(), is("TeaPotIAm"));
         assertThat(response.headers().firstValue(ERROR_HEADER_NAME.lowerCase()), is(Optional.of("err")));
         assertThat(response.headers().firstValue(MAIN_HEADER_NAME.lowerCase()), is(emptyOptional()));
@@ -185,7 +184,7 @@ void testGetOutputStreamWriteFlushThenError_expect_invalidResponse() {
     void testGetOutputStreamTryWithResourcesThenError_expect_CustomErrorHandlerMessage() {
         var response = request("/get-outputStream-tryWithResources");
 
-        assertEquals(418, response.statusCode());
+        assertThat(response.statusCode(), is(418));
         assertThat(response.body(), is("TeaPotIAm"));
         assertThat(response.headers().firstValue(ERROR_HEADER_NAME.lowerCase()), is(Optional.of("err")));
         assertThat(response.headers().firstValue(MAIN_HEADER_NAME.lowerCase()), is(emptyOptional()));
diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/http/ErrorHandlersTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/http/ErrorHandlersTest.java
@@ -44,7 +44,6 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -138,7 +137,7 @@ public void testCloseConnectionExceptionContainsCause() {
             });
             fail("It is expected a CloseConnectionException");
         } catch (CloseConnectionException e) {
-            assertEquals(OtherException.class, e.getCause().getClass());
+            assertThat(e.getCause(), instanceOf(OtherException.class));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2021 Oracle and/or its affiliates.`
	`2`	`+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -28,7 +28,8 @@`
`28`	`28`	`import org.junit.jupiter.api.Test;`
`29`	`29`	`import org.opentest4j.AssertionFailedError;`
`30`	`30`
`31`		`-import static org.junit.jupiter.api.Assertions.assertEquals;`
	`31`	`+import static org.hamcrest.MatcherAssert.assertThat;`
	`32`	`+import static org.hamcrest.Matchers.instanceOf;`
`32`	`33`	`import static org.junit.jupiter.api.Assertions.fail;`
`33`	`34`
`34`	`35`	`public class InvalidStateTest {`
`@@ -124,7 +125,7 @@ void assertDeploymentException(Class<? extends Throwable> expected, Map<String,`
`124`	`125`	`} catch (AssertionFailedError e) {`
`125`	`126`	`throw e;`
`126`	`127`	`} catch (Throwable e) {`
`127`		`- assertEquals(expected, e.getClass());`
	`128`	`+ assertThat(e, instanceOf(expected));`
`128`	`129`	`}`
`129`	`130`	`}`
`130`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2021, 2023 Oracle and/or its affiliates.`
	`2`	`+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`	`import static org.hamcrest.CoreMatchers.is;`
`29`	`29`	`import static org.hamcrest.MatcherAssert.assertThat;`
`30`		`-import static org.junit.jupiter.api.Assertions.assertEquals;`
`31`	`30`
`32`	`31`	`@HelidonTest`
`33`	`32`	`class SecretTest {`
`@@ -43,6 +42,6 @@ public void testSecrets() {`
`43`	`42`	`.get();`
`44`	`43`	`assertThat(r.getStatus(), is(Response.Status.OK.getStatusCode()));`
`45`	`44`	`JsonObject o = r.readEntity(JsonObject.class);`
`46`		`- assertEquals(o.get("secret1"), o.get("secret2"));`
	`45`	`+ assertThat(o.get("secret1"), is(o.get("secret2")));`
`47`	`46`	`}`
`48`	`47`	`}`