Merge remote-tracking branch 'origin/feature/defect-dojo-integration' into feature/defect-dojo-generic-import

Author: Daniel Patanin

scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java

@@ -114,7 +114,7 @@ private void checkToolTypes() {
         }
     }
 
-    private void checkConnection() throws DefectDojoUnreachableException {
+    void checkConnection() throws DefectDojoUnreachableException {
         try {
             final URLConnection connection = new URL(defectDojoUrl).openConnection();
             connection.connect();

scb-persistenceproviders/defectdojo-persistenceprovider/src/test/java/io/securecodebox/persistence/DefectDojoPersistenceProviderTest.java

@@ -26,9 +26,7 @@
 import static io.securecodebox.model.findings.Severity.INFORMATIONAL;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefectDojoPersistenceProviderTest {
@@ -40,7 +38,7 @@ public class DefectDojoPersistenceProviderTest {
     DescriptionGenerator descriptionGenerator;
 
     @InjectMocks
-    DefectDojoPersistenceProvider persistenceProvider;
+    DefectDojoPersistenceProvider persistenceProvider = spy(new DefectDojoPersistenceProvider());
 
     Map<String, String> metaData;
 
@@ -51,6 +49,7 @@ public void setUp() {
         MockitoAnnotations.initMocks(this);
         persistenceProvider.setClock(Clock.fixed(Instant.ofEpochSecond(1546876203), ZoneId.systemDefault()));
         when(descriptionGenerator.generate(any())).thenReturn("Foobar Description");
+        doNothing().when(persistenceProvider).checkConnection();
 
         persistenceProvider.defectDojoUrl = "http://localhost:8000";
         defectDojoService.defectDojoUrl = "http://localhost:8000";

scb-persistenceproviders/defectdojo-persistenceprovider/src/test/java/io/securecodebox/persistence/DescriptionGeneratorTest.java

@@ -19,7 +19,7 @@ public class DescriptionGeneratorTest {
     @Before
     public void setUp() {
         descriptionGenerator = new DescriptionGenerator();
-        descriptionGenerator.setClock(Clock.fixed(Instant.ofEpochSecond(1546876203), ZoneId.systemDefault()));
+        descriptionGenerator.setClock(Clock.fixed(Instant.ofEpochSecond(1546876203), ZoneId.of("Europe/Berlin")));
         securityTest = new SecurityTest();
     }