From: David ‘Bombe’ Roden Date: Sat, 29 Jun 2013 11:10:18 +0000 (+0200) Subject: Merge branch 'lock-sones-via-fcp-317' into next X-Git-Tag: 0.8.5^2~4 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=f65328fb92d16e568b869bf5f2771dd4114d8abc;hp=77804f0dda317541f8451a0649785e7cb192d696 Merge branch 'lock-sones-via-fcp-317' into next --- diff --git a/pom.xml b/pom.xml index 0e2cc60..087d690 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,13 @@ junit junit - 3.8.2 + 4.11 + test + + + org.mockito + mockito-all + 1.9.5 test diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java index c1ed953..dad5ca3 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java +++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java @@ -87,6 +87,8 @@ public class FcpInterface { commands.put("GetPost", new GetPostCommand(core)); commands.put("GetPosts", new GetPostsCommand(core)); commands.put("GetPostFeed", new GetPostFeedCommand(core)); + commands.put("LockSone", new LockSoneCommand(core)); + commands.put("UnlockSone", new UnlockSoneCommand(core)); commands.put("LikePost", new LikePostCommand(core)); commands.put("LikeReply", new LikeReplyCommand(core)); commands.put("CreatePost", new CreatePostCommand(core)); diff --git a/src/main/java/net/pterodactylus/sone/fcp/LockSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/LockSoneCommand.java new file mode 100644 index 0000000..2a0c81a --- /dev/null +++ b/src/main/java/net/pterodactylus/sone/fcp/LockSoneCommand.java @@ -0,0 +1,58 @@ +/* + * Sone - LockSoneCommand.java - Copyright © 2013 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.fcp; + +import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder; +import net.pterodactylus.sone.freenet.fcp.FcpException; + +import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; + +/** + * Implements the “LockSone” FCP command. If a valid local Sone was given as + * parameter “Sone,” this command will always lock the Sone and reply with + * “SoneLocked.” + * + * @author David ‘Bombe’ Roden + */ +public class LockSoneCommand extends AbstractSoneCommand { + + /** + * Creates a new “LockSone” FCP command. + * + * @param core + * The core to operate on + */ + public LockSoneCommand(Core core) { + super(core, true); + } + + // + // COMMAND METHODS + // + + @Override + public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { + Sone sone = getSone(parameters, "Sone", true, true); + getCore().lockSone(sone); + return new Response("SoneLocked", new SimpleFieldSetBuilder().put("Sone", sone.getId()).get()); + } + +} diff --git a/src/main/java/net/pterodactylus/sone/fcp/UnlockSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/UnlockSoneCommand.java new file mode 100644 index 0000000..a187576 --- /dev/null +++ b/src/main/java/net/pterodactylus/sone/fcp/UnlockSoneCommand.java @@ -0,0 +1,58 @@ +/* + * Sone - LockSoneCommand.java - Copyright © 2013 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.fcp; + +import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder; +import net.pterodactylus.sone.freenet.fcp.FcpException; + +import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; + +/** + * Implements the “UnlockSone” FCP command. If a valid local Sone was given as + * parameter “Sone,” this command will always unlock the Sone and reply with + * “SoneUnlocked.” + * + * @author David ‘Bombe’ Roden + */ +public class UnlockSoneCommand extends AbstractSoneCommand { + + /** + * Creates a new “LockSone” FCP command. + * + * @param core + * The core to operate on + */ + public UnlockSoneCommand(Core core) { + super(core, true); + } + + // + // COMMAND METHODS + // + + @Override + public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { + Sone sone = getSone(parameters, "Sone", true, true); + getCore().unlockSone(sone); + return new Response("SoneUnlocked", new SimpleFieldSetBuilder().put("Sone", sone.getId()).get()); + } + +} diff --git a/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java new file mode 100644 index 0000000..3789d08 --- /dev/null +++ b/src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java @@ -0,0 +1,85 @@ +/* + * Sone - LockSoneCommandTest.java - Copyright © 2013 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder; +import net.pterodactylus.sone.freenet.fcp.Command.Response; +import net.pterodactylus.sone.freenet.fcp.FcpException; + +import freenet.support.SimpleFieldSet; + +import org.junit.Test; + +/** + * Tests for {@link UnlockSoneCommand}. + * + * @author David ‘Bombe’ Roden + */ +public class LockSoneCommandTest { + + @Test + public void testLockingALocalSone() throws FcpException { + Sone localSone = mock(Sone.class); + when(localSone.getId()).thenReturn("LocalSone"); + Core core = mock(Core.class); + when(core.getSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone); + when(core.getLocalSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone); + SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "LocalSone").get(); + + LockSoneCommand lockSoneCommand = new LockSoneCommand(core); + Response response = lockSoneCommand.execute(fields, null, null); + + verify(core).lockSone(eq(localSone)); + assertThat(response, notNullValue()); + assertThat(response.getReplyParameters(), notNullValue()); + assertThat(response.getReplyParameters().get("Message"), is("SoneLocked")); + assertThat(response.getReplyParameters().get("Sone"), is("LocalSone")); + } + + @Test(expected = FcpException.class) + public void testLockingARemoteSone() throws FcpException { + Sone removeSone = mock(Sone.class); + Core core = mock(Core.class); + when(core.getSone(eq("RemoteSone"), anyBoolean())).thenReturn(removeSone); + SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "RemoteSone").get(); + + LockSoneCommand lockSoneCommand = new LockSoneCommand(core); + lockSoneCommand.execute(fields, null, null); + } + + @Test(expected = FcpException.class) + public void testMissingSone() throws FcpException { + Core core = mock(Core.class); + SimpleFieldSet fields = new SimpleFieldSetBuilder().get(); + + LockSoneCommand lockSoneCommand = new LockSoneCommand(core); + lockSoneCommand.execute(fields, null, null); + } + +} diff --git a/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java new file mode 100644 index 0000000..05fc73c --- /dev/null +++ b/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java @@ -0,0 +1,85 @@ +/* + * Sone - LockSoneCommandTest.java - Copyright © 2013 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder; +import net.pterodactylus.sone.freenet.fcp.Command.Response; +import net.pterodactylus.sone.freenet.fcp.FcpException; + +import freenet.support.SimpleFieldSet; + +import org.junit.Test; + +/** + * Tests for {@link LockSoneCommand}. + * + * @author David ‘Bombe’ Roden + */ +public class UnlockSoneCommandTest { + + @Test + public void testUnlockingALocalSone() throws FcpException { + Sone localSone = mock(Sone.class); + when(localSone.getId()).thenReturn("LocalSone"); + Core core = mock(Core.class); + when(core.getSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone); + when(core.getLocalSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone); + SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "LocalSone").get(); + + UnlockSoneCommand unlockSoneCommand = new UnlockSoneCommand(core); + Response response = unlockSoneCommand.execute(fields, null, null); + + verify(core).unlockSone(eq(localSone)); + assertThat(response, notNullValue()); + assertThat(response.getReplyParameters(), notNullValue()); + assertThat(response.getReplyParameters().get("Message"), is("SoneUnlocked")); + assertThat(response.getReplyParameters().get("Sone"), is("LocalSone")); + } + + @Test(expected = FcpException.class) + public void testUnlockingARemoteSone() throws FcpException { + Sone removeSone = mock(Sone.class); + Core core = mock(Core.class); + when(core.getSone(eq("RemoteSone"), anyBoolean())).thenReturn(removeSone); + SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "RemoteSone").get(); + + UnlockSoneCommand unlockSoneCommand = new UnlockSoneCommand(core); + unlockSoneCommand.execute(fields, null, null); + } + + @Test(expected = FcpException.class) + public void testMissingSone() throws FcpException { + Core core = mock(Core.class); + SimpleFieldSet fields = new SimpleFieldSetBuilder().get(); + + UnlockSoneCommand unlockSoneCommand = new UnlockSoneCommand(core); + unlockSoneCommand.execute(fields, null, null); + } + +}