From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 19 Feb 2017 00:44:04 +0000 (+0100)
Subject: Replace delete sone page with Kotlin version
X-Git-Tag: 0.9.7^2~289
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=48914fe40a7db4a85e7ffd8bd4c321d9d5ba736b;p=Sone.git

Replace delete sone page with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java b/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
deleted file mode 100644
index 1390918..0000000
--- a/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Sone - DeleteSonePage.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.Sone;
-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;
-
-/**
- * Lets the user delete a Sone. Of course the Sone is not really deleted from
- * Freenet; merely all references to it are removed from the local plugin
- * installation.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class DeleteSonePage extends SoneTemplatePage {
-
-	/**
-	 * Creates a new page that will delete a Sone.
-	 *
-	 * @param template
-	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public DeleteSonePage(Template template, WebInterface webInterface) {
-		super("deleteSone.html", template, "Page.DeleteSone.Title", webInterface, true);
-	}
-
-	//
-	// TEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		if (request.getMethod() == Method.POST) {
-			if (request.getHttpRequest().isPartSet("deleteSone")) {
-				Sone currentSone = getCurrentSone(request.getToadletContext());
-				webInterface.getCore().deleteSone(currentSone);
-			}
-			throw new RedirectException("index.html");
-		}
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/DeleteSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/DeleteSonePage.kt
new file mode 100644
index 0000000..d69c3ae
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/DeleteSonePage.kt
@@ -0,0 +1,25 @@
+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
+
+/**
+ * Lets the user delete a Sone. Of course the Sone is not really deleted from
+ * Freenet; merely all references to it are removed from the local plugin
+ * installation.
+ */
+class DeleteSonePage(template: Template, webInterface: WebInterface):
+		SoneTemplatePage("deleteSone.html", template, "Page.DeleteSone.Title", webInterface, true) {
+
+	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+		if (request.method == POST) {
+			if (request.httpRequest.isPartSet("deleteSone")) {
+				webInterface.core.deleteSone(getCurrentSone(request.toadletContext))
+			}
+			throw RedirectException("index.html")
+		}
+	}
+
+}
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt
index 9a5d1d5..b51ebed 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt
@@ -1,8 +1,15 @@
 package net.pterodactylus.sone.web
 
+import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
 import org.junit.Test
+import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.any
+import org.mockito.Mockito.any
+import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 
 /**
@@ -15,15 +22,33 @@ class DeleteSonePageTest : WebPageTest() {
 	override fun getPage() = page
 
 	@Test
+	fun `page returns correct path`() {
+	    assertThat(page.path, equalTo("deleteSone.html"))
+	}
+
+	@Test
+	fun `page requires login`() {
+	    assertThat(page.requiresLogin(), equalTo(true))
+	}
+
+	@Test
+	fun `page returns correct title`() {
+	    whenever(l10n.getString("Page.DeleteSone.Title")).thenReturn("delete sone page")
+		assertThat(page.getPageTitle(freenetRequest), equalTo("delete sone page"))
+	}
+
+	@Test
 	fun `get request does not redirect`() {
 		request("", GET)
-		page.handleRequest(freenetRequest, templateContext)
+		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `post request without delete confirmation redirects to index`() {
 		request("", POST)
-		verifyRedirect("index.html")
+		verifyRedirect("index.html") {
+			verify(core, never()).deleteSone(any())
+		}
 	}
 
 	@Test