Merge pull request #1599 from eclipse/hcc/upgrade_mockito

upd(mockito): Update the deprecated old mockito-all to mockito-core

reviewed-by: gh@maxhbr.de

Author: ag4ums

backend/pom.xml

@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandlerTest.java

@@ -19,7 +19,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.*;
 

backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandlerTest.java

@@ -26,7 +26,7 @@
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.*;
 
@@ -38,8 +38,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -136,7 +136,7 @@ public void testUpdateProject2_1() throws Exception {
         Project project2 = handler.getProjectById("P2", user1);
         project2.setName("Project2new");
 
-        Mockito.doReturn(RequestStatus.SENT_TO_MODERATOR).when(moderator).updateProject(project2, user1);
+        Mockito.lenient().doReturn(RequestStatus.SENT_TO_MODERATOR).when(moderator).updateProject(project2, user1);
 
         RequestStatus status = handler.updateProject(project2, user1);
 

backend/src-common/src/test/java/org/eclipse/sw360/spdx/SpdxBOMImporterTest.java

@@ -18,9 +18,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.InputStream;
 
@@ -46,15 +46,15 @@ public void before() throws Exception {
              .getClassLoader().getResourceAsStream("bom.spdx.rdf");
 
         when(spdxBOMImporterSink.addProject(any(Project.class))).then(i -> {
-            Project project = i.getArgumentAt(0, Project.class);
+            Project project = i.getArgument(0);
             return new SpdxBOMImporterSink.Response(project.getName() + "-" + project.getVersion());
         });
         when(spdxBOMImporterSink.addRelease(any(Release.class))).then(i -> {
-            Release release = i.getArgumentAt(0, Release.class);
+            Release release = i.getArgument(0);
             return new SpdxBOMImporterSink.Response(release.getName() + "-" + release.getVersion());
         });
         when(spdxBOMImporterSink.addComponent(any(Component.class))).then(i -> {
-            Component component = i.getArgumentAt(0, Component.class);
+            Component component = i.getArgument(0);
             return new SpdxBOMImporterSink.Response(component.getName());
         });
 
@@ -76,17 +76,17 @@ public void testProject() throws  Exception {
         final RequestSummary requestSummary = spdxBOMImporter.importSpdxBOMAsProject(inputStream, attachmentContent);
         assertNotNull(requestSummary);
 
-        verify(spdxBOMImporterSink, times(1)).addProject(Matchers.any());
-        verify(spdxBOMImporterSink, times(3)).addComponent(Matchers.any());
-        verify(spdxBOMImporterSink, times(3)).addRelease(Matchers.any());
+        verify(spdxBOMImporterSink, times(1)).addProject(ArgumentMatchers.any());
+        verify(spdxBOMImporterSink, times(3)).addComponent(ArgumentMatchers.any());
+        verify(spdxBOMImporterSink, times(3)).addRelease(ArgumentMatchers.any());
     }
 
     @Test
     public void testRelease() throws  Exception {
         final RequestSummary requestSummary = spdxBOMImporter.importSpdxBOMAsRelease(inputStream, attachmentContent);
         assertNotNull(requestSummary);
 
-        verify(spdxBOMImporterSink, times(4)).addComponent(Matchers.any());
-        verify(spdxBOMImporterSink, times(4)).addRelease(Matchers.any());
+        verify(spdxBOMImporterSink, times(4)).addComponent(ArgumentMatchers.any());
+        verify(spdxBOMImporterSink, times(4)).addRelease(ArgumentMatchers.any());
     }
 }

backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java

@@ -31,7 +31,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -45,8 +45,8 @@
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ProjectDatabaseHandlerTest.java

@@ -40,7 +40,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import javax.xml.crypto.Data;
 import java.util.*;

backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnectorTest.java

@@ -19,7 +19,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.*;
 

backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/FossologyHandlerLocalhostIntegrationTest.java

@@ -47,7 +47,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 /**

backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandlerTest.java

@@ -29,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.when;
 

backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/TestHelper.java

@@ -31,8 +31,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.number.OrderingComparison.greaterThan;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 /**
@@ -83,7 +83,7 @@ public AttachmentContent get(String attachmentContentId){
         public AttachmentContentStore put(String filename, String fileContent) throws TException {
             AttachmentContent attachmentContent = makeAttachmentContent(filename);
             store.put(attachmentContent.getId(), attachmentContent);
-            when(connectorMock.getAttachmentStream(eq(attachmentContent), anyObject(), anyObject())).thenReturn(new ReaderInputStream(new StringReader(fileContent)));
+            when(connectorMock.getAttachmentStream(eq(attachmentContent), any(), any())).thenReturn(new ReaderInputStream(new StringReader(fileContent)));
             return this;
         }
 
@@ -93,7 +93,7 @@ public AttachmentContentStore put(String filename) throws TException {
 
         public AttachmentContentStore put(AttachmentContent attachmentContent) throws TException {
             store.put(attachmentContent.getId(), attachmentContent);
-            when(connectorMock.getAttachmentStream(eq(attachmentContent), anyObject(), anyObject())).thenReturn(makeAttachmentContentStream(attachmentContent.getFilename()));
+            when(connectorMock.getAttachmentStream(eq(attachmentContent), any(), any())).thenReturn(makeAttachmentContentStream(attachmentContent.getFilename()));
             return this;
         }
     }