From 0ec74d1242969072d919bec09f539e3a67f3a2a3 Mon Sep 17 00:00:00 2001 From: Valerii Ulitin Date: Thu, 6 Oct 2022 11:12:55 +0200 Subject: [PATCH] Added necessary for tests imports and constants --- .../flightlog/FlightLogSeleniumTests.java | 4 ++++ .../flightlog/service/PersonServiceTest.java | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/eu/profinit/education/flightlog/FlightLogSeleniumTests.java b/app/src/test/java/eu/profinit/education/flightlog/FlightLogSeleniumTests.java index 1d48bca..5190ecd 100644 --- a/app/src/test/java/eu/profinit/education/flightlog/FlightLogSeleniumTests.java +++ b/app/src/test/java/eu/profinit/education/flightlog/FlightLogSeleniumTests.java @@ -1,11 +1,15 @@ package eu.profinit.education.flightlog; +import static org.junit.Assert.assertEquals; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; diff --git a/services/src/test/java/eu/profinit/education/flightlog/service/PersonServiceTest.java b/services/src/test/java/eu/profinit/education/flightlog/service/PersonServiceTest.java index ed97988..1d31030 100644 --- a/services/src/test/java/eu/profinit/education/flightlog/service/PersonServiceTest.java +++ b/services/src/test/java/eu/profinit/education/flightlog/service/PersonServiceTest.java @@ -1,11 +1,15 @@ package eu.profinit.education.flightlog.service; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Arrays; +import java.util.List; import java.util.Optional; import org.junit.Before; @@ -26,6 +30,12 @@ import eu.profinit.education.flightlog.to.PersonTo; @RunWith(MockitoJUnitRunner.class) public class PersonServiceTest { + private static final List PERSON_ROLES = Arrays.asList("PILOT"); + + private static final String PERSON_LAST_NAME = "Spoustová"; + + private static final String PERSON_FIRST_NAME = "Kamila"; + @Mock private PersonRepository personRepository; @@ -74,8 +84,11 @@ public class PersonServiceTest { .memberId(2L) .build(); - User testUser = new User(2L, "Kamila", "Spoustová", Arrays.asList("PILOT")); - Person clubMemberFromDd = Person.builder().personType(Person.Type.CLUB_MEMBER).memberId(2L).build(); + User testUser = new User(2L, PERSON_FIRST_NAME, PERSON_LAST_NAME, PERSON_ROLES); + Person clubMemberFromDd = Person.builder() + .personType(Person.Type.CLUB_MEMBER) + .memberId(2L) + .build(); // mock behaviour when(personRepository.findByMemberId(2L)).thenReturn(Optional.of(clubMemberFromDd)); @@ -95,4 +108,4 @@ public class PersonServiceTest { // TODO tutorial-3.4: Implement a test using Mock } -} \ No newline at end of file +}