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 c2c0f71726105a0a3ba0383564989b2940799695..b937803f81fed32634c6a7399fbe6950c98925f9 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/CinemasTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/CinemasTest.kt @@ -1,9 +1,11 @@ package com.s3ai.corporate_app2.controllers import com.fasterxml.jackson.databind.ObjectMapper +import com.s3ai.corporate_app2.Cinema import com.s3ai.corporate_app2.CinemaService import org.assertj.core.api.Assertions.assertThat import org.hamcrest.Matchers +import org.hamcrest.CoreMatchers import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc @@ -13,6 +15,7 @@ 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 java.lang.reflect.GenericArrayType import java.util.* @@ -59,6 +62,7 @@ class CinemasTest { mvc.perform(MockMvcRequestBuilders.get("/cinemas/edit")) .andExpect(status().isOk) .andExpect(model().attribute("action", Matchers.equalTo("Create"))) + .andExpect(model().attribute("cinema", Matchers.notNullValue(Cinema::class.java))) } @Test @@ -69,6 +73,7 @@ class CinemasTest { mvc.perform(MockMvcRequestBuilders.get("/cinemas/edit?id=${randomCinemaId}")) .andExpect(status().isOk) .andExpect(model().attribute("action", Matchers.equalTo("Edit"))) + .andExpect(model().attribute("cinema", Matchers.notNullValue(Cinema::class.java))) } @Test @@ -77,5 +82,7 @@ class CinemasTest { fun listPageTest() { mvc.perform(MockMvcRequestBuilders.get("/cinemas/list")) .andExpect(status().isOk) + .andExpect(model().attribute("cinemas", Matchers.notNullValue(MutableCollection::class.java))) + .andExpect(model().attribute("cinemas", CoreMatchers.everyItem(Matchers.notNullValue(Cinema::class.java)))) } } 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 b9a2ef6440fd4acb325e66f6acdf66b433d4a9ea..46149f00c513a3177a0dd25a10450f91de366660 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/TicketsTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/TicketsTest.kt @@ -1,8 +1,11 @@ package com.s3ai.corporate_app2.controllers import com.fasterxml.jackson.databind.ObjectMapper +import com.s3ai.corporate_app2.Ticket import com.s3ai.corporate_app2.TicketService +import com.s3ai.corporate_app2.User import org.assertj.core.api.Assertions.assertThat +import org.hamcrest.CoreMatchers import org.hamcrest.Matchers import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired @@ -59,6 +62,7 @@ class TicketsTest { mvc.perform(MockMvcRequestBuilders.get("/tickets/edit")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("action", Matchers.equalTo("Create"))) + .andExpect(MockMvcResultMatchers.model().attribute("ticket", Matchers.notNullValue(Ticket::class.java))) } @Test @@ -69,6 +73,7 @@ class TicketsTest { mvc.perform(MockMvcRequestBuilders.get("/tickets/edit?id=${randomTicketId}")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("action", Matchers.equalTo("Edit"))) + .andExpect(MockMvcResultMatchers.model().attribute("ticket", Matchers.notNullValue(Ticket::class.java))) } @Test @@ -77,5 +82,6 @@ class TicketsTest { fun listPageTest() { mvc.perform(MockMvcRequestBuilders.get("/tickets/list")) .andExpect(MockMvcResultMatchers.status().isOk) + .andExpect(MockMvcResultMatchers.model().attribute("tickets", CoreMatchers.everyItem(Matchers.notNullValue(Ticket::class.java)))) } } \ 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 6a4bd0a054b2af02f2e7eec96bd7a888884209a1..504f0c865c3714e24e9cb6f2439afeab71b999f5 100644 --- a/src/test/kotlin/com/s3ai/corporate_app2/controllers/UsersTest.kt +++ b/src/test/kotlin/com/s3ai/corporate_app2/controllers/UsersTest.kt @@ -1,8 +1,12 @@ package com.s3ai.corporate_app2.controllers import com.fasterxml.jackson.databind.ObjectMapper +import com.s3ai.corporate_app2.Cinema +import com.s3ai.corporate_app2.User import com.s3ai.corporate_app2.UserService import org.assertj.core.api.Assertions.assertThat +import org.hamcrest.CoreMatchers +import org.hamcrest.CoreMatchers.everyItem import org.hamcrest.Matchers import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired @@ -59,6 +63,7 @@ class UsersTest { mvc.perform(MockMvcRequestBuilders.get("/users/edit")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("action", Matchers.equalTo("Create"))) + .andExpect(MockMvcResultMatchers.model().attribute("user", Matchers.notNullValue(User::class.java))) } @Test @@ -69,6 +74,7 @@ class UsersTest { mvc.perform(MockMvcRequestBuilders.get("/users/edit?id=${randomUserId}")) .andExpect(MockMvcResultMatchers.status().isOk) .andExpect(MockMvcResultMatchers.model().attribute("action", Matchers.equalTo("Edit"))) + .andExpect(MockMvcResultMatchers.model().attribute("user", Matchers.notNullValue(User::class.java))) } @Test @@ -77,5 +83,6 @@ class UsersTest { fun listPageTest() { mvc.perform(MockMvcRequestBuilders.get("/users/list")) .andExpect(MockMvcResultMatchers.status().isOk) + .andExpect(MockMvcResultMatchers.model().attribute("users", everyItem(Matchers.notNullValue(User::class.java)))) } }