X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.java;h=9e8852b0035c9458019004d5ad905386f1b477ee;hb=8677d84408d2495fe6c3e114e64accd28d6576ec;hp=644c9fe5a793d7e845ee36734e70b8066a980c48;hpb=dd0cc4063bf64aa994f3bd68d985817d8c89bfd0;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
index 644c9fe..9e8852b 100644
--- a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
@@ -2,10 +2,12 @@ package net.pterodactylus.sone.core;
 
 import static freenet.keys.InsertableClientSSK.createRandom;
 import static freenet.node.RequestStarter.INTERACTIVE_PRIORITY_CLASS;
+import static freenet.node.RequestStarter.PREFETCH_PRIORITY_CLASS;
 import static java.lang.System.currentTimeMillis;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static net.pterodactylus.sone.Matchers.delivers;
+import static net.pterodactylus.sone.TestUtil.setFinalField;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -24,12 +26,11 @@ import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 
+import net.pterodactylus.sone.TestUtil;
 import net.pterodactylus.sone.core.FreenetInterface.Callback;
 import net.pterodactylus.sone.core.FreenetInterface.Fetched;
 import net.pterodactylus.sone.core.FreenetInterface.InsertToken;
@@ -146,21 +147,6 @@ public class FreenetInterfaceTest {
 		return new FetchResult(clientMetadata, bucket);
 	}
 
-	private void setFinalField(Object object, String fieldName, Object value) {
-		try {
-			Field clientCoreField = object.getClass().getField(fieldName);
-			clientCoreField.setAccessible(true);
-			Field modifiersField = Field.class.getDeclaredField("modifiers");
-			modifiersField.setAccessible(true);
-			modifiersField.setInt(clientCoreField, clientCoreField.getModifiers() & ~Modifier.FINAL);
-			clientCoreField.set(object, value);
-		} catch (NoSuchFieldException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	@Test
 	public void insertingAnImage() throws SoneException, InsertException, IOException {
 		TemporaryImage temporaryImage = new TemporaryImage("image-id");
@@ -176,22 +162,10 @@ public class FreenetInterfaceTest {
 		when(highLevelSimpleClient.insert(insertBlockCaptor.capture(), eq(false), eq((String) null), eq(false), eq(insertContext), eq(insertToken), anyShort())).thenReturn(clientPutter);
 		freenetInterface.insertImage(temporaryImage, image, insertToken);
 		assertThat(insertBlockCaptor.getValue().getData().getInputStream(), delivers(new byte[] { 1, 2, 3, 4 }));
-		assertThat(this.<ClientPutter>getPrivateField(insertToken, "clientPutter"), is(clientPutter));
+		assertThat(TestUtil.<ClientPutter>getPrivateField(insertToken, "clientPutter"), is(clientPutter));
 		verify(eventBus).post(any(ImageInsertStartedEvent.class));
 	}
 
-	private <T> T getPrivateField(Object object, String fieldName) {
-		try {
-			Field field = object.getClass().getDeclaredField(fieldName);
-			field.setAccessible(true);
-			return (T) field.get(object);
-		} catch (NoSuchFieldException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	@Test(expected = SoneInsertException.class)
 	public void insertExceptionCausesASoneException() throws InsertException, SoneException, IOException {
 		TemporaryImage temporaryImage = new TemporaryImage("image-id");
@@ -335,6 +309,26 @@ public class FreenetInterfaceTest {
 	}
 
 	@Test
+	public void callbackForNormalUskUsesDifferentPriorities() {
+		Callback callback = mock(Callback.class);
+		FreenetURI uri = createRandom(randomSource, "test-0").getURI().uskForSSK();
+		freenetInterface.registerUsk(uri, callback);
+		assertThat(callbackCaptor.getValue().getPollingPriorityNormal(), is(PREFETCH_PRIORITY_CLASS));
+		assertThat(callbackCaptor.getValue().getPollingPriorityProgress(), is(INTERACTIVE_PRIORITY_CLASS));
+	}
+
+	@Test
+	public void callbackForNormalUskForwardsImportantParameters() throws MalformedURLException {
+		Callback callback = mock(Callback.class);
+		FreenetURI uri = createRandom(randomSource, "test-0").getURI().uskForSSK();
+		freenetInterface.registerUsk(uri, callback);
+		USK key = mock(USK.class);
+		when(key.getURI()).thenReturn(uri);
+		callbackCaptor.getValue().onFoundEdition(3, key, null, null, false, (short) 0, null, true, true);
+		verify(callback).editionFound(eq(uri), eq(3L), eq(true), eq(true));
+	}
+
+	@Test
 	public void fetchedRetainsUriAndFetchResult() {
 		FreenetURI freenetUri = mock(FreenetURI.class);
 		FetchResult fetchResult = mock(FetchResult.class);