DMC/scipro
7
0
Fork 0
Code Issues31 Pull Requests5 Actions Projects1 Releases Wiki Activity

87: Fix test & Reformat code

Browse Source
This commit is contained in:
Tom Zhao 2025-03-26 13:59:13 +01:00
parent 7d92dc4ddb
commit d193663590
2 changed files with 10 additions and 0 deletions
view/src/test/java/se/su/dsv/scipro
SciProTest.java
admin/pages
AdminEditProjectPageTest.java

4
view/src/test/java/se/su/dsv/scipro/SciProTest.java

@ -97,6 +97,7 @@ import se.su.dsv.scipro.project.ProjectNoteService;
import se.su.dsv.scipro.project.ProjectPeopleStatisticsService; import se.su.dsv.scipro.project.ProjectPeopleStatisticsService;
import se.su.dsv.scipro.project.ProjectService; import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.project.pages.ProjectStartPage; import se.su.dsv.scipro.project.pages.ProjectStartPage;
import se.su.dsv.scipro.project.split.SplitOrRestartProjectService;
import se.su.dsv.scipro.projectpartner.ProjectPartnerService; import se.su.dsv.scipro.projectpartner.ProjectPartnerService;
import se.su.dsv.scipro.reflection.ReflectionService; import se.su.dsv.scipro.reflection.ReflectionService;
import se.su.dsv.scipro.report.GradeCalculatorService; import se.su.dsv.scipro.report.GradeCalculatorService;
@ -252,6 +253,9 @@ public abstract class SciProTest {
@Mock @Mock
protected ProjectService projectService; protected ProjectService projectService;
@Mock
protected SplitOrRestartProjectService splitOrRestartProjectService;
@Mock @Mock
protected ResearchAreaService researchAreaService; protected ResearchAreaService researchAreaService;

6
view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java

@ -20,11 +20,13 @@ import se.su.dsv.scipro.mail.MailEvent;
import se.su.dsv.scipro.notifications.dataobject.NotificationSource; import se.su.dsv.scipro.notifications.dataobject.NotificationSource;
import se.su.dsv.scipro.notifications.dataobject.ProjectEvent; import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.split.SplitOrRestartProjectService;
import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.DegreeType; import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys; import se.su.dsv.scipro.util.PageParameterKeys;
import se.su.dsv.scipro.util.Pair;
public class AdminEditProjectPageTest extends SciProTest { public class AdminEditProjectPageTest extends SciProTest {
@ -269,6 +271,10 @@ public class AdminEditProjectPageTest extends SciProTest {
private void startPage(Project project) { private void startPage(Project project) {
if (project.getId() != null) when(projectService.findOne(project.getId())).thenReturn(project); if (project.getId() != null) when(projectService.findOne(project.getId())).thenReturn(project);
lenient()
.when(splitOrRestartProjectService.getSplittableStatus(project.getId() != null ? project.getId() : 0L))
.thenReturn(new Pair<>(SplitOrRestartProjectService.SplittableStatus.OK, project));
PageParameters pp = new PageParameters(); PageParameters pp = new PageParameters();
pp.set(PageParameterKeys.MAP.get(Project.class), project.getId()); pp.set(PageParameterKeys.MAP.get(Project.class), project.getId());
tester.startPage(AdminEditProjectPage.class, pp); tester.startPage(AdminEditProjectPage.class, pp);