📈 Use different configuration for histogram

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

diff --git a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
index 283d2e2..9391bde 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
@@ -31,7 +31,6 @@ import java.util.HashMap;
 
 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;
@@ -76,6 +75,7 @@ import freenet.support.io.ArrayBucket;
 import freenet.support.io.ResumeFailedException;
 
 import com.google.common.eventbus.EventBus;
+import org.hamcrest.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -83,8 +83,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 +213,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 +238,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 +246,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 +270,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 +278,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
@@ -360,22 +354,23 @@ public class FreenetInterfaceTest {
                insertToken.setClientPutter(clientPutter);
                ArgumentCaptor<ImageInsertStartedEvent> imageInsertStartedEvent = forClass(ImageInsertStartedEvent.class);
                verify(eventBus).post(imageInsertStartedEvent.capture());
-               assertThat(imageInsertStartedEvent.getValue().image(), is(image));
+               assertThat(imageInsertStartedEvent.getValue().getImage(), is(image));
                insertToken.cancel();
                ArgumentCaptor<ImageInsertAbortedEvent> imageInsertAbortedEvent = forClass(ImageInsertAbortedEvent.class);
                verify(eventBus, times(2)).post(imageInsertAbortedEvent.capture());
                verify(bucket).free();
-               assertThat(imageInsertAbortedEvent.getValue().image(), is(image));
+               assertThat(imageInsertAbortedEvent.getValue().getImage(), is(image));
        }
 
        @Test
        public void failureWithoutExceptionSendsFailedEvent() {
-               insertToken.onFailure(null, null);
+               InsertException insertException = new InsertException(mock(InsertException.class));
+               insertToken.onFailure(insertException, null);
                ArgumentCaptor<ImageInsertFailedEvent> imageInsertFailedEvent = forClass(ImageInsertFailedEvent.class);
                verify(eventBus).post(imageInsertFailedEvent.capture());
                verify(bucket).free();
-               assertThat(imageInsertFailedEvent.getValue().image(), is(image));
-               assertThat(imageInsertFailedEvent.getValue().cause(), nullValue());
+               assertThat(imageInsertFailedEvent.getValue().getImage(), is(image));
+               assertThat(imageInsertFailedEvent.getValue().getCause(), Matchers.<Throwable>is(insertException));
        }
 
        @Test
@@ -385,8 +380,8 @@ public class FreenetInterfaceTest {
                ArgumentCaptor<ImageInsertFailedEvent> imageInsertFailedEvent = forClass(ImageInsertFailedEvent.class);
                verify(eventBus).post(imageInsertFailedEvent.capture());
                verify(bucket).free();
-               assertThat(imageInsertFailedEvent.getValue().image(), is(image));
-               assertThat(imageInsertFailedEvent.getValue().cause(), is((Throwable) insertException));
+               assertThat(imageInsertFailedEvent.getValue().getImage(), is(image));
+               assertThat(imageInsertFailedEvent.getValue().getCause(), is((Throwable) insertException));
        }
 
        @Test
@@ -396,7 +391,7 @@ public class FreenetInterfaceTest {
                ArgumentCaptor<ImageInsertAbortedEvent> imageInsertAbortedEvent = forClass(ImageInsertAbortedEvent.class);
                verify(eventBus).post(imageInsertAbortedEvent.capture());
                verify(bucket).free();
-               assertThat(imageInsertAbortedEvent.getValue().image(), is(image));
+               assertThat(imageInsertAbortedEvent.getValue().getImage(), is(image));
        }
 
        @Test
@@ -414,8 +409,8 @@ public class FreenetInterfaceTest {
                ArgumentCaptor<ImageInsertFinishedEvent> imageInsertFinishedEvent = forClass(ImageInsertFinishedEvent.class);
                verify(eventBus).post(imageInsertFinishedEvent.capture());
                verify(bucket).free();
-               assertThat(imageInsertFinishedEvent.getValue().image(), is(image));
-               assertThat(imageInsertFinishedEvent.getValue().resultingUri(), is(generatedUri));
+               assertThat(imageInsertFinishedEvent.getValue().getImage(), is(image));
+               assertThat(imageInsertFinishedEvent.getValue().getResultingUri(), is(generatedUri));
        }
 
        @Test