X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserterTest.java;h=32926e8c30064dd980e786540da059473e95c0ff;hp=1572191769977629d982e863e10aeac0fe51cc33;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=f9b5addb5d0e7a080e9f314cf6712143f5e26060
diff --git a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java
index 1572191..32926e8 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java
@@ -1,6 +1,5 @@
package net.pterodactylus.sone.core;
-import static com.google.common.base.Optional.of;
import static com.google.common.io.ByteStreams.toByteArray;
import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static java.lang.System.currentTimeMillis;
@@ -9,16 +8,16 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import java.io.IOException;
import java.util.HashMap;
@@ -49,8 +48,6 @@ import org.mockito.stubbing.Answer;
/**
* Unit test for {@link SoneInserter} and its subclasses.
- *
- * @author David âBombeâ Roden
*/
public class SoneInserterTest {
@@ -62,7 +59,7 @@ public class SoneInserterTest {
public void setupCore() {
UpdateChecker updateChecker = mock(UpdateChecker.class);
when(core.getUpdateChecker()).thenReturn(updateChecker);
- when(core.getSone(anyString())).thenReturn(Optional.absent());
+ when(core.getSone(anyString())).thenReturn(null);
}
@Test
@@ -78,7 +75,7 @@ public class SoneInserterTest {
when(sone.getInsertUri()).thenReturn(insertUri);
when(sone.getFingerprint()).thenReturn(fingerprint);
when(sone.getRootAlbum()).thenReturn(mock(Album.class));
- when(core.getSone(anyString())).thenReturn(of(sone));
+ when(core.getSone(anyString())).thenReturn(sone);
return sone;
}
@@ -223,7 +220,7 @@ public class SoneInserterTest {
new SoneInserter(core, eventBus, freenetInterface, "SoneId",
soneModificationDetector, 1);
when(soneModificationDetector.isEligibleForInsert()).thenReturn(true);
- when(core.getSone("SoneId")).thenReturn(Optional.absent());
+ when(core.getSone("SoneId")).thenReturn(null);
soneInserter.serviceRun();
}