X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserterTest.java;h=31d7b6bec10bbe660ba41f8a81536bb7351db92e;hp=552746e721854892c21f86b2e17d6b8910ef0b4b;hb=b4d2d68b5ea4f4edc7337f380cfe078756678126;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3

diff --git a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java
index 552746e..31d7b6b 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java
@@ -1,24 +1,23 @@
 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 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;
 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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class SoneInserterTest {
 
@@ -62,12 +59,12 @@ public class SoneInserterTest {
 	public void setupCore() {
 		UpdateChecker updateChecker = mock(UpdateChecker.class);
 		when(core.getUpdateChecker()).thenReturn(updateChecker);
-		when(core.getSone(anyString())).thenReturn(Optional.<Sone>absent());
+		when(core.getSone(anyString())).thenReturn(null);
 	}
 
 	@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));
@@ -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.<Sone>absent());
+		when(core.getSone("SoneId")).thenReturn(null);
 		soneInserter.serviceRun();
 	}
 
@@ -251,7 +248,7 @@ public class SoneInserterTest {
 	@Test
 	public void templateIsRenderedCorrectlyForManifestElement()
 	throws IOException {
-		Map<String, Object> soneProperties = new HashMap<String, Object>();
+		Map<String, Object> soneProperties = new HashMap<>();
 		soneProperties.put("id", "SoneId");
 		ManifestCreator manifestCreator = new ManifestCreator(core, soneProperties);
 		long now = currentTimeMillis();
@@ -260,14 +257,14 @@ public class SoneInserterTest {
 		assertThat(manifestElement.getName(), is("test.txt"));
 		assertThat(manifestElement.getMimeTypeOverride(), is("plain/text; charset=utf-8"));
 		String templateContent = new String(toByteArray(manifestElement.getData().getInputStream()), Charsets.UTF_8);
-		assertThat(templateContent, containsString("Sone Version: " + SonePlugin.VERSION.toString() + "\n"));
+		assertThat(templateContent, containsString("Sone Version: " + SonePlugin.getPluginVersion() + "\n"));
 		assertThat(templateContent, containsString("Core Startup: " + now + "\n"));
 		assertThat(templateContent, containsString("Sone ID: " + "SoneId" + "\n"));
 	}
 
 	@Test
 	public void invalidTemplateReturnsANullManifestElement() {
-		Map<String, Object> soneProperties = new HashMap<String, Object>();
+		Map<String, Object> soneProperties = new HashMap<>();
 		ManifestCreator manifestCreator = new ManifestCreator(core, soneProperties);
 		assertThat(manifestCreator.createManifestElement("test.txt",
 				"plain/text; charset=utf-8",
@@ -277,7 +274,7 @@ public class SoneInserterTest {
 
 	@Test
 	public void errorWhileRenderingTemplateReturnsANullManifestElement() {
-		Map<String, Object> soneProperties = new HashMap<String, Object>();
+		Map<String, Object> soneProperties = new HashMap<>();
 		ManifestCreator manifestCreator = new ManifestCreator(core, soneProperties);
 		when(core.toString()).thenThrow(NullPointerException.class);
 		assertThat(manifestCreator.createManifestElement("test.txt",