diff --git a/src/test/kotlin/com/s3ai/corporate_app2/controllers/CinemasTest.kt b/src/test/kotlin/com/s3ai/corporate_app2/controllers/CinemasTest.kt index b937803f81fed32634c6a7399fbe6950c98925f9..a159c661f33daae4542306f98cb1d877a47d27c6 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/CinemasTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/CinemasTest.kt @@ -14,6 +14,7 @@ import org.springframework.http.MediaType import org.springframework.test.context.jdbc.Sql import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders +import org.springframework.test.web.servlet.result.MockMvcResultMatchers import org.springframework.test.web.servlet.result.MockMvcResultMatchers.* import java.lang.reflect.GenericArrayType import java.util.* @@ -58,7 +59,7 @@ class CinemasTest { @Test @Throws(Exception::class) - fun editRedirectToCreateIfIdEmptyTest() { + fun editNonExistingIdRedirectToCreateTest() { mvc.perform(MockMvcRequestBuilders.get("/cinemas/edit")) .andExpect(status().isOk) .andExpect(model().attribute("action", Matchers.equalTo("Create"))) @@ -85,4 +86,19 @@ class CinemasTest { .andExpect(model().attribute("cinemas", Matchers.notNullValue(MutableCollection::class.java))) .andExpect(model().attribute("cinemas", CoreMatchers.everyItem(Matchers.notNullValue(Cinema::class.java)))) } + + @Test + @Throws(Exception::class) + fun listEmptyPageTest() { + mvc.perform(MockMvcRequestBuilders.get("/cinemas/list")) + .andExpect(status().isOk) + .andExpect(model().attribute("cinemas", Matchers.notNullValue(MutableCollection::class.java))) + } + + @Test + @Throws(Exception::class) + fun editInvalidUUIDTest() { + mvc.perform(MockMvcRequestBuilders.get("/cinemas/edit?id=totallyNotAnUUID")) + .andExpect(MockMvcResultMatchers.status().isBadRequest) + } } diff --git a/src/test/kotlin/com/s3ai/corporate_app2/controllers/TicketsTest.kt b/src/test/kotlin/com/s3ai/corporate_app2/controllers/TicketsTest.kt index 46149f00c513a3177a0dd25a10450f91de366660..9a0b14735ca98106de3271b0e7487d3f2c86111f 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/TicketsTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/TicketsTest.kt @@ -58,7 +58,7 @@ class TicketsTest { @Test @Throws(Exception::class) - fun editRedirectToCreateIfIdEmptyTest() { + fun editNonExistingIdRedirectToCreateTest() { mvc.perform(MockMvcRequestBuilders.get("/tickets/edit")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("action", Matchers.equalTo("Create"))) @@ -84,4 +84,19 @@ class TicketsTest { .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("tickets", CoreMatchers.everyItem(Matchers.notNullValue(Ticket::class.java)))) } + + @Test + @Throws(Exception::class) + fun listEmptyPageTest() { + mvc.perform(MockMvcRequestBuilders.get("/tickets/list")) + .andExpect(MockMvcResultMatchers.status().isOk) + .andExpect(MockMvcResultMatchers.model().attribute("tickets", Matchers.notNullValue(MutableCollection::class.java))) + } + + @Test + @Throws(Exception::class) + fun editInvalidUUIDTest() { + mvc.perform(MockMvcRequestBuilders.get("/tickets/edit?id=totallyNotAnUUID")) + .andExpect(MockMvcResultMatchers.status().isBadRequest) + } } \ No newline at end of file diff --git a/src/test/kotlin/com/s3ai/corporate_app2/controllers/UsersTest.kt b/src/test/kotlin/com/s3ai/corporate_app2/controllers/UsersTest.kt index 504f0c865c3714e24e9cb6f2439afeab71b999f5..f58ead09f91aa5476fe0c571e19e434f58402951 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/UsersTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/UsersTest.kt @@ -59,7 +59,7 @@ class UsersTest { @Test @Throws(Exception::class) - fun editRedirectToCreateIfIdEmptyTest() { + fun editNonExistingIdRedirectToCreateTest() { mvc.perform(MockMvcRequestBuilders.get("/users/edit")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("action", Matchers.equalTo("Create"))) @@ -79,10 +79,25 @@ class UsersTest { @Test @Throws(Exception::class) - @Sql("/cinemasFill.sql") + @Sql("/usersFill.sql") fun listPageTest() { mvc.perform(MockMvcRequestBuilders.get("/users/list")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("users", everyItem(Matchers.notNullValue(User::class.java)))) } + + @Test + @Throws(Exception::class) + fun listEmptyPageTest() { + mvc.perform(MockMvcRequestBuilders.get("/users/list")) + .andExpect(MockMvcResultMatchers.status().isOk) + .andExpect(MockMvcResultMatchers.model().attribute("users", Matchers.notNullValue(MutableCollection::class.java))) + } + + @Test + @Throws(Exception::class) + fun editInvalidUUIDTest() { + mvc.perform(MockMvcRequestBuilders.get("/users/edit?id=totallyNotAnUUID")) + .andExpect(MockMvcResultMatchers.status().isBadRequest) + } } diff --git a/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/CinemaApiTest.kt b/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/CinemaApiTest.kt index 4aa67a7d4e2316e5f147d134240af5a6820d6e0d..f2692518bd8857143bc1b807f8c49ae8bbac6f75 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/CinemaApiTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/CinemaApiTest.kt @@ -14,9 +14,12 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.jdbc.Sql import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.MvcResult +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get +import org.springframework.test.web.servlet.result.MockMvcResultMatchers import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status +import java.util.* @SpringBootTest @AutoConfigureMockMvc @@ -56,4 +59,20 @@ class CinemaApiTest { val tickets = ticketService.findAll().map { e -> e.cinema!!.id }.distinct() assertThat(tickets, not(hasItem(randomCinemaId))) } + + @Test + @Sql("/cinemasFill.sql", "/usersFill.sql", "/ticketsFill.sql") + fun deleteNonExistingIdReturns404Test() { + val randomCinemaId = UUID.randomUUID() + print(randomCinemaId) + mvc.perform(delete("/api/cinemas/delete?id=${randomCinemaId}")) + .andExpect(status().isNotFound) + } + + @Test + @Throws(Exception::class) + fun deleteInvalidUUIDTest() { + mvc.perform(delete("/api/cinemas/delete?id=totallyNotAnUUID")) + .andExpect(status().isBadRequest) + } } \ No newline at end of file diff --git a/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/TicketApiTest.kt b/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/TicketApiTest.kt index d96c472059800c1601c0f5b28586d010fce95c93..b493ac1a651e2107b84b98e66f3949e517039be7 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/TicketApiTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/TicketApiTest.kt @@ -14,6 +14,7 @@ import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.MvcResult import org.springframework.test.web.servlet.request.MockMvcRequestBuilders import org.springframework.test.web.servlet.result.MockMvcResultMatchers +import java.util.* @SpringBootTest @AutoConfigureMockMvc @@ -50,4 +51,20 @@ class TicketApiTest { val tickets = service.findAll().map { e -> e.id }.distinct() MatcherAssert.assertThat(tickets, IsNot.not(Matchers.hasItem(randomTicketId))) } + + @Test + @Sql("/cinemasFill.sql", "/usersFill.sql", "/ticketsFill.sql") + fun deleteNonExistingIdReturns404Test() { + val randomTicketId = UUID.randomUUID() + print(randomTicketId) + mvc.perform(MockMvcRequestBuilders.delete("/api/tickets/delete?id=${randomTicketId}")) + .andExpect(MockMvcResultMatchers.status().isNotFound) + } + + @Test + @Throws(Exception::class) + fun deleteInvalidUUIDTest() { + mvc.perform(MockMvcRequestBuilders.delete("/api/tickets/delete?id=totallyNotAnUUID")) + .andExpect(MockMvcResultMatchers.status().isBadRequest) + } } \ No newline at end of file diff --git a/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/UserApiTest.kt b/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/UserApiTest.kt index 9d2f179b383fdb5aba4024821d5a349be975d054..55ee715ba587b189d34b3f930169adb6c6e7dbe4 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/UserApiTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/rest/UserApiTest.kt @@ -15,6 +15,7 @@ import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.MvcResult import org.springframework.test.web.servlet.request.MockMvcRequestBuilders import org.springframework.test.web.servlet.result.MockMvcResultMatchers +import java.util.* @SpringBootTest @AutoConfigureMockMvc @@ -54,4 +55,20 @@ class UserApiTest { val tickets = ticketService.findAll().map { e -> e.user!!.id }.distinct() MatcherAssert.assertThat(tickets, IsNot.not(Matchers.hasItem(randomUserId))) } + + @Test + @Sql("/usersFill.sql", "/cinemasFill.sql", "/ticketsFill.sql") + fun deleteNonExistingIdReturns404Test() { + val randomUserId = UUID.randomUUID() + print(randomUserId) + mvc.perform(MockMvcRequestBuilders.delete("/api/users/delete?id=${randomUserId}")) + .andExpect(MockMvcResultMatchers.status().isNotFound) + } + + @Test + @Throws(Exception::class) + fun deleteInvalidUUIDTest() { + mvc.perform(MockMvcRequestBuilders.delete("/api/users/delete?id=totallyNotAnUUID")) + .andExpect(MockMvcResultMatchers.status().isBadRequest) + } } \ No newline at end of file