projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🎨 Replace Plugin containers with Kotlin versions
[Sone.git]
/
src
/
test
/
java
/
net
/
pterodactylus
/
sone
/
web
/
AllPagesTest.kt
diff --git
a/src/test/java/net/pterodactylus/sone/web/AllPagesTest.kt
b/src/test/java/net/pterodactylus/sone/web/AllPagesTest.kt
index
4c18276
..
ea28025
100644
(file)
--- a/
src/test/java/net/pterodactylus/sone/web/AllPagesTest.kt
+++ b/
src/test/java/net/pterodactylus/sone/web/AllPagesTest.kt
@@
-1,9
+1,9
@@
package net.pterodactylus.sone.web
package net.pterodactylus.sone.web
-import com.google.inject.Guice
-import net.pterodactylus.sone.
main.SonePlugin.PluginHomepag
e
-import net.pterodactylus.sone.
main.SonePlugin.PluginVersion
-import net.pterodactylus.sone.main.
SonePlugin.PluginYear
+import com.google.inject.Guice
.createInjector
+import net.pterodactylus.sone.
core.Cor
e
+import net.pterodactylus.sone.
core.FreenetInterface
+import net.pterodactylus.sone.main.
*
import net.pterodactylus.sone.test.getInstance
import net.pterodactylus.sone.test.isProvidedByMock
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.test.getInstance
import net.pterodactylus.sone.test.isProvidedByMock
import net.pterodactylus.util.template.Template
@@
-17,9
+17,7
@@
import org.junit.Test
class AllPagesTest {
private val injector by lazy {
class AllPagesTest {
private val injector by lazy {
- Guice.createInjector(
- Template::class.isProvidedByMock(),
- WebInterface::class.isProvidedByMock(),
+ baseInjector.createChildInjector(
PluginVersion::class.isProvidedByMock(),
PluginYear::class.isProvidedByMock(),
PluginHomepage::class.isProvidedByMock()
PluginVersion::class.isProvidedByMock(),
PluginYear::class.isProvidedByMock(),
PluginHomepage::class.isProvidedByMock()
@@
-33,3
+31,12
@@
class AllPagesTest {
}
}
}
}
+
+val baseInjector by lazy {
+ createInjector(
+ Core::class.isProvidedByMock(),
+ FreenetInterface::class.isProvidedByMock(),
+ Template::class.isProvidedByMock(),
+ WebInterface::class.isProvidedByMock()
+ )!!
+}