Refactory code for test

Author: gafawork

pom.xml

@@ -166,13 +166,20 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- Mocking framework -->
+        <!-- Mocking framework
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
+        -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.17.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

src/test/java/com/searchcode/app/service/AdminRouteServiceTest.java

@@ -13,7 +13,7 @@
 import java.util.*;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 public class AdminRouteServiceTest extends TestCase {

src/test/java/com/searchcode/app/service/ApiRouteServiceTest.java

@@ -12,17 +12,17 @@
 import com.searchcode.app.util.LoggerWrapper;
 import com.searchcode.app.util.UniqueRepoQueue;
 import junit.framework.TestCase;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import spark.Request;
 
 import java.util.HashMap;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
@@ -159,7 +159,7 @@ public void testRepositoryIndexApiNoRepositorySupplied() {
         Request mockRequest = mock(Request.class);
         SQLiteRepo mockSQLiteRepo = mock(SQLiteRepo.class);
 
-        when(mockJobService.forceEnqueue(Matchers.anyObject())).thenReturn(true);
+        when(mockJobService.forceEnqueue(ArgumentMatchers.any())).thenReturn(true);
         when(mockSQLiteRepo.getRepoByUrl(anyString())).thenReturn(Optional.empty());
 
         ApiRouteService apiRouteService = new ApiRouteService(null, mockJobService, mockSQLiteRepo, null, null, null, new Helpers(), new LoggerWrapper());
@@ -175,7 +175,7 @@ public void testRepositoryIndexApiNoMatchingRepo() {
         Request mockRequest = mock(Request.class);
         SQLiteRepo mockSQLiteRepo = mock(SQLiteRepo.class);
 
-        when(mockJobService.forceEnqueue(Matchers.anyObject())).thenReturn(true);
+        when(mockJobService.forceEnqueue(ArgumentMatchers.any())).thenReturn(true);
         when(mockRequest.queryParams("repoUrl")).thenReturn("test");
         when(mockSQLiteRepo.getRepoByUrl(any())).thenReturn(Optional.empty());
 
@@ -192,7 +192,7 @@ public void testRepositoryIndexMatchingRepo() {
         Request mockRequest = mock(Request.class);
         SQLiteRepo mockSQLiteRepo = mock(SQLiteRepo.class);
 
-        when(mockJobService.forceEnqueue(Matchers.<RepoResult>anyObject())).thenReturn(true);
+        when(mockJobService.forceEnqueue(ArgumentMatchers.<RepoResult>any())).thenReturn(true);
         when(mockRequest.queryParams("repoUrl")).thenReturn("http://test/");
         when(mockSQLiteRepo.getRepoByUrl("http://test/")).thenReturn(Optional.of(new RepoResult()));
 
@@ -661,7 +661,7 @@ public void testRepoAddNoAuthSucessful() {
 
         assertThat(apiResponse.getMessage()).isEqualTo("added repository successfully");
         assertThat(apiResponse.isSucessful()).isTrue();
-        verify(mockSQLiteRepo, times(1)).saveRepo(Matchers.anyObject());
+        verify(mockSQLiteRepo, times(1)).saveRepo(ArgumentMatchers.any());
     }
 
     public void testRepoAddAuthPubMissing() {
@@ -770,6 +770,6 @@ public void testRepoAddAuthValidSigned() {
 
         assertThat(apiResponse.getMessage()).isEqualTo("added repository successfully");
         assertThat(apiResponse.isSucessful()).isTrue();
-        verify(mockSQLiteRepo, times(1)).saveRepo(Matchers.anyObject());
+        verify(mockSQLiteRepo, times(1)).saveRepo(ArgumentMatchers.any());
     }
 }

src/test/java/com/searchcode/app/service/ApiServiceTest.java

@@ -7,7 +7,7 @@
 
 import java.util.Optional;
 
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -115,7 +115,7 @@ public void testValidateRequestInCorrectHmacMethodSha512() {
 
     public void testCreateKeys() {
         var apiMock = mock(Api.class);
-        when(apiMock.saveApi(anyObject())).thenReturn(true);
+        when(apiMock.saveApi(any())).thenReturn(true);
 
         var service = new ApiService(apiMock, new Helpers());
 

src/test/java/com/searchcode/app/service/DataServiceTest.java

@@ -5,7 +5,7 @@
 import junit.framework.TestCase;
 import org.mockito.Mockito;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/searchcode/app/util/HelpersTest.java

@@ -10,7 +10,7 @@
 import java.util.*;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 public class HelpersTest extends TestCase {