From 8e1bc4537886c3ca59d9b026b8ecb6e750385d31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 15 Feb 2017 07:23:36 +0100 Subject: [PATCH] Replace delete profile field page with Kotlin version --- .../sone/web/DeleteProfileFieldPage.java | 79 ---------------------- .../sone/web/DeleteProfileFieldPage.kt | 26 +++++++ .../sone/web/DeleteProfileFieldPageTest.kt | 20 +++++- 3 files changed, 43 insertions(+), 82 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java deleted file mode 100644 index ffab3b7..0000000 --- a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Sone - DeleteProfileFieldPage.java - Copyright © 2011–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 . - */ - -package net.pterodactylus.sone.web; - -import net.pterodactylus.sone.data.Profile; -import net.pterodactylus.sone.data.Profile.Field; -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; - -/** - * Page that lets the user confirm the deletion of a profile field. - * - * @author David ‘Bombe’ Roden - */ -public class DeleteProfileFieldPage extends SoneTemplatePage { - - /** - * Creates a new “delete profile field” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public DeleteProfileFieldPage(Template template, WebInterface webInterface) { - super("deleteProfileField.html", template, "Page.DeleteProfileField.Title", webInterface, true); - } - - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - Sone currentSone = getCurrentSone(request.getToadletContext()); - Profile profile = currentSone.getProfile(); - - /* get parameters from request. */ - String fieldId = request.getHttpRequest().getParam("field"); - Field field = profile.getFieldById(fieldId); - if (field == null) { - throw new RedirectException("invalid.html"); - } - - /* process POST request. */ - if (request.getMethod() == Method.POST) { - if (request.getHttpRequest().getPartAsStringFailsafe("confirm", 4).equals("true")) { - profile.removeField(field); - currentSone.setProfile(profile); - } - throw new RedirectException("editProfile.html#profile-fields"); - } - - /* set current values in template. */ - templateContext.set("field", field); - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPage.kt new file mode 100644 index 0000000..b053eab --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPage.kt @@ -0,0 +1,26 @@ +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 + +/** + * Page that lets the user confirm the deletion of a profile field. + */ +class DeleteProfileFieldPage(template: Template, webInterface: WebInterface): + SoneTemplatePage("deleteProfileField.html", template, "Page.DeleteProfileField.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + val currentSone = getCurrentSone(request.toadletContext) + val field = currentSone.profile.getFieldById(request.httpRequest.getPartAsStringFailsafe("field", 36)) ?: throw RedirectException("invalid.html") + templateContext["field"] = field + if (request.method == POST) { + if (request.httpRequest.getPartAsStringFailsafe("confirm", 4) == "true") { + currentSone.profile = currentSone.profile.apply { removeField(field) } + } + throw RedirectException("editProfile.html#profile-fields") + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPageTest.kt index 9966bdd..4c5a07a 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/DeleteProfileFieldPageTest.kt @@ -9,12 +9,14 @@ import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.nullValue import org.junit.Before import org.junit.Test +import org.mockito.Mockito.any +import org.mockito.Mockito.never import org.mockito.Mockito.verify /** * Unit test for [DeleteProfileFieldPage]. */ -class DeleteProfileFieldPageTest : WebPageTest() { +class DeleteProfileFieldPageTest: WebPageTest() { private val page = DeleteProfileFieldPage(template, webInterface) @@ -30,6 +32,16 @@ class DeleteProfileFieldPageTest : WebPageTest() { } @Test + fun `page returns correct path`() { + assertThat(page.path, equalTo("deleteProfileField.html")) + } + + @Test + fun `page requires login`() { + assertThat(page.requiresLogin(), equalTo(true)) + } + + @Test fun `get request with invalid field name redirects to invalid page`() { request("", GET) verifyRedirect("invalid.html") @@ -46,7 +58,7 @@ class DeleteProfileFieldPageTest : WebPageTest() { fun `get request with valid field name sets field in template context`() { request("", GET) addHttpRequestParameter("field", field.id) - page.handleRequest(freenetRequest, templateContext) + page.processTemplate(freenetRequest, templateContext) assertThat(templateContext["field"], equalTo(field)) } @@ -54,7 +66,9 @@ class DeleteProfileFieldPageTest : WebPageTest() { fun `post request without confirm redirects to edit profile page`() { request("", POST) addHttpRequestParameter("field", field.id) - verifyRedirect("editProfile.html#profile-fields") + verifyRedirect("editProfile.html#profile-fields") { + verify(currentSone, never()).profile = any() + } } @Test -- 2.7.4