projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🎨 Store shells instead of full posts in in-memory database
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
WebInterfaceModuleTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
index
ec45e67
..
9c0860c
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
@@
-2,8
+2,6
@@
package net.pterodactylus.sone.web
import com.google.inject.Guice.*
import freenet.client.*
import com.google.inject.Guice.*
import freenet.client.*
-import freenet.clients.http.*
-import freenet.l10n.*
import freenet.support.api.*
import net.pterodactylus.sone.core.*
import net.pterodactylus.sone.data.*
import freenet.support.api.*
import net.pterodactylus.sone.core.*
import net.pterodactylus.sone.data.*
@@
-20,9
+18,8
@@
import net.pterodactylus.util.template.*
import net.pterodactylus.util.web.*
import org.hamcrest.MatcherAssert.*
import org.hamcrest.Matchers.*
import net.pterodactylus.util.web.*
import org.hamcrest.MatcherAssert.*
import org.hamcrest.Matchers.*
-import org.junit.*
import java.util.*
import java.util.*
-import kotlin.test.
Test
+import kotlin.test.
*
class WebInterfaceModuleTest {
class WebInterfaceModuleTest {
@@
-39,8
+36,7
@@
class WebInterfaceModuleTest {
SoneTextParser::class.isProvidedByMock(),
ElementLoader::class.isProvidedByMock(),
Loaders::class.isProvidedBy(loaders),
SoneTextParser::class.isProvidedByMock(),
ElementLoader::class.isProvidedByMock(),
Loaders::class.isProvidedBy(loaders),
- HighLevelSimpleClient::class.isProvidedByMock(),
- SessionManager::class.isProvidedByMock()
+ HighLevelSimpleClient::class.isProvidedByMock()
)
private val injector = createInjector(webInterfaceModule, *additionalModules)!!
private val templateContext by lazy { injector.getInstance<TemplateContextFactory>().createTemplateContext()!! }
)
private val injector = createInjector(webInterfaceModule, *additionalModules)!!
private val templateContext by lazy { injector.getInstance<TemplateContextFactory>().createTemplateContext()!! }
@@
-257,9
+253,7
@@
class WebInterfaceModuleTest {
@Test
fun `template context factory is created as singleton`() {
@Test
fun `template context factory is created as singleton`() {
- val factory1 = injector.getInstance<TemplateContextFactory>()
- val factory2 = injector.getInstance<TemplateContextFactory>()
- assertThat(factory1, sameInstance(factory2))
+ injector.verifySingletonInstance<TemplateContextFactory>()
}
@Test
}
@Test
@@
-281,14
+275,12
@@
class WebInterfaceModuleTest {
@Test
fun `page toadlet factory is created with correct prefix`() {
val page = mock<Page<FreenetRequest>>()
@Test
fun `page toadlet factory is created with correct prefix`() {
val page = mock<Page<FreenetRequest>>()
- assertThat(injector.getInstance<PageToadletFactory>().createPageToadlet(page).path(), startsWith("/Sone/"))
+
assertThat(injector.getInstance<PageToadletFactory>().createPageToadlet(page).path(), startsWith("/Sone/"))
}
@Test
fun `notification manager is created as singleton`() {
}
@Test
fun `notification manager is created as singleton`() {
- val firstNotificationManager = injector.getInstance<NotificationManager>()
- val secondNotificationManager = injector.getInstance<NotificationManager>()
- assertThat(firstNotificationManager, sameInstance(secondNotificationManager))
+ injector.verifySingletonInstance<NotificationManager>()
}
}
}
}