Merge pull request #72 from snoopdave/update-selenium-tests

Upgrade to Jetty 11 maven plugin

Author: snoopdave

README.md

@@ -46,9 +46,8 @@ Compile and build Roller:
     $ cd roller
     $ mvn -DskipTests=true install
 
-Run Roller in Jetty with Derby database:
+Run Roller in Jetty with an embedded Derby database (for testing only):
 
-    $ cd app
     $ mvn jetty:run
 
 Once Jetty is up and running browse to <http://localhost:8080/roller> to try to Roller.

app/pom.xml

@@ -55,7 +55,6 @@ limitations under the License.
         <maven-antrun.version>1.0b3</maven-antrun.version>
         <rome.version>1.13.1</rome.version>
         <slf4j.version>1.7.30</slf4j.version>
-        <spring.version>5.2.7.RELEASE</spring.version>
         <spring.security.version>5.3.3.RELEASE</spring.security.version>
         <struts.version>2.5.22</struts.version>
         <velocity.version>2.2</velocity.version>
@@ -87,6 +86,7 @@ limitations under the License.
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <version>${jstl.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -105,7 +105,7 @@ limitations under the License.
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <version>${jaxb.version}</version>
             <exclusions>
                 <exclusion>
                     <!--api is already in the javax.activation artifact-->
@@ -492,7 +492,6 @@ limitations under the License.
             </exclusions>
         </dependency>
 
-
         <!-- Other deps include Guice and ROME -->
 
         <dependency>
@@ -598,7 +597,7 @@ limitations under the License.
                     <webApp>
                         <contextPath>/roller</contextPath>
                     </webApp>
-                    <jettyXml>src/test/resources/jetty.xml</jettyXml>
+                    <jettyXmls>src/test/resources/jetty.xml</jettyXmls>
                     <systemProperties>
                         <systemProperty>
                             <name>roller.custom.config</name>

it-selenium/pom.xml

@@ -61,6 +61,33 @@
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-firefox-driver</artifactId>
             <version>3.141.59</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.version}</version>
+            <exclusions>
+                <exclusion>
+                    <!--api is already in the javax.activation artifact-->
+                    <groupId>javax.activation</groupId>
+                    <artifactId>javax.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Will bring in once we configure a Chrome option -->
@@ -94,8 +121,7 @@
     <build>
         <plugins>
 
-            <!-- Activates integration tests (by default, classes under tests that end with "IT")
-            -->
+            <!-- Activates integration tests (by default, classes under tests that end with "IT") -->
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>3.0.0-M5</version>
@@ -135,7 +161,7 @@
                             <port>4224</port>
                             <sources>
                                 <script>
-                                    <sourceFile>target/roller-selenium-tests-${project.version}/WEB-INF/classes/dbscripts/derby/createdb.sql</sourceFile>
+                                    <sourceFile>${project.basedir}/target/roller-selenium-tests-${project.version}/WEB-INF/classes/dbscripts/derby/createdb.sql</sourceFile>
                                 </script>
                             </sources>
                         </configuration>
@@ -163,7 +189,7 @@
                         <contextPath>/roller</contextPath>
                     </webApp>
                     <webAppSourceDirectory>target/roller-selenium-tests-${project.version}</webAppSourceDirectory>
-                    <jettyXml>../app/src/test/resources/jetty.xml</jettyXml>
+                    <jettyXmls>${project.parent.basedir}/app/src/test/resources/jetty.xml</jettyXmls>
                     <systemProperties>
                         <systemProperty>
                             <name>roller.custom.config</name>
@@ -179,8 +205,6 @@
                             <goal>start</goal>
                         </goals>
                         <configuration>
-                            <scanIntervalSeconds>0</scanIntervalSeconds>
-                            <!-- <daemon>true</daemon> -->
                         </configuration>
                     </execution>
                     <execution>
@@ -211,12 +235,32 @@
                         <version>${derby.version}</version>
                     </dependency>
 
