X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserterTest.java;h=d43f38383509988c6dca08d14a42cec559697d24;hb=c5fff3247c8a680f816db28df64d6439779f5c82;hp=9efd4dd73b1aaa0f7de6f36256bc41313da90292;hpb=1c0a2b5e67dda41e75d2315fd0f6f1cfecf26fa6;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 9efd4dd..d43f383 100644 --- a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java +++ b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java @@ -2,6 +2,7 @@ package net.pterodactylus.sone.core; import static com.google.common.base.Optional.absent; import static com.google.common.base.Optional.of; +import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.instanceOf; @@ -20,7 +21,7 @@ import static org.mockito.Mockito.when; import java.util.HashMap; import net.pterodactylus.sone.core.SoneInserter.InsertInformation; -import net.pterodactylus.sone.core.SoneInserter.SetInsertionDelay; +import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent; import net.pterodactylus.sone.core.event.SoneEvent; import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent; import net.pterodactylus.sone.core.event.SoneInsertedEvent; @@ -31,6 +32,7 @@ import net.pterodactylus.sone.data.Sone; import freenet.keys.FreenetURI; import com.google.common.base.Optional; +import com.google.common.eventbus.AsyncEventBus; import com.google.common.eventbus.EventBus; import org.junit.Before; import org.junit.Test; @@ -58,8 +60,9 @@ public class SoneInserterTest { @Test public void insertionDelayIsForwardedToSoneInserter() { - SetInsertionDelay setInsertionDelay = new SetInsertionDelay(); - setInsertionDelay.optionChanged(null, null, 15); + EventBus eventBus = new AsyncEventBus(sameThreadExecutor()); + eventBus.register(new SoneInserter(core, eventBus, freenetInterface, "SoneId")); + eventBus.post(new InsertionDelayChangedEvent(15)); assertThat(SoneInserter.getInsertionDelay().get(), is(15)); } @@ -73,7 +76,6 @@ public class SoneInserterTest { InsertInformation insertInformation = soneInserter.new InsertInformation(sone); HashMap manifestEntries = insertInformation.generateManifestEntries(); assertThat(manifestEntries.keySet(), containsInAnyOrder("index.html", "sone.xml")); - assertThat(insertInformation.getInsertUri(), is(insertUri)); assertThat(insertInformation.getFingerprint(), is(fingerprint)); }