eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 21:25:38 +00:00
Code Activity

mockito-4.8.1: refactored all tests so they compile with mockito-core 4.8.1

Browse Source
This commit is contained in:
Axel Uhl
2022-12-20 18:25:58 +01:00
parent cd2d0d85ec
commit cbe9204f19
27 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MasterDataImporterMediaTest.java
+3 -3
View File
@@ -4,9 +4,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.same;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/AutomaticRetrackUponCompetitorSetChangeTest.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeoutException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.ArgumentMatchers;
import org.osgi.framework.BundleContext;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
@@ -101,7 +101,7 @@ public class AutomaticRetrackUponCompetitorSetChangeTest {
@Before
public void setUp() throws Exception {
final BundleContext contextMock = mock(BundleContext.class);
when(contextMock.createFilter(Matchers.anyObject())).thenReturn(null);
when(contextMock.createFilter(ArgumentMatchers.any())).thenReturn(null);
mongoDBService = MongoDBService.INSTANCE;
mongoDBService.getDB().drop();
mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(mongoDBService);
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
+3 -3
View File
@@ -39,7 +39,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import com.mongodb.MongoException;
@@ -215,10 +215,10 @@ public class MasterDataImportTest {
Mockito.doReturn(true).when(securityService)
.hasCurrentUserServerPermission(ServerActions.CAN_EXPORT_MASTERDATA);
Mockito.doReturn(true).when(securityService).hasCurrentUserOneOfExplicitPermissions(
Mockito.any(WithQualifiedObjectIdentifier.class), Matchers.<PublicReadableActions> anyVararg());
Mockito.any(WithQualifiedObjectIdentifier.class), ArgumentMatchers.<PublicReadableActions> any());
Mockito.when(securityService.setOwnershipCheckPermissionForObjectCreationAndRevertOnError(Mockito.any(),
Mockito.any(), Mockito.any(), Mockito.any(Callable.class)))
.thenAnswer(i -> i.getArgumentAt(3, Callable.class).call());
.thenAnswer(i -> i.getArgument(3, Callable.class).call());
Mockito.doReturn(true).when(fakeSubject).isAuthenticated();
DomainFactory sourceDomainFactory = new DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER);
DomainObjectFactory dbFactory = PersistenceFactory.INSTANCE.getDomainObjectFactory(MongoDBService.INSTANCE,