X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.java;h=9391bde8d73a570486761304067bd709840ec91c;hb=a10581786668d3bd2936c2963210f1408be98ead;hp=c91de6887bfa068949539f77c803e390fb457eec;hpb=03cec6a6772c2d836d94864adddaf544cbe9d72f;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 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 = forClass(ImageInsertStartedEvent.class); verify(eventBus).post(imageInsertStartedEvent.capture()); - assertThat(imageInsertStartedEvent.getValue().image(), is(image)); + assertThat(imageInsertStartedEvent.getValue().getImage(), is(image)); insertToken.cancel(); ArgumentCaptor 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 = 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.is(insertException)); } @Test @@ -378,8 +380,8 @@ public class FreenetInterfaceTest { ArgumentCaptor 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 = 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 = 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