Merge branch 'release-0.9.6'

[Sone.git] / src / test / java / net / pterodactylus / sone / fcp / LockSoneCommandTest.java

diff --git a/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java
index 3789d08..8d6ee61 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Sone - LockSoneCommandTest.java - Copyright © 2013 David Roden
+ * Sone - LockSoneCommandTest.java - Copyright © 2013–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +20,7 @@ package net.pterodactylus.sone.fcp;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -34,6 +33,7 @@ import net.pterodactylus.sone.freenet.fcp.FcpException;
 
 import freenet.support.SimpleFieldSet;
 
+import com.google.common.base.Optional;
 import org.junit.Test;
 
 /**
@@ -47,9 +47,10 @@ public class LockSoneCommandTest {
        public void testLockingALocalSone() throws FcpException {
                Sone localSone = mock(Sone.class);
                when(localSone.getId()).thenReturn("LocalSone");
+               when(localSone.isLocal()).thenReturn(true);
                Core core = mock(Core.class);
-               when(core.getSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone);
-               when(core.getLocalSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone);
+               when(core.getSone(eq("LocalSone"))).thenReturn(Optional.of(localSone));
+               when(core.getLocalSone(eq("LocalSone"))).thenReturn(localSone);
                SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "LocalSone").get();
 
                LockSoneCommand lockSoneCommand = new LockSoneCommand(core);
@@ -66,7 +67,7 @@ public class LockSoneCommandTest {
        public void testLockingARemoteSone() throws FcpException {
                Sone removeSone = mock(Sone.class);
                Core core = mock(Core.class);
-               when(core.getSone(eq("RemoteSone"), anyBoolean())).thenReturn(removeSone);
+               when(core.getSone(eq("RemoteSone"))).thenReturn(Optional.of(removeSone));
                SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "RemoteSone").get();
 
                LockSoneCommand lockSoneCommand = new LockSoneCommand(core);