Move cloud-logging from JUnit4 to JUnit5

cf-java-logging-support-core/pom.xml

@@ -21,11 +21,23 @@
             <version>${logback.version}</version>
             <scope>test</scope>
         </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>${hamcrest.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
     </dependencies>
 

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/LogOptionalFieldsSettingsTest.java

@@ -1,14 +1,14 @@
 package com.sap.hcp.cf.logging.common;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.sap.hcp.cf.logging.common.helper.Environment;
 
+import org.junit.jupiter.api.Test;
+
 public class LogOptionalFieldsSettingsTest {
 
     @Test
@@ -21,10 +21,10 @@ public void testLogOptionalFieldsSettingsTrue() {
 
         LogOptionalFieldsSettings settings = new LogOptionalFieldsSettings(mockEnvironment, "NameOfInvokingClass");
 
-        assertTrue("Wrapping LOG_SENSITIVE_CONNECTION_DATA failed", settings.isLogSensitiveConnectionData());
-        assertTrue("Wrapping LOG_REMOTE_USER failed", settings.isLogRemoteUserField());
-        assertTrue("Wrapping LOG_REFERER failed", settings.isLogRefererField());
-        assertTrue("Wrapping LOG_SSL_HEADERS failed", settings.isLogSslHeaders());
+        assertTrue(settings.isLogSensitiveConnectionData(), "Wrapping LOG_SENSITIVE_CONNECTION_DATA failed");
+        assertTrue(settings.isLogRemoteUserField(), "Wrapping LOG_REMOTE_USER failed");
+        assertTrue(settings.isLogRefererField(), "Wrapping LOG_REFERER failed");
+        assertTrue(settings.isLogSslHeaders(), "Wrapping LOG_SSL_HEADERS failed");
     }
 
     @Test
@@ -37,10 +37,10 @@ public void testLogOptionalFieldsSettingsFalse() {
 
         LogOptionalFieldsSettings settings = new LogOptionalFieldsSettings(mockEnvironment, "NameOfInvokingClass");
 
-        assertFalse("Wrapping LOG_SENSITIVE_CONNECTION_DATA failed", settings.isLogSensitiveConnectionData());
-        assertFalse("Wrapping LOG_REMOTE_USER failed", settings.isLogRemoteUserField());
-        assertFalse("Wrapping LOG_REFERER failed", settings.isLogRefererField());
-        assertFalse("Wrapping LOG_SSL_HEADERS failed", settings.isLogSslHeaders());
+        assertFalse(settings.isLogSensitiveConnectionData(), "Wrapping LOG_SENSITIVE_CONNECTION_DATA failed");
+        assertFalse(settings.isLogRemoteUserField(), "Wrapping LOG_REMOTE_USER failed");
+        assertFalse(settings.isLogRefererField(), "Wrapping LOG_REFERER failed");
+        assertFalse(settings.isLogSslHeaders(), "Wrapping LOG_SSL_HEADERS failed");
     }
 
     @Test
@@ -52,10 +52,10 @@ public void testLogOptionalFieldsSettingsInvalidEnvVariable() {
         when(mockEnvironment.getVariable(Environment.LOG_SSL_HEADERS)).thenReturn("someInvalidString");
 
         LogOptionalFieldsSettings settings = new LogOptionalFieldsSettings(mockEnvironment, "NameOfInvokingClass");
-        assertFalse("Wrapping LOG_SENSITIVE_CONNECTION_DATA failed", settings.isLogSensitiveConnectionData());
-        assertFalse("Wrapping LOG_REMOTE_USER failed", settings.isLogRemoteUserField());
-        assertFalse("Wrapping LOG_REFERER failed", settings.isLogRefererField());
-        assertFalse("Wrapping LOG_SSL_HEADERS failed", settings.isLogSslHeaders());
+        assertFalse(settings.isLogSensitiveConnectionData(), "Wrapping LOG_SENSITIVE_CONNECTION_DATA failed");
+        assertFalse(settings.isLogRemoteUserField(), "Wrapping LOG_REMOTE_USER failed");
+        assertFalse(settings.isLogRefererField(), "Wrapping LOG_REFERER failed");
+        assertFalse(settings.isLogSslHeaders(), "Wrapping LOG_SSL_HEADERS failed");
     }
 
     @Test
@@ -67,10 +67,10 @@ public void testLogOptionalFieldsSettingsEmptyString() {
         when(mockEnvironment.getVariable(Environment.LOG_SSL_HEADERS)).thenReturn("");
 
         LogOptionalFieldsSettings settings = new LogOptionalFieldsSettings(mockEnvironment, "NameOfInvokingClass");
-        assertFalse("Wrapping LOG_SENSITIVE_CONNECTION_DATA failed", settings.isLogSensitiveConnectionData());
-        assertFalse("Wrapping LOG_REMOTE_USER failed", settings.isLogRemoteUserField());
-        assertFalse("Wrapping LOG_REFERER failed", settings.isLogRefererField());
-        assertFalse("Wrapping LOG_SSL_HEADERS failed", settings.isLogSslHeaders());
+        assertFalse(settings.isLogSensitiveConnectionData(), "Wrapping LOG_SENSITIVE_CONNECTION_DATA failed");
+        assertFalse(settings.isLogRemoteUserField(), "Wrapping LOG_REMOTE_USER failed");
+        assertFalse(settings.isLogRefererField(), "Wrapping LOG_REFERER failed");
+        assertFalse(settings.isLogSslHeaders(), "Wrapping LOG_SSL_HEADERS failed");
     }
 
     @Test
@@ -83,10 +83,10 @@ public void testLogOptionalFieldsSettingsEmptyEnvVariable() {
 
         LogOptionalFieldsSettings settings = new LogOptionalFieldsSettings(mockEnvironment, "NameOfInvokingClass");
 
-        assertFalse("Wrapping LOG_SENSITIVE_CONNECTION_DATA failed", settings.isLogSensitiveConnectionData());
-        assertFalse("Wrapping LOG_REMOTE_USER failed", settings.isLogRemoteUserField());
-        assertFalse("Wrapping LOG_REFERER failed", settings.isLogRefererField());
-        assertFalse("Wrapping LOG_SSL_HEADERS failed", settings.isLogSslHeaders());
+        assertFalse(settings.isLogSensitiveConnectionData(), "Wrapping LOG_SENSITIVE_CONNECTION_DATA failed");
+        assertFalse(settings.isLogRemoteUserField(), "Wrapping LOG_REMOTE_USER failed");
+        assertFalse(settings.isLogRefererField(), "Wrapping LOG_REFERER failed");
+        assertFalse(settings.isLogSslHeaders(), "Wrapping LOG_SSL_HEADERS failed");
     }
 
     @Test
@@ -99,10 +99,10 @@ public void testLogOptionalFieldsWithMixedSettings() {
 
         LogOptionalFieldsSettings settings = new LogOptionalFieldsSettings(mockEnvironment, "NameOfInvokingClass");
 
-        assertFalse("Wrapping LOG_SENSITIVE_CONNECTION_DATA failed", settings.isLogSensitiveConnectionData());
-        assertTrue("Wrapping LOG_REMOTE_USER failed", settings.isLogRemoteUserField());
-        assertTrue("Wrapping LOG_REFERER failed", settings.isLogRefererField());
-        assertFalse("Wrapping LOG_SSL_HEADERS failed", settings.isLogSslHeaders());
+        assertFalse(settings.isLogSensitiveConnectionData(), "Wrapping LOG_SENSITIVE_CONNECTION_DATA failed");
+        assertTrue(settings.isLogRemoteUserField(), "Wrapping LOG_REMOTE_USER failed");
+        assertTrue(settings.isLogRefererField(), "Wrapping LOG_REFERER failed");
+        assertFalse(settings.isLogSslHeaders(), "Wrapping LOG_SSL_HEADERS failed");
     }
 
 }

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/TestDoubleValue.java

@@ -1,9 +1,9 @@
 package com.sap.hcp.cf.logging.common;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDoubleValue {
 

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/TestVcapEnvReader.java

@@ -1,12 +1,12 @@
 package com.sap.hcp.cf.logging.common;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestVcapEnvReader {
 

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/converter/LineWriterTest.java

@@ -1,14 +1,15 @@
 package com.sap.hcp.cf.logging.common.converter;
 
-import static org.hamcrest.Matchers.contains;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.List;
-
-import org.junit.Test;
-
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
 public class LineWriterTest {
 
     @Test
@@ -29,11 +30,13 @@ public void fillLinesWithIgnoredOffsetAndLength() throws IOException {
         assertThat(lines.getLines(), contains("first line", "second line"));
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void readNonexistentEntry() throws IOException {
-        LineWriter lines = new LineWriter();
-        lines.close();
-        lines.getLines().get(10);
+    @Test
+    public void readNonexistentEntry() {
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            LineWriter lines = new LineWriter();
+            lines.close();
+            lines.getLines().get(10);
+        });
     }
 
     @Test

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/converter/StacktraceLinesTest.java

@@ -1,18 +1,20 @@
 package com.sap.hcp.cf.logging.common.converter;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
 public class StacktraceLinesTest {
 
     final List<String> lines = new ArrayList<String>(Arrays.asList("this is the first line", "this is the second line",
@@ -46,9 +48,10 @@ public void testStacktraceLinesGetFirstLinesUnderestimatingSizeOfFirstLine() {
         StacktraceLines stackTraceLines = new StacktraceLines(lines);
         List<String> extractedLines = stackTraceLines.getFirstLines(maxSizeOfFirstPart);
         assertThat(extractedLines.size(), equalTo(0));
-    }
-
-    @Test(timeout = 1000)
+    }
+
+    @Test
+    @Timeout(value = 1000, unit = TimeUnit.MILLISECONDS)
     public void testStacktraceLinesGetFirstLinesOverEstimatingTotalSizeOfLines() {
         int maxSizeOfFirstPart = 2500;
         StacktraceLines stackTraceLines = new StacktraceLines(lines);
@@ -76,9 +79,10 @@ public void testStacktraceLinesGetLastLinesUnderestimatingSizeOfLastLine() {
         StacktraceLines stackTraceLines = new StacktraceLines(lines);
         List<String> extractedLines = stackTraceLines.getLastLines(maxSizeOfLastPart);
         assertThat(extractedLines.size(), equalTo(0));
-    }
-
-    @Test(timeout = 1000)
+    }
+
+    @Test
+    @Timeout(value = 1000, unit = TimeUnit.MILLISECONDS)
     public void testStacktraceLinesGetLastLinesOverEstimatingTotalSizeOfLines() {
         int maxSizeOfFirstPart = 2500;
         StacktraceLines stackTraceLines = new StacktraceLines(lines);

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/request/HttpHeadersTest.java

@@ -7,16 +7,16 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.sap.hcp.cf.logging.common.Defaults;
 import com.sap.hcp.cf.logging.common.Fields;
 import com.sap.hcp.cf.logging.common.LogContext;
 
 public class HttpHeadersTest {
 
-    @Before
+    @BeforeEach
     public void resetLogContext() {
         LogContext.resetContextFields();
         HttpHeaders.propagated().stream().map(HttpHeader::getField).forEach(LogContext::remove);

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/request/RequestRecordBuilderTest.java

@@ -1,14 +1,14 @@
 package com.sap.hcp.cf.logging.common.request;
 
 import static com.sap.hcp.cf.logging.common.request.RequestRecordBuilder.requestRecord;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.jr.ob.JSON;
 import com.fasterxml.jackson.jr.ob.JSONObjectException;
+import org.junit.jupiter.api.Test;
+
 import com.sap.hcp.cf.logging.common.Defaults;
 
 public class RequestRecordBuilderTest {

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/request/RequestRecordTest.java

@@ -13,8 +13,8 @@
 import java.time.Instant;
 import java.time.ZoneOffset;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.MDC;
 
 import com.fasterxml.jackson.jr.ob.JSON;
@@ -31,7 +31,7 @@ public class RequestRecordTest {
 
     private RequestRecord rrec;
 
-    @Before
+    @BeforeEach
     public void resetRequestRecordClock() {
         setRequestRecordClock(FIXED_CLOCK_EPOCH);
     }

cf-java-logging-support-jersey/pom.xml

@@ -16,6 +16,8 @@
 
 	<properties>
 		<jersey.version>2.22.1</jersey.version>
+		<jaxb.version>2.3.0</jaxb.version>
+		<javax.activation.version>1.1.1</javax.activation.version>
 	</properties>
 
 	<dependencies>
@@ -48,30 +50,34 @@
 			<version>${jersey.version}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
 			<version>${jersey.version}</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+		  <groupId>org.hamcrest</groupId>
+		  <artifactId>hamcrest</artifactId>
+		  <version>${hamcrest.version}</version>
+		  <scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.3.0</version>
+			<version>${jaxb.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>2.3.0</version>
+			<version>${jaxb.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax.activation</groupId>
 			<artifactId>activation</artifactId>
-			<version>1.1.1</version>
+			<version>${javax.activation.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- we need our log4j2 implementation for testing! -->

cf-java-logging-support-jersey/src/test/java/com/sap/hcp/cf/logging/jersey/filter/AbstractFilterTest.java

@@ -6,7 +6,6 @@
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.After;
 import org.junit.Before;
-
 import com.fasterxml.jackson.jr.ob.JSON;
 
 public abstract class AbstractFilterTest extends JerseyTest {

cf-java-logging-support-jersey/src/test/java/com/sap/hcp/cf/logging/jersey/filter/RequestMetricsContainerFilterTest.java

@@ -1,10 +1,10 @@
 package com.sap.hcp.cf.logging.jersey.filter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
 
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Response;