diff --git a/src/main/java/isima/f2/model/Poubelle.java b/src/main/java/isima/f2/model/Poubelle.java index af91a416b97af928d2fb791249fc2b894aa208c1..ddeba1d1145c6b872084087b5e08223e48b5a684 100644 --- a/src/main/java/isima/f2/model/Poubelle.java +++ b/src/main/java/isima/f2/model/Poubelle.java @@ -39,8 +39,9 @@ public class Poubelle implements Serializable{ } public Poubelle() { - super(); + super(); } + public Poubelle(Long id, Double longitude, Double latitude, Double capacity) { super(); this.id = id; diff --git a/src/test/java/isima/F2/RamassagePoubleDepotApplicationTests.java b/src/test/java/isima/F2/RamassagePoubleDepotApplicationTests.java index 7801803f2ab98d00aea03be1700caedab3b59f64..e63df1d4673bd4878be3e9b6285d8337bd437b5d 100644 --- a/src/test/java/isima/F2/RamassagePoubleDepotApplicationTests.java +++ b/src/test/java/isima/F2/RamassagePoubleDepotApplicationTests.java @@ -1,13 +1,29 @@ package isima.F2; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.LocalServerPort; + -@SpringBootTest +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) class RamassagePoubleDepotApplicationTests { + @LocalServerPort + private int port; + + @Autowired + private TestRestTemplate restTemplate; + @Test - void contextLoads() { + public void testRunServerRamassageAppTest() throws Exception { + + assertThat(this.restTemplate.getForObject("http://localhost:" + port + "/", + String.class)).isNotEmpty(); } } diff --git a/src/test/java/isima/F2/controller/PoubelleControllerTest.java b/src/test/java/isima/F2/controller/PoubelleControllerTest.java new file mode 100644 index 0000000000000000000000000000000000000000..71d9339d5002a009a2ee62e05f22fef2539a0a4a --- /dev/null +++ b/src/test/java/isima/F2/controller/PoubelleControllerTest.java @@ -0,0 +1,44 @@ +package isima.F2.controller; + + +import static org.hamcrest.Matchers.containsString; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.web.servlet.MockMvc; + +import isima.f2.controllers.PoubelleController; +import isima.f2.model.Poubelle; +import isima.f2.services.ImpPoubelle; + +@WebMvcTest(PoubelleController.class) +public class PoubelleControllerTest { + + @MockBean + private ImpPoubelle service; + + @Autowired + private MockMvc mockMvc; + + @Test + public void verificationGetPoubellesMethode() throws Exception { + List listRes = new ArrayList(); + listRes.add(new Poubelle()); + //Return null car Il n'y pas une initialisation de constructeur + when(service.getPoubelles()).thenReturn(listRes); + this.mockMvc.perform(get("/poubelles/")).andDo(print()).andExpect(status().isOk()) + .andExpect(content().string(containsString("\"id\":null"))); + } + + +}