X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.java;h=812d41f4cebc4e57231baa89cd226dd91e10511a;hp=195876fb986dde6bbc70b3cd9e821de9c3045061;hb=35deb522de06ba7d97160445683375cf87529e8d;hpb=6e91e9356231217afcecb12275882c0ebf0f34a8

diff --git a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
index 195876f..812d41f 100644
--- a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
@@ -4,8 +4,8 @@ import static freenet.client.FetchException.FetchExceptionMode.ALL_DATA_NOT_FOUN
 import static freenet.keys.InsertableClientSSK.createRandom;
 import static freenet.node.RequestStarter.INTERACTIVE_PRIORITY_CLASS;
 import static freenet.node.RequestStarter.PREFETCH_PRIORITY_CLASS;
-import static net.pterodactylus.sone.Matchers.delivers;
-import static net.pterodactylus.sone.TestUtil.setFinalField;
+import static net.pterodactylus.sone.test.Matchers.delivers;
+import static net.pterodactylus.sone.test.TestUtil.setFinalField;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -29,10 +29,8 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.HashMap;
 
-import net.pterodactylus.sone.TestUtil;
 import net.pterodactylus.sone.core.FreenetInterface.BackgroundFetchCallback;
 import net.pterodactylus.sone.core.FreenetInterface.Callback;
-import net.pterodactylus.sone.core.FreenetInterface.Fetched;
 import net.pterodactylus.sone.core.FreenetInterface.InsertToken;
 import net.pterodactylus.sone.core.FreenetInterface.InsertTokenSupplier;
 import net.pterodactylus.sone.core.event.ImageInsertAbortedEvent;
@@ -43,6 +41,7 @@ import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.data.impl.ImageImpl;
+import net.pterodactylus.sone.test.TestUtil;
 
 import freenet.client.ClientMetadata;
 import freenet.client.FetchContext;
@@ -420,7 +419,7 @@ public class FreenetInterfaceTest {
 
 	@Test
 	public void insertTokenSupplierSuppliesInsertTokens() {
-		InsertTokenSupplier insertTokenSupplier = freenetInterface.new InsertTokenSupplier();
+		InsertTokenSupplier insertTokenSupplier = new InsertTokenSupplier(freenetInterface);
 		assertThat(insertTokenSupplier.apply(image), notNullValue());
 	}
 
@@ -440,31 +439,36 @@ public class FreenetInterfaceTest {
 	@Test
 	public void requestIsNotCancelledForImageMimeType() {
 		verifySnoopCancelsRequestForMimeType("image/png", false);
+		verify(backgroundFetchCallback, never()).failed(uri);
 	}
 
 	@Test
 	public void requestIsCancelledForNullMimeType() {
 		verifySnoopCancelsRequestForMimeType(null, true);
-		verify(backgroundFetchCallback, never()).cancelForMimeType(eq(uri), ArgumentMatchers.<String>any());
+		verify(backgroundFetchCallback, never()).shouldCancel(eq(uri), ArgumentMatchers.<String>any(), anyLong());
+		verify(backgroundFetchCallback).failed(uri);
 	}
 
 	@Test
 	public void requestIsCancelledForVideoMimeType() {
 		verifySnoopCancelsRequestForMimeType("video/mkv", true);
+		verify(backgroundFetchCallback).failed(uri);
 	}
 
 	@Test
 	public void requestIsCancelledForAudioMimeType() {
 		verifySnoopCancelsRequestForMimeType("audio/mpeg", true);
+		verify(backgroundFetchCallback).failed(uri);
 	}
 
 	@Test
 	public void requestIsCancelledForTextMimeType() {
 		verifySnoopCancelsRequestForMimeType("text/plain", true);
+		verify(backgroundFetchCallback).failed(uri);
 	}
 
 	private void verifySnoopCancelsRequestForMimeType(String mimeType, boolean cancel) {
-		when(backgroundFetchCallback.cancelForMimeType(uri, mimeType)).thenReturn(cancel);
+		when(backgroundFetchCallback.shouldCancel(eq(uri), eq(mimeType), anyLong())).thenReturn(cancel);
 		freenetInterface.startFetch(uri, backgroundFetchCallback);
 		ArgumentCaptor<SnoopMetadata> snoopMetadata = forClass(SnoopMetadata.class);
 		verify(clientGetter).setMetaSnoop(snoopMetadata.capture());