From cd3449b312300edb85f057317693344b12e9a6bb Mon Sep 17 00:00:00 2001 From: "Michael J. Simons" Date: Thu, 4 Jan 2018 22:28:39 +0100 Subject: [PATCH] Migrate javaconfig-form groovy->java See #4939 --- ...ng-security-samples-javaconfig-form.gradle | 20 ++++- .../security/samples/FormJcTests.groovy | 56 -------------- .../security/samples/pages/HomePage.groovy | 32 -------- .../security/samples/pages/LoginPage.groovy | 37 --------- .../security/samples/FormJcTests.java | 77 +++++++++++++++++++ .../security/samples/pages/HomePage.java | 62 +++++++++++++++ .../security/samples/pages/LoginPage.java | 74 ++++++++++++++++++ 7 files changed, 230 insertions(+), 128 deletions(-) delete mode 100644 samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy delete mode 100644 samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy delete mode 100644 samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy create mode 100644 samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java create mode 100644 samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java create mode 100644 samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java diff --git a/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle b/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle index 0595e282ff..476733e3bb 100644 --- a/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle +++ b/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle @@ -1,5 +1,20 @@ -apply plugin: 'io.spring.convention.spring-sample-war' +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +apply plugin: 'io.spring.convention.spring-sample-war' dependencies { compile project(':spring-security-config') @@ -9,7 +24,6 @@ dependencies { compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' compile 'javax.validation:validation-api' compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' compile 'org.springframework:spring-webmvc' compile slf4jDependencies @@ -18,5 +32,5 @@ dependencies { runtime 'opensymphony:sitemesh' - integrationTestCompile gebDependencies + integrationTestCompile seleniumDependencies } diff --git a/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy b/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy deleted file mode 100644 index abec1a6ccc..0000000000 --- a/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.security.samples - -import geb.spock.* -import spock.lang.Shared -import spock.lang.Stepwise -import org.springframework.security.samples.pages.* - -/** - * Tests the CAS sample application using service tickets. - * - * @author Rob Winch - */ -@Stepwise -class FormJcTests extends GebReportingSpec { - def 'access home page with unauthenticated user sends to login page'() { - when: 'Unauthenticated user accesses the Home Page' - via HomePage - then: 'The login page is displayed' - at LoginPage - } - - def 'authenticated user is sent to original page'() { - when: 'user authenticates' - login() - then: 'The home page is displayed' - at HomePage - and: 'The username is displayed' - user == 'user' - } - - def 'authenticated user logs out'() { - when: 'user logs out' - logout() - then: 'the login page is displayed' - at LoginPage - when: 'Unauthenticated user accesses the Home Page' - via HomePage - then: 'The login page is displayed' - at LoginPage - } -} diff --git a/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy deleted file mode 100644 index 97af93f383..0000000000 --- a/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.security.samples.pages; - -import geb.* - -/** - * The home page - * - * @author Rob Winch - */ -class HomePage extends Page { - static url = '' - static at = { assert driver.title == 'SecureMail: View All'; true} - static content = { - user { $('p.navbar-text').text() } - logout { $('input', type: 'submit').click() } - } -} diff --git a/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy deleted file mode 100644 index d28a5676f6..0000000000 --- a/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.security.samples.pages; - -import geb.* - -/** - * The login page. - * - * @author Rob Winch - */ -class LoginPage extends Page { - static url = 'login' - static at = { assert driver.title == 'SecureMail: Please Login'; true} - static content = { - login(required:false) { user='user', password='password' -> - loginForm.username = user - loginForm.password = password - submit.click() - } - loginForm { $('form') } - submit { $('button', type: 'submit') } - } -} diff --git a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java new file mode 100644 index 0000000000..664604f0d4 --- /dev/null +++ b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java @@ -0,0 +1,77 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.security.samples; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.htmlunit.HtmlUnitDriver; +import org.springframework.security.samples.pages.HomePage; +import org.springframework.security.samples.pages.LoginPage; + +/** + * @author Michael Simons + */ +public class FormJcTests { + private WebDriver driver; + + private int port; + + @Before + public void setup() { + this.port = Integer.parseInt(System.getProperty("app.httpPort")); + this.driver = new HtmlUnitDriver(); + } + + @After + public void tearDown() { + this.driver.quit(); + } + + @Test + public void accessHomePageWithUnauthenticatedUserSendsToLoginPage() { + final LoginPage loginPage = HomePage.to(this.driver, this.port); + loginPage.assertAt(); + } + + @Test + public void authenticatedUserIsSentToOriginalPage() { + final String userName = "user"; + final HomePage homePage = HomePage.to(this.driver, this.port) + .loginForm() + .username(userName) + .password("password") + .submit(); + homePage + .assertAt() + .andTheUserNameDisplayedIs(userName); + } + + @Test + public void authenticatedUserLogsOut() { + LoginPage loginPage = HomePage.to(this.driver, this.port) + .loginForm() + .username("user") + .password("password") + .submit() + .logout(); + loginPage.assertAt(); + + loginPage = HomePage.to(this.driver, this.port); + loginPage.assertAt(); + } +} diff --git a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java new file mode 100644 index 0000000000..a3237051a4 --- /dev/null +++ b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java @@ -0,0 +1,62 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.security.samples.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Michael Simons + */ +public class HomePage { + private final WebDriver webDriver; + + @FindBy(css = "input[type=submit]") + private WebElement logoutButton; + + public static LoginPage to(WebDriver driver, int port) { + driver.get("http://localhost:" + port +"/"); + return PageFactory.initElements(driver, LoginPage.class); + } + + public HomePage(WebDriver webDriver) { + this.webDriver = webDriver; + } + + public Content assertAt() { + assertThat(this.webDriver.getTitle()).isEqualTo("SecureMail: View All"); + return PageFactory.initElements(this.webDriver, Content.class); + } + + public LoginPage logout() { + this.logoutButton.submit(); + return PageFactory.initElements(this.webDriver, LoginPage.class); + } + + public static class Content { + @FindBy(css = "p.navbar-text") + private WebElement message; + + public Content andTheUserNameDisplayedIs(final String userName) { + assertThat(message.getText()).isEqualTo(userName); + return this; + } + } +} diff --git a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java new file mode 100644 index 0000000000..cd1e4ebf86 --- /dev/null +++ b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java @@ -0,0 +1,74 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.security.samples.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Michael Simons + */ +public class LoginPage { + + private final WebDriver webDriver; + + private final LoginForm loginForm; + + public LoginPage(WebDriver webDriver) { + this.webDriver = webDriver; + this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); + } + + public LoginPage assertAt() { + assertThat(this.webDriver.getTitle()).isEqualTo("SecureMail: Please Login"); + return this; + } + + public LoginForm loginForm() { + return this.loginForm; + } + + public static class LoginForm { + private WebDriver webDriver; + private WebElement username; + private WebElement password; + @FindBy(css = "button[type=submit]") + private WebElement submit; + + public LoginForm(WebDriver webDriver) { + this.webDriver = webDriver; + } + + public LoginForm username(String username) { + this.username.sendKeys(username); + return this; + } + + public LoginForm password(String password) { + this.password.sendKeys(password); + return this; + } + + public HomePage submit() { + this.submit.click(); + return PageFactory.initElements(this.webDriver, HomePage.class); + } + } +}