Add unit test that tests GenericDefectDojoService

Signed-off-by: Simon Hülkenberg <simon.huelkenberg@iteratec.com>

Author: the-simmon

build.gradle

@@ -15,6 +15,10 @@ repositories {
 dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    testImplementation 'org.springframework:spring-test:5.3.23'
+    testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
+
+
 
     implementation group: 'org.springframework', name: 'spring-web', version: '5.3.9'
     implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'

src/main/java/io/securecodebox/persistence/defectdojo/models/DefectDojoModel.java

@@ -18,7 +18,9 @@
 package io.securecodebox.persistence.defectdojo.models;
 
 import java.util.Map;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode
 abstract public class DefectDojoModel {
   public abstract boolean equalsQueryString(Map<String, Object> queryParams);
 }

src/main/java/io/securecodebox/persistence/defectdojo/service/GenericDefectDojoService.java

@@ -53,12 +53,16 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import lombok.Getter;
 
 abstract public class GenericDefectDojoService<T extends DefectDojoModel> {
     protected DefectDojoConfig defectDojoConfig;
 
     protected ObjectMapper objectMapper;
     protected ObjectMapper searchStringMapper;
+    
+    @Getter
+    protected RestTemplate restTemplate;
 
     public GenericDefectDojoService(DefectDojoConfig config) {
         this.defectDojoConfig = config;
@@ -72,6 +76,8 @@ public GenericDefectDojoService(DefectDojoConfig config) {
         this.searchStringMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         this.searchStringMapper.coercionConfigFor(Engagement.Status.class).setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsNull);
         this.searchStringMapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
+        
+        this.restTemplate = this.setupRestTemplate();
     }
 
 
@@ -95,7 +101,7 @@ private HttpHeaders getDefectDojoAuthorizationHeaders() {
         return headers;
     }
 
-    protected RestTemplate getRestTemplate() {
+    private RestTemplate setupRestTemplate() {
         RestTemplate restTemplate;
 
         if (System.getProperty("http.proxyUser") != null && System.getProperty("http.proxyPassword") != null) {

src/test/java/io/securecodebox/persistence/defectdojo/service/FindingServiceTest.java

@@ -2,16 +2,24 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.securecodebox.persistence.defectdojo.config.DefectDojoConfig;
-import io.securecodebox.persistence.defectdojo.models.Finding;
+import java.net.URISyntaxException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.web.client.MockRestServiceServer;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
+ 
+
+
 
 import static org.junit.jupiter.api.Assertions.*;
+import org.springframework.http.MediaType;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
 
-class FindingServiceTest {
+class FindingServiceTest{
 
     DefectDojoConfig config;
     FindingService underTest;
+    MockRestServiceServer mockServer;
 
     String findingResponse = "{\n" +
             "  \"count\": 1,\n" +
@@ -115,6 +123,7 @@ class FindingServiceTest {
     void setup() {
         config = new DefectDojoConfig("https://defectdojo.example.com", "abc", "test-user", 42);
         underTest = new FindingService(config);
+        mockServer = MockRestServiceServer.createServer(underTest.getRestTemplate());
     }
 
     @Test
@@ -123,4 +132,16 @@ void deserializeList() throws JsonProcessingException {
 
         assertEquals(1, foo.getCount());
     }
+
+    @Test
+    void testSearch() throws JsonProcessingException, URISyntaxException {
+        var url = config.getUrl() + "/api/v2/" + underTest.getUrlPath() + "/?offset=0&limit=100";        
+        mockServer.expect(requestTo(url)).andRespond(withSuccess(findingResponse, MediaType.APPLICATION_JSON));
+        
+        var expected = underTest.deserializeList(findingResponse).getResults();
+        var actual = underTest.search();
+        
+        mockServer.verify();
+        assertIterableEquals(expected, actual);
+    }
 }