X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.java;h=c91de6887bfa068949539f77c803e390fb457eec;hp=195876fb986dde6bbc70b3cd9e821de9c3045061;hb=2bacfa78f3191fd9847574a6c8b218a4882844a4;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..c91de68 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;
@@ -83,8 +82,6 @@ import org.mockito.ArgumentMatchers;
 
 /**
  * Unit test for {@link FreenetInterface}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class FreenetInterfaceTest {
 
@@ -215,7 +212,7 @@ public class FreenetInterfaceTest {
 	@Test
 	public void insertingADirectory() throws InsertException, SoneException {
 		FreenetURI freenetUri = mock(FreenetURI.class);
-		HashMap<String, Object> manifestEntries = new HashMap<String, Object>();
+		HashMap<String, Object> manifestEntries = new HashMap<>();
 		String defaultFile = "index.html";
 		FreenetURI resultingUri = mock(FreenetURI.class);
 		when(highLevelSimpleClient.insertManifest(eq(freenetUri), eq(manifestEntries), eq(defaultFile))).thenReturn(resultingUri);
@@ -240,7 +237,7 @@ public class FreenetInterfaceTest {
 		FreenetURI freenetUri = createRandom(randomSource, "test-0").getURI().uskForSSK();
 		Callback callback = mock(Callback.class);
 		freenetInterface.registerUsk(freenetUri, callback);
-		verify(uskManager).subscribe(any(USK.class), any(USKCallback.class), anyBoolean(), eq((RequestClient) highLevelSimpleClient));
+		verify(uskManager).subscribe(any(USK.class), any(USKCallback.class), anyBoolean(), any(RequestClient.class));
 	}
 
 	@Test
@@ -248,7 +245,7 @@ public class FreenetInterfaceTest {
 		FreenetURI freenetUri = new FreenetURI("KSK@GPLv3.txt");
 		Callback callback = mock(Callback.class);
 		freenetInterface.registerUsk(freenetUri, callback);
-		verify(uskManager, never()).subscribe(any(USK.class), any(USKCallback.class), anyBoolean(), eq((RequestClient) highLevelSimpleClient));
+		verify(uskManager, never()).subscribe(any(USK.class), any(USKCallback.class), anyBoolean(), any(RequestClient.class));
 	}
 
 	@Test
@@ -272,9 +269,7 @@ public class FreenetInterfaceTest {
 	throws MalformedURLException {
 		FreenetURI freenetUri = createRandom(randomSource, "test-0").getURI();
 		freenetInterface.registerActiveUsk(freenetUri, null);
-		verify(uskManager, never()).subscribe(any(USK.class),
-				any(USKCallback.class), anyBoolean(),
-				eq((RequestClient) highLevelSimpleClient));
+		verify(uskManager, never()).subscribe(any(USK.class), any(USKCallback.class), anyBoolean(), any(RequestClient.class));
 	}
 
 	@Test
@@ -282,9 +277,7 @@ public class FreenetInterfaceTest {
 	throws MalformedURLException {
 		FreenetURI freenetUri = createRandom(randomSource, "test-0").getURI();
 		freenetInterface.registerPassiveUsk(freenetUri, null);
-		verify(uskManager, never()).subscribe(any(USK.class),
-				any(USKCallback.class), anyBoolean(),
-				eq((RequestClient) highLevelSimpleClient));
+		verify(uskManager, never()).subscribe(any(USK.class), any(USKCallback.class), anyBoolean(), any(RequestClient.class));
 	}
 
 	@Test
@@ -420,7 +413,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 +433,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());