DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

87: Replace assertTrue with assertEquals

Browse Source
This commit is contained in:
Tom Zhao 2025-04-23 14:03:13 +02:00
parent 5c36cd345d
commit 25ba68f929
1 changed files with 22 additions and 18 deletions

40
core/src/test/java/se/su/dsv/scipro/project/split/SplitOrRestartProjectServiceIntegrationTest.java

@ -1,6 +1,7 @@
package se.su.dsv.scipro.project.split;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static se.su.dsv.scipro.project.split.SplitOrRestartProjectService.SplittableStatus;
import static se.su.dsv.scipro.project.split.SplitOrRestartProjectService.SplittableStatusRecord;
@ -11,6 +12,7 @@ import java.time.Year;
import java.time.ZonedDateTime;
import java.util.*;
import java.util.function.Function;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.file.FileUpload;
@ -65,7 +67,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(0);
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.NOT_EXIST);
assertEquals(SplittableStatus.NOT_EXIST, status);
}
@Test
@ -76,7 +78,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(parentProject.getId());
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.NOT_ACTIVE);
assertEquals(SplittableStatus.NOT_ACTIVE, status);
}
@Test
@ -84,7 +86,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(parentProject.getId());
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.NOT_TWO_PARTICIPANTS);
assertEquals(SplittableStatus.NOT_TWO_PARTICIPANTS, status);
}
@Test
@ -94,7 +96,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(parentProject.getId());
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.PHASE_TWO_STARTED);
assertEquals(SplittableStatus.PHASE_TWO_STARTED, status);
}
@Test
@ -107,7 +109,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(parentProject.getId());
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.OK);
assertEquals(SplittableStatus.OK, status);
splitOrRestartProjectService.splitProject(parentProject.getId());
@ -115,17 +117,18 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
reviewer,
Year.now()
);
// Todo: improve this with higher precision by using MutabledFixedClock
assertTrue(remainingTargets.spring() == REMAINING_TARGET || remainingTargets.autumn() == REMAINING_TARGET);
List<Project> childProjects = splitOrRestartProjectService.getChildProjects(parentProject.getId());
assertTrue(parentProject.getProjectStatus() == ProjectStatus.INACTIVE);
assertTrue(childProjects.size() == 2);
assertEquals(ProjectStatus.INACTIVE, parentProject.getProjectStatus());
assertEquals(2, childProjects.size());
childProjects.forEach(project -> {
assertTrue(project.getProjectParticipants().size() == 1);
assertTrue(project.getHeadSupervisor().equals(supervisor));
assertTrue(project.getProjectStatus() == ProjectStatus.ACTIVE);
assertEquals(1, project.getProjectParticipants().size());
assertEquals(supervisor, project.getHeadSupervisor());
assertEquals(ProjectStatus.ACTIVE, project.getProjectStatus());
assertTrue(roughDraftApprovalService.findBy(project).isEmpty());
});
}
@ -140,7 +143,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(parentProject.getId());
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.OK);
assertEquals(SplittableStatus.OK, status);
splitOrRestartProjectService.splitProject(parentProject.getId());
@ -148,17 +151,18 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
reviewer,
Year.now()
);
// todo: improve this by using MutableFixedClock
assertTrue(remainingTargets.spring() == REMAINING_TARGET || remainingTargets.autumn() == REMAINING_TARGET);
List<Project> childProjects = splitOrRestartProjectService.getChildProjects(parentProject.getId());
assertTrue(parentProject.getProjectStatus() == ProjectStatus.INACTIVE);
assertTrue(childProjects.size() == 2);
assertEquals(ProjectStatus.INACTIVE, parentProject.getProjectStatus());
assertEquals(2, childProjects.size());
childProjects.forEach(project -> {
assertTrue(project.getProjectParticipants().size() == 1);
assertTrue(project.getHeadSupervisor().equals(supervisor));
assertTrue(project.getProjectStatus() == ProjectStatus.ACTIVE);
assertEquals(1, project.getProjectParticipants().size());
assertEquals(supervisor, project.getHeadSupervisor());
assertEquals(ProjectStatus.ACTIVE, project.getProjectStatus());
Optional<RoughDraftApproval> optionalRda = roughDraftApprovalService.findBy(project);
assertTrue(optionalRda.isPresent());
@ -185,7 +189,7 @@ public class SplitOrRestartProjectServiceIntegrationTest extends IntegrationTest
SplittableStatusRecord record = splitOrRestartProjectService.getSplittableStatus(parentProject.getId());
SplittableStatus status = record.splittableStatus();
assertTrue(status == SplittableStatus.FINAL_SEMINAR_PHASE_STARTED);
assertEquals(SplittableStatus.FINAL_SEMINAR_PHASE_STARTED, status);
}
private Project createProject(ProjectType projectType, ProjectStatus active) {