From d1936635907d39326192b78027d4a86c7134b214 Mon Sep 17 00:00:00 2001 From: Tom Zhao <tom.zhao@dsv.su.se> Date: Wed, 26 Mar 2025 13:59:13 +0100 Subject: [PATCH] 87: Fix test & Reformat code --- view/src/test/java/se/su/dsv/scipro/SciProTest.java | 4 ++++ .../su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/view/src/test/java/se/su/dsv/scipro/SciProTest.java b/view/src/test/java/se/su/dsv/scipro/SciProTest.java index d83e739cb0..78c2b93168 100755 --- a/view/src/test/java/se/su/dsv/scipro/SciProTest.java +++ b/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.ProjectService; 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.reflection.ReflectionService; import se.su.dsv.scipro.report.GradeCalculatorService; @@ -252,6 +253,9 @@ public abstract class SciProTest { @Mock protected ProjectService projectService; + @Mock + protected SplitOrRestartProjectService splitOrRestartProjectService; + @Mock protected ResearchAreaService researchAreaService; diff --git a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java index fca1614838..65ceb1bb27 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java +++ b/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.ProjectEvent; 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.system.DegreeType; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.util.PageParameterKeys; +import se.su.dsv.scipro.util.Pair; public class AdminEditProjectPageTest extends SciProTest { @@ -269,6 +271,10 @@ public class AdminEditProjectPageTest extends SciProTest { private void startPage(Project 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(); pp.set(PageParameterKeys.MAP.get(Project.class), project.getId()); tester.startPage(AdminEditProjectPage.class, pp);