From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 21 Nov 2019 06:20:05 +0000 (+0100)
Subject: 🔀 Merge next
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=refs%2Fheads%2Fadd-audio-player;p=Sone.git

🔀 Merge next
---

d50730f6a330439e0e7ef97ca9329dffe72d5640
diff --cc src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt
index 0e6a0c0,c66e6ff..fb9217e
--- a/src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt
@@@ -4,13 -4,12 +4,11 @@@ import com.google.common.base.Ticke
  import com.google.common.io.ByteStreams
  import freenet.keys.FreenetURI
  import net.pterodactylus.sone.core.FreenetInterface.BackgroundFetchCallback
- import net.pterodactylus.sone.test.capture
- import net.pterodactylus.sone.test.mock
+ import net.pterodactylus.sone.test.*
  import org.hamcrest.MatcherAssert.assertThat
  import org.hamcrest.Matchers.equalTo
 -import org.junit.Test
  import org.mockito.ArgumentMatchers.any
  import org.mockito.ArgumentMatchers.eq
- import org.mockito.Mockito.`when`
  import org.mockito.Mockito.times
  import org.mockito.Mockito.verify
  import java.io.ByteArrayOutputStream