🎨 Reduce dependency on Node’s fields

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / core / FreenetInterfaceTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt
index a7b187d..ffd5c60 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt
@@ -51,13 +51,13 @@ class FreenetInterfaceTest {
        @Suppress("UnstableApiUsage")
        private val eventBus = mock<EventBus>()
        private val node = mock<Node>()
-       private val nodeClientCore = mock<NodeClientCore>()
+       private val clientContext = mock<ClientContext>()
        private val highLevelSimpleClient: HighLevelSimpleClient = mock(HighLevelSimpleClient::class.java, withSettings().extraInterfaces(RequestClient::class.java))
        private val randomSource = DummyRandomSource()
        private val uskManager = mock<USKManager>()
        private val sone = mock<Sone>()
        private val callbackCaptor: ArgumentCaptor<USKCallback> = forClass(USKCallback::class.java)
-       private val image = mock<Image>()
+       private val image: Image = ImageImpl()
        private val insertToken: InsertToken
        private val bucket = mock<Bucket>()
        private val clientGetCallback: ArgumentCaptor<ClientGetCallback> = forClass(ClientGetCallback::class.java)
@@ -69,12 +69,8 @@ class FreenetInterfaceTest {
        private val freenetInterface: FreenetInterface
 
        init {
-               whenever(nodeClientCore.makeClient(anyShort(), anyBoolean(), anyBoolean())).thenReturn(highLevelSimpleClient)
-               setField(node, "clientCore", nodeClientCore)
                setField(node, "random", randomSource)
-               setField(nodeClientCore, "uskManager", uskManager)
-               setField(nodeClientCore, "clientContext", mock<ClientContext>())
-               freenetInterface = FreenetInterface(eventBus, node, soneUriCreator)
+               freenetInterface = FreenetInterface(eventBus, node, uskManager, clientContext, soneUriCreator) { _, _, _ -> highLevelSimpleClient }
                insertToken = freenetInterface.InsertToken(image)
                insertToken.setBucket(bucket)
        }