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

fixed search and tagging tests

Browse Source
This commit is contained in:
Kai Börnert
2018-11-13 15:59:24 +01:00
parent 1bf7697752
commit 140b9abafc
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java
+32 -1
View File
@@ -17,8 +17,12 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.subject.Subject;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import com.sap.sailing.domain.base.CompetitorWithBoat;
import com.sap.sailing.domain.base.DomainFactory;
@@ -70,12 +74,17 @@ import com.sap.sailing.server.operationaltransformation.RemoveEvent;
import com.sap.sailing.server.operationaltransformation.RemoveLeaderboard;
import com.sap.sailing.server.operationaltransformation.RemoveLeaderboardGroup;
import com.sap.sailing.server.operationaltransformation.RemoveRegatta;
import com.sap.sailing.server.tagging.TaggingServiceImpl;
import com.sap.sse.common.Color;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import com.sap.sse.common.search.KeywordQuery;
import com.sap.sse.common.search.Result;
import com.sap.sse.security.SecurityService;
import com.sap.sse.security.shared.User;
import com.sap.sse.security.shared.WithQualifiedObjectIdentifier;
import com.sap.sse.security.shared.impl.UserGroupImpl;
import com.sap.sse.shared.media.ImageDescriptor;
import com.sap.sse.shared.media.VideoDescriptor;
@@ -100,10 +109,32 @@ public class SearchServiceTest {
private DynamicTrackedRace pfingstbusch470TrackedR2;
private DynamicTrackedRace aalOrcTrackedR1;
private DynamicTrackedRace aalOrcTrackedR2;
private SecurityService securityService;
@Before
public void setUp() {
server = new RacingEventServiceImpl();
UserGroupImpl defaultTenant = new UserGroupImpl(new UUID(0, 1), "defaultTenant");
User currentUser = Mockito.mock(User.class);
securityService = Mockito.mock(SecurityService.class);
SecurityManager securityManager = Mockito.mock(org.apache.shiro.mgt.SecurityManager.class);
Subject fakeSubject = Mockito.mock(Subject.class);
SecurityUtils.setSecurityManager(securityManager);
Mockito.doReturn(fakeSubject).when(securityManager).createSubject(Mockito.any());
Mockito.doReturn(defaultTenant).when(securityService).getDefaultTenant();
Mockito.doReturn(currentUser).when(securityService).getCurrentUser();
Mockito.doReturn(true).when(securityService).hasCurrentUserReadPermission(Mockito.any());
Mockito.doNothing().when(securityService).checkCurrentUserReadPermission(Mockito.any());
Mockito.doReturn(true).when(securityService)
.hasCurrentUserReadPermission(Mockito.any(WithQualifiedObjectIdentifier.class));
Mockito.doReturn(true).when(fakeSubject).isAuthenticated();
server = Mockito.spy(new RacingEventServiceImpl());
Mockito.doReturn(securityService).when(server).getSecurityService();
TaggingServiceImpl taggingServer = Mockito.spy(new TaggingServiceImpl(server));
Mockito.doReturn(taggingServer).when(server).getTaggingService();
List<Event> allEvents = new ArrayList<>();
Util.addAll(server.getAllEvents(), allEvents);
for (final Event e : allEvents) {
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
+5 -1
View File
@@ -18,6 +18,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
@@ -91,10 +92,13 @@ public class TaggingServiceTest {
securityService = new SecurityBundleTestWrapper().initializeSecurityServiceForTesting();
// create & login user
securityService.createSimpleUser(username, email, password, fullName, company, Locale.ENGLISH, null);
subject = SecurityUtils.getSubject();
subject.login(new UsernamePasswordToken(username, password));
// setup tagging service
taggingService = new TaggingServiceImpl(racingService);
taggingService = Mockito.spy(new TaggingServiceImpl(racingService));
Mockito.doReturn(taggingService).when(racingService).getTaggingService();
}
@AfterClass