This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit f8a5d91d6f7ff0f73fbebe329993738f059c549d Author: juanpablo <[email protected]> AuthorDate: Sat Nov 7 18:38:53 2020 +0100 make tests a little bit more readable --- .../src/main/java/org/apache/wiki/its/AnonymousViewIT.java | 13 +++++++------ .../src/main/java/org/apache/wiki/its/LoginIT.java | 8 +++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java index 1188ed6..4e48897 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java @@ -39,30 +39,31 @@ public class AnonymousViewIT { @Test void anonymousView() { - ReadWikiPage main = Page.withUrl( Page.baseUrl() + "/Wiki.jsp?page=Main" ).openAs( new ReadWikiPage() ); + final ReadWikiPage main = ReadWikiPage.open( "Main" ); Assertions.assertEquals( "JSPWiki: Main", main.title() ); Assertions.assertEquals( "Main", main.wikiTitle() ); Assertions.assertTrue( main.wikiPageContent().contains( "You have successfully installed" ) ); - ReadWikiPage about = main.navigateTo( "JSPWiki" ); + final ReadWikiPage about = main.navigateTo( "JSPWiki" ); Assertions.assertTrue( about.wikiPageContent().contains( "This Wiki is done using" ) ); } @Test void anonymousViewImage() throws Exception { - File file = Page.download( Page.baseUrl() + "/images/jspwiki_logo_s.png" ); + final File file = Page.download( Page.baseUrl() + "/images/jspwiki_logo_s.png" ); Assertions.assertTrue( file.exists() ); } @Test void anonymousReaderView() { - ReadWikiPage main = Page.withUrl( Page.baseUrl() + "/Wiki.jsp?page=Main" ).openAs( new ReadWikiPage() ); + final ReadWikiPage main = ReadWikiPage.open( "Main" ); Assertions.assertEquals( "JSPWiki: Main", main.title() ); Assertions.assertEquals( "Main", main.wikiTitle() ); main.sidebar().should( exist ); - main.hoverMoreArea().clickOnShowReaderView(); - main.sidebar().should( not( exist ) ); + main.hoverMoreArea() + .clickOnShowReaderView() + .sidebar().should( not( exist ) ); } } diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java index 4ecb8ae..b3606df 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java @@ -18,15 +18,13 @@ */ package org.apache.wiki.its; -import org.apache.wiki.pages.Page; +import com.codeborne.selenide.junit5.ScreenShooterExtension; import org.apache.wiki.pages.haddock.LoginPage; import org.apache.wiki.pages.haddock.ReadWikiPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.codeborne.selenide.junit5.ScreenShooterExtension; - /** * Login-related tests for Apache JSPWiki @@ -36,7 +34,7 @@ public class LoginIT { @Test void loginAndLogout() { - ReadWikiPage main = Page.withUrl( Page.baseUrl() + "/Wiki.jsp?page=Main" ).openAs( new ReadWikiPage() ); + ReadWikiPage main = ReadWikiPage.open( "Main" ); Assertions.assertEquals( "JSPWiki: Main", main.title() ); Assertions.assertEquals( "Main", main.wikiTitle() ); Assertions.assertEquals( "G’day (anonymous guest)", main.hoverLoginArea().authenticatedText() ); @@ -55,7 +53,7 @@ public class LoginIT { @Test void loginKO() { - ReadWikiPage main = Page.withUrl( Page.baseUrl() + "/Wiki.jsp?page=Main" ).openAs( new ReadWikiPage() ); + ReadWikiPage main = ReadWikiPage.open( "Main" ); Assertions.assertEquals( "JSPWiki: Main", main.title() ); Assertions.assertEquals( "Main", main.wikiTitle() ); Assertions.assertEquals( "G’day (anonymous guest)", main.hoverLoginArea().authenticatedText() );
