X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMoveProfileFieldAjaxPageTest.kt;h=847b82cd55ccf62c6cb1b5aa7f0704477ca9e10b;hp=7524eaa6b9475cd106dbaab7cbd00aea207cc38b;hb=ea7ad5e87074576d17b7df74365a726bd95d7665;hpb=8846e3e03fd7252c5c9b01ff9463f2b591174f68

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPageTest.kt
index 7524eaa..847b82c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPageTest.kt
@@ -1,7 +1,10 @@
 package net.pterodactylus.sone.web.ajax
 
+import net.pterodactylus.sone.test.getInstance
+import net.pterodactylus.sone.web.baseInjector
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Test
 import org.mockito.Mockito.verify
 
@@ -12,16 +15,14 @@ class MoveProfileFieldAjaxPageTest : JsonPageTest("moveProfileField.ajax", true,
 
 	@Test
 	fun `request without field id results in invalid-field-id`() {
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-field-id"))
+		assertThatJsonFailed("invalid-field-id")
 	}
 
 	@Test
 	fun `request with invalid direction results in invalid-direction`() {
 		val fieldId = profile.addField("someField").id
 		addRequestParameter("field", fieldId)
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-direction"))
+		assertThatJsonFailed("invalid-direction")
 	}
 
 	@Test
@@ -29,8 +30,7 @@ class MoveProfileFieldAjaxPageTest : JsonPageTest("moveProfileField.ajax", true,
 		val fieldId = profile.addField("someField").id
 		addRequestParameter("field", fieldId)
 		addRequestParameter("direction", "up")
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("not-possible"))
+		assertThatJsonFailed("not-possible")
 	}
 
 	@Test
@@ -38,8 +38,7 @@ class MoveProfileFieldAjaxPageTest : JsonPageTest("moveProfileField.ajax", true,
 		val fieldId = profile.addField("someField").id
 		addRequestParameter("field", fieldId)
 		addRequestParameter("direction", "down")
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("not-possible"))
+		assertThatJsonFailed("not-possible")
 	}
 
 	@Test
@@ -48,7 +47,7 @@ class MoveProfileFieldAjaxPageTest : JsonPageTest("moveProfileField.ajax", true,
 		val fieldId = profile.addField("someField").id
 		addRequestParameter("field", fieldId)
 		addRequestParameter("direction", "up")
-		assertThat(json.isSuccess, equalTo(true))
+		assertThatJsonIsSuccessful()
 		assertThat(profile.fields[0].id, equalTo(fieldId))
 		verify(core).touchConfiguration()
 		verify(currentSone).profile = profile
@@ -60,10 +59,15 @@ class MoveProfileFieldAjaxPageTest : JsonPageTest("moveProfileField.ajax", true,
 		profile.addField("firstField")
 		addRequestParameter("field", fieldId)
 		addRequestParameter("direction", "down")
-		assertThat(json.isSuccess, equalTo(true))
+		assertThatJsonIsSuccessful()
 		assertThat(profile.fields.last().id, equalTo(fieldId))
 		verify(core).touchConfiguration()
 		verify(currentSone).profile = profile
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<MoveProfileFieldAjaxPage>(), notNullValue())
+	}
+
 }