From 6f267fa96498ea3870404e50940f27fa667e2073 Mon Sep 17 00:00:00 2001
From: Andrey Belousov <groundhog448@gmail.com>
Date: Tue, 17 Dec 2019 23:59:41 +0000
Subject: [PATCH] Added assertion of model types for Cinema, Ticket, User
---
.../com/s3ai/corporate_app2/controllers/CinemasTest.kt | 7 +++++++
.../com/s3ai/corporate_app2/controllers/TicketsTest.kt | 6 ++++++
.../com/s3ai/corporate_app2/controllers/UsersTest.kt | 7 +++++++
3 files changed, 20 insertions(+)
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 c2c0f71..b937803 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 b9a2ef6..46149f0 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 6a4bd0a..504f0c8 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))))
}
}
--
GitLab