X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserterTest.java;h=f9905000f7f3622c0535c7f0a933d9916922b1cf;hb=5896b708bc8ca0b4e3b8f240875b1fa0930a895e;hp=94eabb0a0c877a940b4b6a47119d9d6b5d4bc8eb;hpb=2bacfa78f3191fd9847574a6c8b218a4882844a4;p=Sone.git diff --git a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java index 94eabb0..f990500 100644 --- a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java +++ b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java @@ -1,7 +1,7 @@ package net.pterodactylus.sone.core; import static com.google.common.io.ByteStreams.toByteArray; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static java.lang.System.currentTimeMillis; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -64,7 +64,7 @@ public class SoneInserterTest { @Test public void insertionDelayIsForwardedToSoneInserter() { - EventBus eventBus = new AsyncEventBus(sameThreadExecutor()); + EventBus eventBus = new AsyncEventBus(directExecutor()); eventBus.register(new SoneInserter(core, eventBus, freenetInterface, "SoneId")); eventBus.post(new InsertionDelayChangedEvent(15)); assertThat(SoneInserter.getInsertionDelay().get(), is(15)); @@ -130,9 +130,9 @@ public class SoneInserterTest { verify(freenetInterface).insertDirectory(eq(insertUri), any(HashMap.class), eq("index.html")); verify(eventBus, times(2)).post(soneEvents.capture()); assertThat(soneEvents.getAllValues().get(0), instanceOf(SoneInsertingEvent.class)); - assertThat(soneEvents.getAllValues().get(0).sone(), is(sone)); + assertThat(soneEvents.getAllValues().get(0).getSone(), is(sone)); assertThat(soneEvents.getAllValues().get(1), instanceOf(SoneInsertedEvent.class)); - assertThat(soneEvents.getAllValues().get(1).sone(), is(sone)); + assertThat(soneEvents.getAllValues().get(1).getSone(), is(sone)); } @Test @@ -156,9 +156,9 @@ public class SoneInserterTest { verify(freenetInterface).insertDirectory(eq(insertUri), any(HashMap.class), eq("index.html")); verify(eventBus, times(2)).post(soneEvents.capture()); assertThat(soneEvents.getAllValues().get(0), instanceOf(SoneInsertingEvent.class)); - assertThat(soneEvents.getAllValues().get(0).sone(), is(sone)); + assertThat(soneEvents.getAllValues().get(0).getSone(), is(sone)); assertThat(soneEvents.getAllValues().get(1), instanceOf(SoneInsertedEvent.class)); - assertThat(soneEvents.getAllValues().get(1).sone(), is(sone)); + assertThat(soneEvents.getAllValues().get(1).getSone(), is(sone)); verify(core, never()).touchConfiguration(); } @@ -206,9 +206,9 @@ public class SoneInserterTest { verify(freenetInterface).insertDirectory(eq(insertUri), any(HashMap.class), eq("index.html")); verify(eventBus, times(2)).post(soneEvents.capture()); assertThat(soneEvents.getAllValues().get(0), instanceOf(SoneInsertingEvent.class)); - assertThat(soneEvents.getAllValues().get(0).sone(), is(sone)); + assertThat(soneEvents.getAllValues().get(0).getSone(), is(sone)); assertThat(soneEvents.getAllValues().get(1), instanceOf(SoneInsertAbortedEvent.class)); - assertThat(soneEvents.getAllValues().get(1).sone(), is(sone)); + assertThat(soneEvents.getAllValues().get(1).getSone(), is(sone)); verify(core, never()).touchConfiguration(); }