You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2017/10/08 17:33:03 UTC
[10/24] roller git commit: made it-selenium tests work with current
code base.
made it-selenium tests work with current code base.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/959c3e17
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/959c3e17
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/959c3e17
Branch: refs/heads/bootstrap-ui
Commit: 959c3e17e50ee9db011131156318812c0818d1eb
Parents: b3a8128
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Aug 13 08:45:11 2017 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Aug 13 08:45:11 2017 -0400
----------------------------------------------------------------------
app/pom.xml | 11 ++---
.../webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 12 +++---
it-selenium/pom.xml | 42 ++++++++++++++------
.../roller/selenium/AbstractRollerPage.java | 29 ++++++++++----
.../roller/selenium/InitialLoginTestIT.java | 5 ++-
.../roller/selenium/core/CreateWeblogPage.java | 4 +-
.../apache/roller/selenium/core/LoginPage.java | 4 +-
.../roller/selenium/core/MainMenuPage.java | 6 ++-
.../roller/selenium/core/RegisterPage.java | 13 +++++-
.../apache/roller/selenium/core/SetupPage.java | 9 ++++-
.../roller/selenium/core/WelcomePage.java | 5 +--
.../roller/selenium/editor/EntryAddPage.java | 3 +-
.../roller/selenium/editor/EntryEditPage.java | 3 +-
.../roller/selenium/view/BlogHomePage.java | 3 +-
.../selenium/view/SingleBlogEntryPage.java | 2 +-
15 files changed, 98 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 7fe24da..15cf72f 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -153,6 +153,12 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-tiles-plugin</artifactId>
+ <version>2.5.12</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<scope>compile</scope>
@@ -166,11 +172,6 @@ limitations under the License.
<version>4.10.4</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-tiles-plugin</artifactId>
- <version>2.5.12</version>
- </dependency>
<dependency>
<groupId>log4j</groupId>
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
index e233946..2d615e5 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
@@ -42,19 +42,19 @@ function handlePreview(handle) {
<table class="formtable">
<tr>
- <td class="label"><label for="name" /><s:text name="generic.name" /></label></td>
+ <td class="label"><label for="name"><s:text name="generic.name" /></label></td>
<td class="field"><s:textfield name="bean.name" size="30" maxlength="30" /></td>
<td class="description"><s:text name="createWebsite.tip.name" /></td>
</tr>
<tr>
- <td class="label"><label for="description" /><s:text name="generic.tagline" /></td>
+ <td class="label"><label for="description"><s:text name="generic.tagline" /></td>
<td class="field"><s:textfield name="bean.description" size="40" maxlength="255" /></td>
<td class="description"><s:text name="createWebsite.tip.description" /></td>
</tr>
<tr>
- <td class="label"><label for="handle" /><s:text name="createWebsite.handle" /></label></td>
+ <td class="label"><label for="handle"><s:text name="createWebsite.handle" /></label></td>
<td class="field">
<s:textfield name="bean.handle" size="30" maxlength="30" onkeyup="handlePreview(this)" /><br />
<span style="text-size:70%">
@@ -66,7 +66,7 @@ function handlePreview(handle) {
</tr>
<tr>
- <td class="label"><label for="emailAddress" /><s:text name="createWebsite.emailAddress" /></label></td>
+ <td class="label"><label for="emailAddress"><s:text name="createWebsite.emailAddress" /></label></td>
<td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="50" /></td>
<td class="description"><s:text name="createWebsite.tip.email" /></td>
</tr>
@@ -80,7 +80,7 @@ function handlePreview(handle) {
</tr>
<tr>
- <td class="label"><label for="timeZone" /><s:text name="createWebsite.timeZone" /></label></td>
+ <td class="label"><label for="timeZone"><s:text name="createWebsite.timeZone" /></label></td>
<td class="field">
<s:select name="bean.timeZone" size="1" list="timeZonesList" />
</td>
@@ -88,7 +88,7 @@ function handlePreview(handle) {
</tr>
<tr>
- <td class="label"><label for="theme" /><s:text name="createWebsite.theme" /></label></td>
+ <td class="label"><label for="theme"><s:text name="createWebsite.theme" /></label></td>
<td class="field" ng-app="themeSelectModule" ng-controller="themeController">
<select id="themeSelector" name="bean.theme" size="1"
ng-model="selectedTheme" ng-options="theme as theme.name for theme in themes track by theme.id"></select>
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/pom.xml
----------------------------------------------------------------------
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 2c98d58..2854584 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -32,11 +32,6 @@
<artifactId>roller-selenium-tests</artifactId>
<packaging>war</packaging>
- <properties>
- <selenium.version>2.47.1</selenium.version>
- <javamail.version>1.4.7</javamail.version>
- </properties>
-
<!-- Process to run Selenium tests (actually no tests right now, just a skeleton)
1. Tests presently require Firefox browser, Chrome on the to-do list.
@@ -49,27 +44,38 @@
4. Feel free to add more Selenium tests!
-->
<dependencies>
+
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>${selenium.version}</version>
+ <version>3.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
- <version>${selenium.version}</version>
+ <version>3.4.0</version>
</dependency>
+
<!-- Will bring in once we configure a Chrome option -->
<!--dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>${selenium.version}</version>
</dependency-->
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
<!--
Type "war" listed below makes this a WAR overlay (i.e., incorporating
another WAR into this project in making a new WAR, with any additional
@@ -81,16 +87,22 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
</dependencies>
<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>2.12.4</version>
+ <version>2.20</version>
<executions>
<execution>
<goals>
@@ -100,6 +112,7 @@
</execution>
</executions>
</plugin>
+
<!-- Activates the Derby database during the integration test phase -->
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
@@ -135,6 +148,7 @@
</execution>
</executions>
</plugin>
+
<!-- Activates the Roller application during the integration test phase -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
@@ -163,7 +177,7 @@
</goals>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
+ <!-- <daemon>true</daemon> -->
</configuration>
</execution>
<execution>
@@ -175,21 +189,25 @@
</execution>
</executions>
<dependencies>
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
</dependency>
+
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${javamail.version}</version>
+ <version>1.4.7</version>
</dependency>
+
</dependencies>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java
index 5bd89a9..5bce387 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java
@@ -21,7 +21,9 @@ import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.Select;
+import org.openqa.selenium.support.ui.WebDriverWait;
/**
* Abstract class holding functionality common to Selenium Page Objects
@@ -30,13 +32,21 @@ import org.openqa.selenium.support.ui.Select;
public abstract class AbstractRollerPage {
protected WebDriver driver;
- protected String pageName;
+
+ protected void verifyPageTitle(String waitForElementId, String pageTitle) {
+
+ WebDriverWait wait = new WebDriverWait(driver, 10);
+ wait.until( ExpectedConditions.visibilityOf( driver.findElement(By.id(waitForElementId))));
+
+ verifyPageTitle(pageTitle);
+ }
protected void verifyPageTitle(String pageTitle) {
- if(!driver.getTitle().equals(pageTitle)) {
- throw new IllegalStateException("This is not the " + pageName + ", current page is: "
- + driver.getTitle());
+
+ if (!driver.getTitle().equals(pageTitle)) {
+ throw new IllegalStateException("This is not the " + pageTitle + ", current page is: " + driver.getTitle());
}
+ System.out.println("Verified page title: " + pageTitle);
}
/*
@@ -48,8 +58,7 @@ public abstract class AbstractRollerPage {
try {
WebElement div = driver.findElement(By.id(idOnPage));
} catch (NoSuchElementException e) {
- throw new IllegalStateException("This is not the " + pageName + ", HTML ID: "
- + idOnPage + " not found.");
+ throw new IllegalStateException("HTML ID: " + idOnPage + " not found.");
}
}
@@ -60,11 +69,15 @@ public abstract class AbstractRollerPage {
}
protected void clickById(String buttonId) {
- driver.findElement(By.id(buttonId)).click();
+ WebElement element = driver.findElement(By.id(buttonId));
+ element.click();
+ System.out.println("Element " + element.getTagName() + " id:" + element.getAttribute("id") + " clicked");
}
protected void clickByLinkText(String buttonText) {
- driver.findElement(By.linkText(buttonText)).click();
+ WebElement element = driver.findElement(By.linkText(buttonText));
+ element.click();
+ System.out.println("Element " + element.getTagName() + " id:" + element.getAttribute("id") + " clicked");
}
protected String getTextByCSS(String cssSelector) {
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java b/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
index 2c5f019..15d521d 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
@@ -62,10 +62,12 @@ public class InitialLoginTestIT {
LoginPage lp = wp.doRollerLogin();
MainMenuPage mmp = lp.loginToRoller("bsmith", "roller123");
CreateWeblogPage cwp = mmp.createWeblog();
- mmp = cwp.createWeblog("Bob's Blog", "bobsblog", "bsmith@email.com");
+ cwp.createWeblog("Bob's Blog", "bobsblog", "bsmith@email.com");
// set bobsblog as the front page blog
driver.get(baseUrl);
+ sp = new SetupPage(driver);
+ driver.navigate().refresh();
BlogHomePage bhp = sp.chooseFrontPageBlog();
// create and read first blog entry
@@ -84,7 +86,6 @@ public class InitialLoginTestIT {
@After
public void tearDown() throws Exception {
- driver.quit();
String verificationErrorString = verificationErrors.toString();
if (!"".equals(verificationErrorString)) {
fail(verificationErrorString);
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java
index 1c0a75a..19db6cb 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java
@@ -31,8 +31,8 @@ public class CreateWeblogPage extends AbstractRollerPage {
public CreateWeblogPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "Create Weblog Page";
- verifyPageTitle("Front Page: Create Weblog");
+ String pageTitle = "Front Page: Create Weblog";
+ verifyPageTitle("createWeblog", pageTitle);
}
public MainMenuPage createWeblog() {
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/core/LoginPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/LoginPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/LoginPage.java
index e3834b9..6d90ae8 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/core/LoginPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/LoginPage.java
@@ -30,8 +30,8 @@ public class LoginPage extends AbstractRollerPage {
public LoginPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "Roller Login Page";
- verifyPageTitle("Front Page: Welcome to Roller");
+ String pageTitle = "Front Page: Welcome to Roller";
+ verifyPageTitle("loginForm", pageTitle);
}
public MainMenuPage loginToRoller() {
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/core/MainMenuPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/MainMenuPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/MainMenuPage.java
index 1eb4e00..1c3ba96 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/core/MainMenuPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/MainMenuPage.java
@@ -28,19 +28,21 @@ import java.lang.String;
* Post-login page object to create, choose, configure blogs.
*/
public class MainMenuPage extends AbstractRollerPage {
+ String pageTitle;
public MainMenuPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "Main Menu Page";
- verifyPageTitle("Front Page: Main Menu");
+ pageTitle = "Front Page: Main Menu";
}
public CreateWeblogPage createWeblog() {
+ verifyPageTitle("createWeblogLink", pageTitle);
clickByLinkText("create one?");
return new CreateWeblogPage(driver);
}
public EntryAddPage createNewBlogEntry() {
+ verifyPageTitle("createWeblogLink", pageTitle);
clickByLinkText("New Entry");
return new EntryAddPage(driver);
}
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java
index 38cab2c..0d85498 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java
@@ -18,7 +18,10 @@
package org.apache.roller.selenium.core;
import org.apache.roller.selenium.AbstractRollerPage;
+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.lang.String;
@@ -30,12 +33,18 @@ public class RegisterPage extends AbstractRollerPage {
public RegisterPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "New User Registration Page";
- verifyPageTitle("Front Page: New User Registration");
+ String pageTitle = "Front Page: New User Registration";
+
+ verifyPageTitle("register", pageTitle);
}
public WelcomePage submitUserRegistration() {
clickById("submit");
+
+ WebDriverWait wait = new WebDriverWait(driver, 10);
+ wait.until( ExpectedConditions.visibilityOf( driver.findElement(By.id("a_clickHere"))));
+ driver.findElement(By.id("a_clickHere")).click();
+
return new WelcomePage(driver);
}
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
index 2328095..7422235 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
@@ -19,7 +19,12 @@ package org.apache.roller.selenium.core;
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
@@ -32,16 +37,16 @@ public class SetupPage extends AbstractRollerPage {
public SetupPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "Initial Setup Page";
- verifyPageTitle("Front Page: Welcome to Roller!");
}
public RegisterPage createNewUser() {
+ verifyPageTitle("Front Page: Welcome to Roller!");
clickById("a_createUser");
return new RegisterPage(driver);
}
public BlogHomePage chooseFrontPageBlog() {
+ verifyPageTitle("setup_0", "Front Page: Welcome to Roller!");
clickById("setup_0");
return new BlogHomePage(driver);
}
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
index 1f64d87..87bafdf 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
@@ -32,12 +32,11 @@ public class WelcomePage extends AbstractRollerPage {
public WelcomePage(WebDriver driver) {
this.driver = driver;
- this.pageName = "New User Registration Welcome Page";
- verifyPageTitle("Front Page: New User Registration");
+ String pageTitle = "Front Page: Welcome to Roller";
+ verifyPageTitle("loginForm", pageTitle);
}
public LoginPage doRollerLogin() {
- clickById("a_clickHere");
return new LoginPage(driver);
}
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryAddPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryAddPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryAddPage.java
index 5f9319a..d58c2a3 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryAddPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryAddPage.java
@@ -29,8 +29,7 @@ public class EntryAddPage extends AbstractEntryPage {
public EntryAddPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "New Blog Entry Page";
- verifyPageTitle("Front Page: New Entry");
+ verifyPageTitle("entry", "Front Page: New Entry");
}
}
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryEditPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryEditPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryEditPage.java
index 1a3fd28..09bf6a7 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryEditPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/editor/EntryEditPage.java
@@ -32,8 +32,7 @@ public class EntryEditPage extends AbstractEntryPage {
public EntryEditPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "blog entry edit page";
- verifyPageTitle("Front Page: Edit Entry");
+ verifyPageTitle("messages", "Front Page: Edit Entry");
}
public SingleBlogEntryPage viewBlogEntry() {
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/view/BlogHomePage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/view/BlogHomePage.java b/it-selenium/src/test/java/org/apache/roller/selenium/view/BlogHomePage.java
index 2ec2a98..2fc4140 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/view/BlogHomePage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/view/BlogHomePage.java
@@ -31,8 +31,7 @@ public class BlogHomePage extends AbstractRollerPage {
public BlogHomePage(WebDriver driver) {
this.driver = driver;
- this.pageName = "blog home page";
- verifyIdOnPage("id_weblog");
+ verifyPageTitle("searchForm", "Bob's Blog");
}
public EntryAddPage createNewBlogEntry() {
http://git-wip-us.apache.org/repos/asf/roller/blob/959c3e17/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
index 595977f..0660e40 100644
--- a/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
+++ b/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
@@ -30,7 +30,7 @@ public class SingleBlogEntryPage extends AbstractRollerPage {
public SingleBlogEntryPage(WebDriver driver) {
this.driver = driver;
- this.pageName = "Single blog entry view";
+ String pageTitle = "Single blog entry view";
/* id_permalink added to basic template's permalink.vm only to distinguish
this page from by-month or by-day views of blog entries */
verifyIdOnPage("id_permalink");