#36 Test that default implementations pass an empty options array

Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>

Author: Weltraumschaf

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

@@ -55,17 +55,6 @@ void generateApiUrl() {
         assertThat(sut.generateApiUrl("foo"), is("http://localhost/api/v2/foo/"));
     }
 
-    @Test
-    @Disabled("Fails due to network side effect")
-    void importScan_withoutOptionsShouldPassEmptyMap() {
-        final var spiedSut = spy(sut);
-
-        sut.importScan(new ScanFile("content"),42L, 43L, "1.1.2023", ScanType.AUDIT_JS_SCAN, 23L);
-
-        verify(spiedSut, times(1))
-            .importScan(new ScanFile("content"),42L, 43L, "1.1.2023", ScanType.AUDIT_JS_SCAN, 23L, new HashMap<>());
-    }
-
     @Test
     @Disabled("Not implemented yet")
     void importScan_shouldPassImportScanAsEndpoint() {
@@ -76,11 +65,6 @@ void importScan_shouldPassImportScanAsEndpoint() {
     void importScan_shouldPassEngagementIdAsEngagement() {
     }
 
-    @Test
-    @Disabled("Not implemented yet")
-    void reimportScan_withoutOptionsShouldPassEmptyMap() {
-    }
-
     @Test
     @Disabled("Not implemented yet")
     void reimportScan_shouldPassReimportScanAsEndpoint() {

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

@@ -1,17 +1,29 @@
 package io.securecodebox.persistence.defectdojo.service;
 
+import io.securecodebox.persistence.defectdojo.ScanType;
 import io.securecodebox.persistence.defectdojo.config.DefectDojoConfig;
+import io.securecodebox.persistence.defectdojo.models.ScanFile;
+import lombok.Getter;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.junit.jupiter.api.Assertions.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.times;
 
 /**
  * Tests for {@link ImportScanService}.
  */
 class ImportScanServiceTest {
 
+    private final ImportScanServiceStub sut = new ImportScanServiceStub();
+
     @Test
     void createDefault_throwsExceptionIfNullPassedIn() {
         assertThrows(NullPointerException.class, () -> {
@@ -35,4 +47,60 @@ void createDefault_passesConfig() {
             () -> assertThat(sut.getDefectDojoUrl(), is(config.getUrl())),
             () -> assertThat(sut.getDefectDojoApiKey(), is(config.getApiKey())));
     }
+
+    @Test
+    void importScan_withoutOptionsShouldPassEmptyMap() {
+        assertThat(sut.getOptions(), is(nullValue()));
+
+        sut.importScan(new ScanFile("content"),42L, 43L, "1.1.2023", ScanType.AUDIT_JS_SCAN, 23L);
+
+        assertThat(sut.getOptions(), equalTo(Collections.EMPTY_MAP));
+    }
+
+    @Test
+    void importScan_withoutOptionsShouldPassModifiableMap() {
+        assertThat(sut.getOptions(), is(nullValue()));
+
+        sut.importScan(new ScanFile("content"),42L, 43L, "1.1.2023", ScanType.AUDIT_JS_SCAN, 23L);
+        sut.getOptions().put("foo", "bar");
+
+        assertThat(sut.getOptions(), hasEntry("foo", "bar"));
+    }
+
+    @Test
+    void reimportScan_withoutOptionsShouldPassEmptyMap() {
+        assertThat(sut.getOptions(), is(nullValue()));
+
+        sut.reimportScan(new ScanFile("content"),42L, 43L, "1.1.2023", ScanType.AUDIT_JS_SCAN, 23L);
+
+        assertThat(sut.getOptions(), equalTo(Collections.EMPTY_MAP));
+    }
+
+    @Test
+    void reimportScan_withoutOptionsShouldPassModifiableMap() {
+        assertThat(sut.getOptions(), is(nullValue()));
+
+        sut.reimportScan(new ScanFile("content"),42L, 43L, "1.1.2023", ScanType.AUDIT_JS_SCAN, 23L);
+        sut.getOptions().put("foo", "bar");
+
+        assertThat(sut.getOptions(), hasEntry("foo", "bar"));
+    }
+
+    private static final class ImportScanServiceStub implements ImportScanService {
+
+        @Getter
+        private Map<String, String> options;
+
+        @Override
+        public ImportScanResponse importScan(ScanFile scanFile, long engagementId, long lead, String currentDate, ScanType scanType, long testType, Map<String, String> options) {
+            this.options = options;
+            return null;
+        }
+
+        @Override
+        public ImportScanResponse reimportScan(ScanFile scanFile, long testId, long lead, String currentDate, ScanType scanType, long testType, Map<String, String> options) {
+            this.options = options;
+            return null;
+        }
+    }
 }