Replace delete reply page with Kotlin version

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
deleted file mode 100644 (file)
index aa8bc8f..0000000
--- a/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Sone - DeleteReplyPage.java - Copyright © 2010–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
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web;
-
-import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.template.Template;
-import net.pterodactylus.util.template.TemplateContext;
-import net.pterodactylus.util.web.Method;
-
-import com.google.common.base.Optional;
-
-/**
- * This page lets the user delete a reply.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class DeleteReplyPage extends SoneTemplatePage {
-
-       /**
-        * Creates a new “delete reply” page.
-        *
-        * @param template
-        *            The template to render
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public DeleteReplyPage(Template template, WebInterface webInterface) {
-               super("deleteReply.html", template, "Page.DeleteReply.Title", webInterface, true);
-       }
-
-       //
-       // TEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               String replyId = request.getHttpRequest().getPartAsStringFailsafe("reply", 36);
-               Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
-               String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
-               if (request.getMethod() == Method.POST) {
-                       if (!reply.isPresent() || !reply.get().getSone().isLocal()) {
-                               throw new RedirectException("noPermission.html");
-                       }
-                       if (request.getHttpRequest().isPartSet("confirmDelete")) {
-                               webInterface.getCore().deleteReply(reply.get());
-                               throw new RedirectException(returnPage);
-                       } else if (request.getHttpRequest().isPartSet("abortDelete")) {
-                               throw new RedirectException(returnPage);
-                       }
-               }
-               templateContext.set("reply", replyId);
-               templateContext.set("returnPage", returnPage);
-       }
-
-}

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/DeleteReplyPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/DeleteReplyPage.kt
new file mode 100644 (file)
index 0000000..096ac0d
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/DeleteReplyPage.kt
@@ -0,0 +1,34 @@
+package net.pterodactylus.sone.web
+
+import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.util.template.Template
+import net.pterodactylus.util.template.TemplateContext
+import net.pterodactylus.util.web.Method.POST
+
+/**
+ * This page lets the user delete a reply.
+ */
+class DeleteReplyPage(template: Template, webInterface: WebInterface):
+               SoneTemplatePage("deleteReply.html", template, "Page.DeleteReply.Title", webInterface, true) {
+
+       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+               val replyId = request.httpRequest.getPartAsStringFailsafe("reply", 36)
+               templateContext["reply"] = replyId
+               val returnPage = request.httpRequest.getPartAsStringFailsafe("returnPage", 256)
+               templateContext["returnPage"] = returnPage
+               if (request.method == POST) {
+                       val reply = webInterface.core.getPostReply(replyId).orNull() ?: throw RedirectException("noPermission.html")
+                       if (!reply.sone.isLocal) {
+                               throw RedirectException("noPermission.html")
+                       }
+                       if (request.httpRequest.isPartSet("confirmDelete")) {
+                               webInterface.core.deleteReply(reply)
+                               throw RedirectException(returnPage)
+                       }
+                       if (request.httpRequest.isPartSet("abortDelete")) {
+                               throw RedirectException(returnPage)
+                       }
+               }
+       }
+
+}

diff --git a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
index 2bd2680..6f99879 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
@@ -243,6 +243,7 @@ public abstract class WebPageTest {
                        }
                });
                when(core.getPost(anyString())).thenReturn(Optional.<Post>absent());
                        }
                });
                when(core.getPost(anyString())).thenReturn(Optional.<Post>absent());

+               when(core.getPostReply(anyString())).thenReturn(Optional.<PostReply>absent());

                when(core.getReplies(anyString())).thenAnswer(new Answer<List<PostReply>>() {
                        @Override
                        public List<PostReply> answer(InvocationOnMock invocation) throws Throwable {
                when(core.getReplies(anyString())).thenAnswer(new Answer<List<PostReply>>() {
                        @Override
                        public List<PostReply> answer(InvocationOnMock invocation) throws Throwable {

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
index 1b202e4..b7b92ae 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
@@ -32,11 +32,21 @@ class DeleteReplyPageTest : WebPageTest() {
        }
 
        @Test
        }
 
        @Test

+       fun `page returns correct path`() {
+           assertThat(page.path, equalTo("deleteReply.html"))
+       }
+
+       @Test
+       fun `page requires login`() {
+           assertThat(page.requiresLogin(), equalTo(true))
+       }
+
+       @Test

        fun `get request sets reply ID and return page in template context`() {
                request("", GET)
                addHttpRequestParameter("reply", "reply-id")
                addHttpRequestParameter("returnPage", "return.html")
        fun `get request sets reply ID and return page in template context`() {
                request("", GET)
                addHttpRequestParameter("reply", "reply-id")
                addHttpRequestParameter("returnPage", "return.html")

-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)

                assertThat(templateContext["reply"], equalTo<Any>("reply-id"))
                assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
        }
                assertThat(templateContext["reply"], equalTo<Any>("reply-id"))
                assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
        }


@@ -47,7 +57,7 @@ class DeleteReplyPageTest : WebPageTest() {
                addPostReply("reply-id", reply)
                addHttpRequestParameter("reply", "reply-id")
                addHttpRequestParameter("returnPage", "return.html")
                addPostReply("reply-id", reply)
                addHttpRequestParameter("reply", "reply-id")
                addHttpRequestParameter("returnPage", "return.html")

-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)

                assertThat(templateContext["reply"], equalTo<Any>("reply-id"))
                assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
        }
                assertThat(templateContext["reply"], equalTo<Any>("reply-id"))
                assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
        }