DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests9 Actions1 Projects1 Releases Wiki Activity

97: Fix UI-test

Browse Source
This commit is contained in:
Tom Zhao 2025-02-19 13:38:10 +01:00
parent 3b201f6de2
commit b1d8ad7a2e
3 changed files with 18 additions and 10 deletions
view/src
main/java/se/su/dsv/scipro/grading
TemplatePanel.java
test/java/se/su/dsv/scipro
SciProTest.java
grading
TemplatePanelTest.java

2
view/src/main/java/se/su/dsv/scipro/grading/TemplatePanel.java

@ -130,11 +130,13 @@ public class TemplatePanel extends Panel {
list.get(i).setUpperLimit(gradeLimits[i - 1].getLowerLimit() - 1);
}
if (!list.isEmpty()) {
list
.get(0)
.setUpperLimit(
grt.getCriteria().stream().map(GradingCriterionTemplate::getMaxPoints).reduce(0, Integer::sum)
);
}
return list;
}

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

@ -52,11 +52,7 @@ import se.su.dsv.scipro.forum.ProjectForumService;
import se.su.dsv.scipro.gdpr.Reporter;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;
import se.su.dsv.scipro.grading.ExaminerTimelineService;
import se.su.dsv.scipro.grading.GradingService;
import se.su.dsv.scipro.grading.NationalSubjectCategoryService;
import se.su.dsv.scipro.grading.PublicationMetadata;
import se.su.dsv.scipro.grading.PublicationMetadataService;
import se.su.dsv.scipro.grading.*;
import se.su.dsv.scipro.group.GroupFacade;
import se.su.dsv.scipro.group.GroupService;
import se.su.dsv.scipro.mail.MailEventService;
@ -306,6 +302,9 @@ public abstract class SciProTest {
@Mock
protected GradingReportService gradingReportService;
@Mock
protected GradingReportTemplateService gradingReportTemplateService;
@Mock
protected OppositionReportService oppositionReportService;

7
view/src/test/java/se/su/dsv/scipro/grading/TemplatePanelTest.java

@ -8,8 +8,10 @@ import java.time.LocalDate;
import java.time.Month;
import org.apache.wicket.model.Model;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.report.GradingReportTemplate;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
@ -78,6 +80,11 @@ public class TemplatePanelTest extends SciProTest {
.build();
project.setStartDate(LocalDate.of(2017, Month.MAY, 29));
project.setCredits(credits);
Mockito.when(gradingReportTemplateService.getCurrentTemplate(project.getProjectType())).thenReturn(
new GradingReportTemplate(projectType, LocalDate.of(2024, Month.JANUARY, 1))
);
panel = tester.startComponentInPage(new TemplatePanel("id", Model.of(project)));
}
}