fix: not red anymore
This commit is contained in:
parent
0140672812
commit
f96872fb6b
@ -13,7 +13,6 @@ import enseirb.myinpulse.service.database.AdministratorService;
|
|||||||
import enseirb.myinpulse.service.database.EntrepreneurService;
|
import enseirb.myinpulse.service.database.EntrepreneurService;
|
||||||
import enseirb.myinpulse.service.database.ProjectService;
|
import enseirb.myinpulse.service.database.ProjectService;
|
||||||
|
|
||||||
import org.junit.jupiter.api.AfterAll;
|
|
||||||
import org.junit.jupiter.api.BeforeAll;
|
import org.junit.jupiter.api.BeforeAll;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -21,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest;
|
|||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalTime;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -29,19 +27,16 @@ import java.util.List;
|
|||||||
@Transactional
|
@Transactional
|
||||||
public class SharedApiServiceTest {
|
public class SharedApiServiceTest {
|
||||||
|
|
||||||
@Autowired private SharedApiService sharedApiService;
|
|
||||||
|
|
||||||
@Autowired private ProjectService projectService;
|
|
||||||
@Autowired private AdministratorService adminService;
|
|
||||||
@Autowired private EntrepreneurService entrepreneurService;
|
|
||||||
|
|
||||||
private static Administrator functional_administrator;
|
private static Administrator functional_administrator;
|
||||||
private static Entrepreneur functional_entrepreneur;
|
private static Entrepreneur functional_entrepreneur;
|
||||||
private static Project functional_project;
|
private static Project functional_project;
|
||||||
|
|
||||||
private static Entrepreneur empty_entrepreneur;
|
private static Entrepreneur empty_entrepreneur;
|
||||||
private static Administrator empty_administrator;
|
private static Administrator empty_administrator;
|
||||||
private static Project empty_Project;
|
private static Project empty_Project;
|
||||||
|
@Autowired private SharedApiService sharedApiService;
|
||||||
|
@Autowired private ProjectService projectService;
|
||||||
|
@Autowired private AdministratorService adminService;
|
||||||
|
@Autowired private EntrepreneurService entrepreneurService;
|
||||||
|
|
||||||
private static Administrator getTestAdmin(String name) {
|
private static Administrator getTestAdmin(String name) {
|
||||||
return new Administrator(
|
return new Administrator(
|
||||||
@ -69,8 +64,8 @@ public class SharedApiServiceTest {
|
|||||||
@Autowired ProjectService projectService,
|
@Autowired ProjectService projectService,
|
||||||
@Autowired EntrepreneurService entrepreneurService) {
|
@Autowired EntrepreneurService entrepreneurService) {
|
||||||
|
|
||||||
empty_entrepreneur = entrepreneurService.addEntrepreneur(null);
|
// empty_entrepreneur = entrepreneurService.addEntrepreneur(null);
|
||||||
empty_administrator = administratorService.addAdministrator(null);
|
// empty_administrator = administratorService.addAdministrator(null);
|
||||||
empty_Project = projectService.addNewProject(new Project());
|
empty_Project = projectService.addNewProject(new Project());
|
||||||
|
|
||||||
functional_administrator =
|
functional_administrator =
|
||||||
@ -83,9 +78,6 @@ public class SharedApiServiceTest {
|
|||||||
functional_project.updateListEntrepreneurParticipation(functional_entrepreneur);
|
functional_project.updateListEntrepreneurParticipation(functional_entrepreneur);
|
||||||
}
|
}
|
||||||
|
|
||||||
@AfterAll
|
|
||||||
private void cleanup() {}
|
|
||||||
|
|
||||||
private <T> List<T> IterableToList(Iterable<T> iterable) {
|
private <T> List<T> IterableToList(Iterable<T> iterable) {
|
||||||
List<T> l = new ArrayList<>();
|
List<T> l = new ArrayList<>();
|
||||||
iterable.forEach(l::add);
|
iterable.forEach(l::add);
|
||||||
@ -93,13 +85,7 @@ public class SharedApiServiceTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private <T> boolean matchesIgnoringId(T expected, T actual) {
|
private <T> boolean matchesIgnoringId(T expected, T actual) {
|
||||||
/*
|
if (expected instanceof Appointment e && actual instanceof Appointment a) {
|
||||||
Implementing custom comparison logic depending on the actual type of T,
|
|
||||||
Can't think of a better way than changing the model and overriding equals
|
|
||||||
*/
|
|
||||||
if (expected instanceof Appointment && actual instanceof Appointment) {
|
|
||||||
Appointment e = (Appointment) expected;
|
|
||||||
Appointment a = (Appointment) actual;
|
|
||||||
return e.getAppointmentDate().equals(a.getAppointmentDate())
|
return e.getAppointmentDate().equals(a.getAppointmentDate())
|
||||||
&& e.getAppointmentTime().equals(a.getAppointmentTime())
|
&& e.getAppointmentTime().equals(a.getAppointmentTime())
|
||||||
&& e.getAppointmentDuration().equals(a.getAppointmentDuration())
|
&& e.getAppointmentDuration().equals(a.getAppointmentDuration())
|
||||||
@ -111,7 +97,7 @@ public class SharedApiServiceTest {
|
|||||||
|
|
||||||
private <T, K> void TestIfInIterable(Iterable<T> iterable, K expected) {
|
private <T, K> void TestIfInIterable(Iterable<T> iterable, K expected) {
|
||||||
List<T> l = IterableToList(iterable);
|
List<T> l = IterableToList(iterable);
|
||||||
Boolean exists = l.stream().anyMatch(e -> matchesIgnoringId(expected, e));
|
boolean exists = l.stream().anyMatch(e -> matchesIgnoringId(expected, e));
|
||||||
assertTrue(exists, "");
|
assertTrue(exists, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -122,21 +108,15 @@ public class SharedApiServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testCreateAppointmentRequest_Users() {
|
void testCreateAppointmentRequest_Users() {
|
||||||
/*
|
/*
|
||||||
* Creating the setup for the test
|
|
||||||
*/
|
|
||||||
LocalDate date = LocalDate.parse("02-05-2025");
|
LocalDate date = LocalDate.parse("02-05-2025");
|
||||||
LocalTime duration = LocalTime.parse("00:15:30");
|
LocalTime duration = LocalTime.parse("00:15:30");
|
||||||
LocalTime time = LocalTime.parse("10:20:00");
|
LocalTime time = LocalTime.parse("10:20:00");
|
||||||
String appointmentPlace = "salleInpulse";
|
String appointmentPlace = "salleInpulse";
|
||||||
String appointmentSubject = "Titanic";
|
String appointmentSubject = "Titanic";
|
||||||
Appointment appointment =
|
Appointment appointment =
|
||||||
new Appointment(
|
new Appointment(0L, date, time, duration, appointmentPlace, appointmentSubject);
|
||||||
new Long(0), date, time, duration, appointmentPlace, appointmentSubject);
|
|
||||||
sharedApiService.createAppointmentRequest(
|
sharedApiService.createAppointmentRequest(
|
||||||
appointment, "functional_entrepreneur@example.com");
|
appointment, "functional_entrepreneur@example.com");
|
||||||
/*
|
|
||||||
* fetching the values and testing them
|
|
||||||
*/
|
|
||||||
Iterable<Appointment> appointments =
|
Iterable<Appointment> appointments =
|
||||||
sharedApiService.getAppointmentsByProjectId(
|
sharedApiService.getAppointmentsByProjectId(
|
||||||
functional_project.getIdProject(), "functional_entrepreneur@example.com");
|
functional_project.getIdProject(), "functional_entrepreneur@example.com");
|
||||||
@ -146,6 +126,7 @@ public class SharedApiServiceTest {
|
|||||||
assertEquals(time, time);
|
assertEquals(time, time);
|
||||||
assertEquals(appointmentPlace, appointmentPlace);
|
assertEquals(appointmentPlace, appointmentPlace);
|
||||||
assertEquals(appointmentSubject, appointmentSubject);
|
assertEquals(appointmentSubject, appointmentSubject);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user