+                    <dependency>
+                        <groupId>commons-dbcp</groupId>
+                        <artifactId>commons-dbcp</artifactId>
+                        <version>1.4</version>
+                        <scope>runtime</scope>
+                    </dependency>
+
                     <dependency>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                         <version>1.4.7</version>
                     </dependency>
 
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>${jaxb.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                <!--api is already in the javax.activation artifact-->
+                                <groupId>javax.activation</groupId>
+                                <artifactId>javax.activation-api</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+
                 </dependencies>
             </plugin>
         </plugins>

it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java

@@ -18,9 +18,6 @@
 package org.apache.roller.selenium;
 
 import java.util.concurrent.TimeUnit;
-import org.junit.*;
-import org.openqa.selenium.*;
-import org.openqa.selenium.firefox.FirefoxDriver;
 import org.apache.roller.selenium.core.CreateWeblogPage;
 import org.apache.roller.selenium.core.LoginPage;
 import org.apache.roller.selenium.core.MainMenuPage;
@@ -31,10 +28,20 @@
 import org.apache.roller.selenium.editor.EntryEditPage;
 import org.apache.roller.selenium.view.BlogHomePage;
 import org.apache.roller.selenium.view.SingleBlogEntryPage;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.openqa.selenium.Alert;
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoAlertPresentException;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.FirefoxProfile;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class InitialLoginTestIT {
     private WebDriver driver;
@@ -44,7 +51,6 @@ public class InitialLoginTestIT {
 
     @Before
     public void setUp() throws Exception {
-
         FirefoxProfile profile = new FirefoxProfile();
         profile.setPreference("intl.accept_languages", "en_US");
 
@@ -55,7 +61,6 @@ public void setUp() throws Exception {
         driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS)
                                   .pageLoadTimeout(5, TimeUnit.SECONDS)
                                   .setScriptTimeout(5, TimeUnit.SECONDS);
-        
         baseUrl = "http://localhost:8080/roller/";
     }
 

it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java

@@ -20,8 +20,6 @@
 import org.apache.roller.selenium.AbstractRollerPage;
 import org.openqa.selenium.WebDriver;
 
-import java.lang.String;
-
 /**
  * represents core/CreateWeblog.jsp
  */

it-selenium/src/test/java/org/apache/roller/selenium/core/MainMenuPage.java

@@ -21,7 +21,6 @@
 import org.apache.roller.selenium.editor.EntryAddPage;
 import org.openqa.selenium.WebDriver;
 
-
 /**
  * represents core/MainMenu.jsp
  * Post-login page object to create, choose, configure blogs.

it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java

@@ -23,7 +23,6 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-
 /**
  * represents core/Register.jsp
  * index page that does step #1 of setup.jsp, the adding of a new user

it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java

@@ -19,12 +19,7 @@
 
 import org.apache.roller.selenium.AbstractRollerPage;
 import org.apache.roller.selenium.view.BlogHomePage;
-import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-import java.util.concurrent.TimeUnit;
 
 /**
  * represents core/Setup.jsp

it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java

@@ -20,8 +20,6 @@
 import org.apache.roller.selenium.AbstractRollerPage;
 import org.openqa.selenium.WebDriver;
 
-import java.lang.String;
-
 /**
  * represents core/Welcome.jsp
  * Page Object after creation of a new user account (RegisterPage)

it-selenium/src/test/java/org/apache/roller/selenium/editor/AbstractEntryPage.java

@@ -18,9 +18,6 @@
 package org.apache.roller.selenium.editor;
 
 import org.apache.roller.selenium.AbstractRollerPage;
-import org.openqa.selenium.WebDriver;
-
-import java.lang.String;
 
 /**
  * Base class for the new/edit entry pages

it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryAddPage.java

@@ -19,8 +19,6 @@
 
 import org.openqa.selenium.WebDriver;
 
-import java.lang.String;
-
 /**
  * represents editor/EntryAddPage.jsp
  * Page for adding a new blog entry

it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryEditPage.java

@@ -20,8 +20,6 @@
 import org.apache.roller.selenium.view.SingleBlogEntryPage;
 import org.openqa.selenium.WebDriver;
 
-import java.lang.String;
-
 /**
  * represents editor/EntryEditPage.jsp
  * Page for editing an already saved (draft or posted) blog entry

it-selenium/src/test/java/org/apache/roller/selenium/view/BlogHomePage.java

@@ -21,8 +21,6 @@
 import org.apache.roller.selenium.editor.EntryAddPage;
 import org.openqa.selenium.WebDriver;
 
-import java.lang.String;
-
 /**
  * Represents a URL for the home page of a blog
  * (URL similar to http://localhost:8080/roller/myblog)

it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java

@@ -20,8 +20,6 @@
 import org.apache.roller.selenium.AbstractRollerPage;
 import org.openqa.selenium.WebDriver;
 
-import java.lang.String;
-
 /**
  * represents a URL that displays a single blog entry
  * (URL similar to http://localhost:8080/roller/myblog/entry/my_blog_entry)

pom.xml

@@ -25,10 +25,6 @@ limitations under the License.
     <version>6.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <prerequisites>
-        <maven>3.0.5</maven>
-    </prerequisites>
-
     <name>Roller</name>
     <description>
         Roller is an open source blog server built with open source Java
@@ -47,7 +43,10 @@ limitations under the License.
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <derby.version>10.11.1.1</derby.version>
+        <jaxb.version>2.3.1</jaxb.version>
+        <jetty.version>10.0.0</jetty.version>
         <roller.version>6.1.0-SNAPSHOT</roller.version>
+        <spring.version>5.2.7.RELEASE</spring.version>
     </properties>
 
     <modules>
@@ -80,7 +79,7 @@ limitations under the License.
                 <plugin>
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-maven-plugin</artifactId>
-                    <version>9.4.17.v20190418</version>
+                    <version>${jetty.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
@@ -111,6 +110,13 @@ limitations under the License.
                 <version>5.6.2</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>