projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don’t load missing following times as Long.MAX_VALUE
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
UntrustAjaxPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPageTest.kt
index
cc0193b
..
6421c09
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPageTest.kt
@@
-1,9
+1,12
@@
package net.pterodactylus.sone.web.ajax
import net.pterodactylus.sone.data.Sone
package net.pterodactylus.sone.web.ajax
import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.test.getInstance
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mock
+import net.pterodactylus.sone.web.baseInjector
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
import org.hamcrest.Matchers.nullValue
import org.junit.Test
import org.mockito.Mockito.verify
import org.hamcrest.Matchers.nullValue
import org.junit.Test
import org.mockito.Mockito.verify
@@
-15,15
+18,13
@@
class UntrustAjaxPageTest : JsonPageTest("untrustSone.ajax", pageSupplier = ::Un
@Test
fun `request without sone results in invalid-sone-id`() {
@Test
fun `request without sone results in invalid-sone-id`() {
- assertThat(json.isSuccess, equalTo(false))
- assertThat(json.error, equalTo("invalid-sone-id"))
+ assertThatJsonFailed("invalid-sone-id")
}
@Test
fun `request with invalid sone results in invalid-sone-id`() {
addRequestParameter("sone", "invalid")
}
@Test
fun `request with invalid sone results in invalid-sone-id`() {
addRequestParameter("sone", "invalid")
- assertThat(json.isSuccess, equalTo(false))
- assertThat(json.error, equalTo("invalid-sone-id"))
+ assertThatJsonFailed("invalid-sone-id")
}
@Test
}
@Test
@@
-31,7
+32,7
@@
class UntrustAjaxPageTest : JsonPageTest("untrustSone.ajax", pageSupplier = ::Un
val sone = mock<Sone>()
addSone(sone, "sone-id")
addRequestParameter("sone", "sone-id")
val sone = mock<Sone>()
addSone(sone, "sone-id")
addRequestParameter("sone", "sone-id")
- assertThat
(json.isSuccess, equalTo(true)
)
+ assertThat
JsonIsSuccessful(
)
verify(core).untrustSone(currentSone, sone)
}
verify(core).untrustSone(currentSone, sone)
}
@@
-40,8
+41,13
@@
class UntrustAjaxPageTest : JsonPageTest("untrustSone.ajax", pageSupplier = ::Un
val sone = mock<Sone>()
addSone(sone, "sone-id")
addRequestParameter("sone", "sone-id")
val sone = mock<Sone>()
addSone(sone, "sone-id")
addRequestParameter("sone", "sone-id")
- assertThat
(json.isSuccess, equalTo(true)
)
+ assertThat
JsonIsSuccessful(
)
assertThat(json["trustValue"], nullValue())
}
assertThat(json["trustValue"], nullValue())
}
+ @Test
+ fun `page can be created by dependency injection`() {
+ assertThat(baseInjector.getInstance<UntrustAjaxPage>(), notNullValue())
+ }
+
}
}