projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert logout page test to use new web page test base
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
ReloadingPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
index
2d44010
..
1a80a1b
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
@@
-1,13
+1,17
@@
package net.pterodactylus.sone.web.pages
package net.pterodactylus.sone.web.pages
-import net.pterodactylus.sone.web.pages.ReloadingPage
+import freenet.support.api.HTTPRequest
+import net.pterodactylus.sone.test.mock
+import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.web.
Method.GET
+import net.pterodactylus.util.web.
Response
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
+import java.io.ByteArrayOutputStream
+import java.net.URI
import java.nio.file.Files
import java.nio.file.Paths
import kotlin.text.Charsets.UTF_8
import java.nio.file.Files
import java.nio.file.Paths
import kotlin.text.Charsets.UTF_8
@@
-15,11
+19,15
@@
import kotlin.text.Charsets.UTF_8
/**
* Unit test for [ReloadingPage].
*/
/**
* Unit test for [ReloadingPage].
*/
-class ReloadingPageTest
: WebPageTest()
{
+class ReloadingPageTest {
@Rule @JvmField val tempFolder = TemporaryFolder()
@Rule @JvmField val tempFolder = TemporaryFolder()
- private val folder by lazy { tempFolder.newFolder() }
+ private val folder by lazy { tempFolder.newFolder()
!!
}
private val page by lazy { ReloadingPage<FreenetRequest>("/prefix/", folder.path, "text/plain") }
private val page by lazy { ReloadingPage<FreenetRequest>("/prefix/", folder.path, "text/plain") }
+ private val freenetRequest = mock<FreenetRequest>()
+ private val httpRequest = mock<HTTPRequest>()
+ private val responseBytes = ByteArrayOutputStream()
+ private val response = Response(responseBytes)
@Test
fun `page returns correct path prefix`() {
@Test
fun `page returns correct path prefix`() {
@@
-31,21
+39,28
@@
class ReloadingPageTest : WebPageTest() {
assertThat(page.isPrefixPage, equalTo(true))
}
assertThat(page.isPrefixPage, equalTo(true))
}
+ private fun request(uri: String) {
+ whenever(httpRequest.path).thenReturn(uri)
+ whenever(freenetRequest.uri).thenReturn(URI(uri))
+ }
+
@Test
fun `requesting invalid file results in 404`() {
@Test
fun `requesting invalid file results in 404`() {
- request("/prefix/path/file.txt"
, GET
)
+ request("/prefix/path/file.txt")
page.handleRequest(freenetRequest, response)
assertThat(response.statusCode, equalTo(404))
page.handleRequest(freenetRequest, response)
assertThat(response.statusCode, equalTo(404))
+ assertThat(response.statusText, equalTo("Not found"))
}
@Test
fun `requesting valid file results in 200 and delivers file`() {
Files.write(Paths.get(folder.path, "file.txt"), listOf("Hello", "World"), UTF_8)
}
@Test
fun `requesting valid file results in 200 and delivers file`() {
Files.write(Paths.get(folder.path, "file.txt"), listOf("Hello", "World"), UTF_8)
- request("/prefix/path/file.txt"
, GET
)
+ request("/prefix/path/file.txt")
page.handleRequest(freenetRequest, response)
assertThat(response.statusCode, equalTo(200))
page.handleRequest(freenetRequest, response)
assertThat(response.statusCode, equalTo(200))
+ assertThat(response.statusText, equalTo("OK"))
assertThat(response.contentType, equalTo("text/plain"))
assertThat(response.contentType, equalTo("text/plain"))
- assertThat(responseBytes, equalTo("Hello\nWorld\n".toByteArray()))
+ assertThat(responseBytes
.toByteArray()
, equalTo("Hello\nWorld\n".toByteArray()))
}
}
}
}