projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert lock Sone page test to use new web page test base
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
OptionsPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
index
c7b3423
..
28844b9
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
@@
-18,11
+18,7
@@
import org.junit.Test
/**
* Unit test for [OptionsPage].
*/
/**
* Unit test for [OptionsPage].
*/
-class OptionsPageTest : WebPageTest() {
-
- private val page = OptionsPage(template, webInterface)
-
- override fun getPage() = page
+class OptionsPageTest: WebPageTest2(::OptionsPage) {
@Before
fun setupPreferences() {
@Before
fun setupPreferences() {
@@
-54,7
+50,7
@@
class OptionsPageTest : WebPageTest() {
@Test
fun `page returns correct path`() {
@Test
fun `page returns correct path`() {
- assertThat(page.path, equalTo("options.html"))
+
assertThat(page.path, equalTo("options.html"))
}
@Test
}
@Test
@@
-64,7
+60,7
@@
class OptionsPageTest : WebPageTest() {
@Test
fun `page returns correct title`() {
@Test
fun `page returns correct title`() {
- addTranslation("Page.Options.Title", "options page title")
+
addTranslation("Page.Options.Title", "options page title")
assertThat(page.getPageTitle(freenetRequest), equalTo("options page title"))
}
assertThat(page.getPageTitle(freenetRequest), equalTo("options page title"))
}
@@
-110,7
+106,7
@@
class OptionsPageTest : WebPageTest() {
setMethod(POST)
addHttpRequestPart("show-custom-avatars", "ALWAYS")
addHttpRequestPart("load-linked-images", "ALWAYS")
setMethod(POST)
addHttpRequestPart("show-custom-avatars", "ALWAYS")
addHttpRequestPart("load-linked-images", "ALWAYS")
- addHttpRequestPart(option, setValue.toString())
+ setValue?.also { addHttpRequestPart(option, it.toString()) }
verifyRedirect("options.html") {
assertThat(getter(), equalTo(expectedValue))
}
verifyRedirect("options.html") {
assertThat(getter(), equalTo(expectedValue))
}
@@
-122,26
+118,52
@@
class OptionsPageTest : WebPageTest() {
}
@Test
}
@Test
+ fun `auto-follow option can be unset`() {
+ verifyThatOptionCanBeSet("auto-follow", null, false) { currentSone.options.isAutoFollow }
+ }
+
+ @Test
fun `show new sone notification option can be set`() {
verifyThatOptionCanBeSet("show-notification-new-sones", "checked", true) { currentSone.options.isShowNewSoneNotifications }
}
@Test
fun `show new sone notification option can be set`() {
verifyThatOptionCanBeSet("show-notification-new-sones", "checked", true) { currentSone.options.isShowNewSoneNotifications }
}
@Test
+ fun `show new sone notification option can be unset`() {
+ verifyThatOptionCanBeSet("" +
+ "", null, false) { currentSone.options.isShowNewSoneNotifications }
+ }
+
+ @Test
fun `show new post notification option can be set`() {
verifyThatOptionCanBeSet("show-notification-new-posts", "checked", true) { currentSone.options.isShowNewPostNotifications }
}
@Test
fun `show new post notification option can be set`() {
verifyThatOptionCanBeSet("show-notification-new-posts", "checked", true) { currentSone.options.isShowNewPostNotifications }
}
@Test
+ fun `show new post notification option can be unset`() {
+ verifyThatOptionCanBeSet("show-notification-new-posts", null, false) { currentSone.options.isShowNewPostNotifications }
+ }
+
+ @Test
fun `show new reply notification option can be set`() {
verifyThatOptionCanBeSet("show-notification-new-replies", "checked", true) { currentSone.options.isShowNewReplyNotifications }
}
@Test
fun `show new reply notification option can be set`() {
verifyThatOptionCanBeSet("show-notification-new-replies", "checked", true) { currentSone.options.isShowNewReplyNotifications }
}
@Test
+ fun `show new reply notification option can be unset`() {
+ verifyThatOptionCanBeSet("show-notification-new-replies", null, false) { currentSone.options.isShowNewReplyNotifications }
+ }
+
+ @Test
fun `enable sone insert notifications option can be set`() {
verifyThatOptionCanBeSet("enable-sone-insert-notifications", "checked", true) { currentSone.options.isSoneInsertNotificationEnabled }
}
@Test
fun `enable sone insert notifications option can be set`() {
verifyThatOptionCanBeSet("enable-sone-insert-notifications", "checked", true) { currentSone.options.isSoneInsertNotificationEnabled }
}
@Test
+ fun `enable sone insert notifications option can be unset`() {
+ verifyThatOptionCanBeSet("enable-sone-insert-notifications", null, false) { currentSone.options.isSoneInsertNotificationEnabled }
+ }
+
+ @Test
fun `load linked images option can be set`() {
verifyThatOptionCanBeSet("load-linked-images", "TRUSTED", TRUSTED) { currentSone.options.loadLinkedImages }
}
fun `load linked images option can be set`() {
verifyThatOptionCanBeSet("load-linked-images", "TRUSTED", TRUSTED) { currentSone.options.loadLinkedImages }
}
@@
-163,7
+185,7
@@
class OptionsPageTest : WebPageTest() {
private fun <T> verifyThatPreferencesCanBeSet(name: String, setValue: String?, expectedValue: T, getter: () -> T) {
unsetCurrentSone()
setMethod(POST)
private fun <T> verifyThatPreferencesCanBeSet(name: String, setValue: String?, expectedValue: T, getter: () -> T) {
unsetCurrentSone()
setMethod(POST)
- addHttpRequestPart(name, setValue)
+ setValue?.also { addHttpRequestPart(name, it) }
verifyRedirect("options.html") {
assertThat(getter(), equalTo(expectedValue))
}
verifyRedirect("options.html") {
assertThat(getter(), equalTo(expectedValue))
}