AMP-135 - fixed test issues.

Author: madhusudan-yasa

src/test/java/uk/gov/hmcts/cp/integration/ExampleControllerIntegrationTest.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.cp.integration;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,13 +15,24 @@ class ExampleControllerIntegrationTest extends IntegrationTestBase {
     @Autowired
     ExampleRepository exampleRepository;
 
+    private ExampleEntity entity;
+
+    @BeforeEach
+    void setup() {
+        entity = exampleRepository.save(
+                ExampleEntity.builder()
+                        .exampleText("Welcome to service-hmcts-springboot-template")
+                        .build()
+        );
+    }
+
     @Transactional
     @Test
     void endpoint_should_return_ok() throws Exception {
-        ExampleEntity exampleEntity = insertExample("Some random text");
-        mockMvc.perform(get("/example/{id}", exampleEntity.getId()))
+        mockMvc.perform(get("/example/{id}", entity.getId()))
                 .andDo(print())
                 .andExpect(status().isOk());
     }
 
+
 }

src/test/java/uk/gov/hmcts/cp/integration/RootControllerIntegrationTest.java

@@ -1,15 +1,33 @@
 package uk.gov.hmcts.cp.integration;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import uk.gov.hmcts.cp.entities.ExampleEntity;
+import uk.gov.hmcts.cp.repositories.ExampleRepository;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 class RootControllerIntegrationTest extends IntegrationTestBase {
 
+    @Autowired
+    ExampleRepository exampleRepository;
+
+    private ExampleEntity entity;
+
+    @BeforeEach
+    void setup() {
+        entity = exampleRepository.save(
+                ExampleEntity.builder()
+                        .exampleText("Welcome to service-hmcts-springboot-template")
+                        .build()
+        );
+    }
+
     @Test
     void root_endpoint_should_be_ok() throws Exception {
-        mockMvc.perform(get("/example/{example_id}", 1))
+        mockMvc.perform(get("/example/{example_id}", entity.getId()))
                 .andExpect(status().isOk());
     }
 }

src/test/java/uk/gov/hmcts/cp/integration/TracingIntegrationTest.java

@@ -6,10 +6,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import uk.gov.hmcts.cp.entities.ExampleEntity;
+import uk.gov.hmcts.cp.repositories.ExampleRepository;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -37,12 +40,21 @@ class TracingIntegrationTest extends IntegrationTestBase {
 
     private final PrintStream originalStdOut = System.out;
 
+    @Autowired
+    ExampleRepository exampleRepository;
+
+    private ExampleEntity entity;
+
     @BeforeEach
-    public void setUp() {
-        // Manually populate MDC with trace information similar to TracingFilter
+    void setup() {
         MDC.put(TRACE_ID_FIELD, TEST_TRACE_ID_1);
         MDC.put(SPAN_ID_FIELD, TEST_SPAN_ID_1);
         MDC.put("applicationName", springApplicationName);
+        entity = exampleRepository.save(
+                ExampleEntity.builder()
+                        .exampleText("Welcome to service-hmcts-springboot-template")
+                        .build()
+        );
     }
 
     @AfterEach
@@ -86,7 +98,7 @@ private ByteArrayOutputStream captureStdOut() {
     private MvcResultHelper performRequestAndCaptureLogs(final String path, final String traceId, final String spanId) throws Exception {
         final ByteArrayOutputStream capturedStdOut = captureStdOut();
 
-        MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get(path, 1);
+        MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get(path, entity.getId());
         if (traceId != null) {
             requestBuilder = requestBuilder.header(TRACE_ID_FIELD, traceId);
         }
@@ -130,7 +142,7 @@ private void assertTracingFields(final Map<String, Object> log, final String exp
 
     private void assertCommonLogFields(final Map<String, Object> log) {
         assertThat(log.get("logger_name")).isEqualTo("uk.gov.hmcts.cp.controllers.ExampleController");
-        assertThat(log.get("message")).isEqualTo("getExampleByExampleId example for 1");
+        assertThat(log.get("message")).isEqualTo("getExampleByExampleId example for "+entity.getId());
     }
 
     private void assertResponseHeaders(final MvcResult result, final String expectedTraceId, final String expectedSpanId) {