X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.java;h=9391bde8d73a570486761304067bd709840ec91c;hp=c91de6887bfa068949539f77c803e390fb457eec;hb=381ae78f799b609194c53c3da256cff9daa4d2ff;hpb=12bfebd4792c55f72dc6b5463a38a28c04c056f3

diff --git a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
index c91de68..9391bde 100644
--- a/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java
@@ -75,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;
@@ -353,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
@@ -378,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
@@ -389,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
@@ -407,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