Author: juanpablo
Date: Thu May 9 21:40:05 2013
New Revision: 1480791
URL: http://svn.apache.org/r1480791
Log:
JSPWIKI-770: parameterized tests so they can be reused across it-tests modules
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEdit.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEditAllView.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousCreateGroup.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousView.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedName.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedPermissions.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupFullName.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupLoginName.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupWikiName.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreatePage.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePage.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePageNonAdmin.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Login.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RedirectAfterLogin.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenamePage.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenameProfile.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/TestSuite.html
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/ViewPageSource.html
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEdit.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEdit.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEdit.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEdit.html
Thu May 9 21:40:05 2013
@@ -28,14 +28,14 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Acl Janne
Edit<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Acleditonly '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created with an ACL by
janne.</td> <td>PageContent</td></tr>
<!-- Login -->
@@ -61,7 +61,7 @@
<tr><td>clickAndWait</td> <td>link=Log out</td>
<td> </td></tr>
<!-- Anonymous viewing should NOT succeed -->
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td>
<td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTextNotPresent</td> <td>${PageContent}</td>
<td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Login</td>
<td> </td></tr>
@@ -75,7 +75,7 @@
<tr><td>type</td> <td>j_password</td>
<td>${TestPassword}</td></tr>
<tr><td>clickAndWait</td> <td>submitlogin</td>
<td> </td></tr>
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>${PageContent}</td>
<td> </td></tr>
<tr><td>open</td>
<td>${editurl}</td> <td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEditAllView.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEditAllView.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEditAllView.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AclJanneEditAllView.html
Thu May 9 21:40:05 2013
@@ -29,14 +29,14 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Acl Janne Edit All
View<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Aclviewandeditonly '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td> <td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created with an ACL by janne.</td>
<td>PageContent</td></tr>
<!-- Login -->
@@ -64,7 +64,7 @@
<tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
<!-- Anonymous viewing should succeed -->
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td>
<td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>${PageContent}</td>
<td> </td></tr>
@@ -78,7 +78,7 @@
<tr><td>type</td> <td>j_password</td>
<td>${TestPassword}</td></tr>
<tr><td>clickAndWait</td> <td>submitlogin</td> <td> </td></tr>
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>${PageContent}</td>
<td> </td></tr>
<tr><td>open</td> <td>${editurl}</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousCreateGroup.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousCreateGroup.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousCreateGroup.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousCreateGroup.html
Thu May 9 21:40:05 2013
@@ -31,9 +31,9 @@
JSPWiki Test Anonymous Create Group<br>
Try to create a group; we should get redirected to login page
</td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp</td>
<td>newgroupurl</td></tr>
- <tr><td>store</td>
<td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/NewGroup.jsp</td>
<td>newgroupurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/UserPreferences.jsp?redirect=Main</td>
<td>prefsurl</td></tr>
<tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
<tr><td>verifyElementPresent</td> <td>css=form#clearCookie
input[name="ok"]</td> <td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousView.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousView.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousView.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousView.html
Thu May 9 21:40:05 2013
@@ -27,8 +27,8 @@
<table cellpadding="1" cellspacing="1" border="1">
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Anonymous
View<br></td></tr>
- <tr><td>store</td><td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>open</td> <td>${baseUrl}/Wiki.jsp?page=Main</td>
<td> </td></tr>
+ <tr><td>store</td><td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>open</td> <td>${it_baseUrl}/Wiki.jsp?page=Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>You have successfully
installed</td> <td> </td></tr>
<tr><td>verifyElementPresent</td> <td>link=About</td>
<td></td></tr>
<tr><td>clickAndWait</td> <td>link=About</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html
Thu May 9 21:40:05 2013
@@ -31,8 +31,8 @@
JSPWiki Test Anonymous View Image<br>See if we can view the JSPWiki logo
</td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/images/jspwiki_logo_s.png</td>
<td>imgurl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/images/jspwiki_logo_s.png</td> <td>imgurl</td></tr>
<tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
<tr><td>assertBodyText</td> <td></td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedName.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedName.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedName.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedName.html
Thu May 9 21:40:05 2013
@@ -28,13 +28,13 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Asserted Name<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=Main</td>
<td>url</td></tr>
- <tr><td>store</td>
<td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=Main</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/UserPreferences.jsp?redirect=Main</td>
<td>prefsurl</td></tr>
<tr><td>store</td> <td>DonQuixote</td>
<td>TestUsername</td></tr>
<!-- Navigate to Prefs page; see the 'G'day message' for the anonymous
user -->
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedPermissions.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedPermissions.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedPermissions.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AssertedPermissions.html
Thu May 9 21:40:05 2013
@@ -28,21 +28,21 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Asserted
Permissions<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Test-asserted-permissions-'+new
Date().getTime()}</td> <td>group</td></tr>
<tr><td>store</td> <td>Janne Jalkanen<br />FredFlintstone</td>
<td>members</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp</td>
<td>url</td></tr>
- <tr><td>store</td>
<td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/UserPreferences.jsp?redirect=Main</td>
<td>prefsurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
<tr><td>store</td> <td>janne</td> <td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td> <td>TestPassword</td></tr>
<tr><td rowspan="1" colspan="3"> Create new group with 'janne' and
'FredFlintstone' as members </td></tr>
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td>
<td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td>
<td> </td></tr>
@@ -104,7 +104,7 @@
<tr><td rowspan="1" colspan="3"> Verify that asserted user 'Fred' can view
the group but not edit </td></tr>
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>clickAndWait</td> <td>link=My Prefs</td> <td> </td></tr>
<!--<tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>-->
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupFullName.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupFullName.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupFullName.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupFullName.html
Thu May 9 21:40:05 2013
@@ -28,18 +28,18 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Create Group Full
Name<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Test-group-'+new
Date().getTime()}</td> <td>group</td></tr>
<tr><td>store</td> <td>Janne Jalkanen</td>
<td>members</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
<tr><td>store</td> <td>janne</td> <td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td> <td>TestPassword</td></tr>
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupLoginName.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupLoginName.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupLoginName.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupLoginName.html
Thu May 9 21:40:05 2013
@@ -28,18 +28,18 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Create Group Login
Name<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Test-group-'+new
Date().getTime()}</td> <td>group</td></tr>
<tr><td>store</td> <td>janne</td>
<td>members</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
<tr><td>store</td> <td>janne</td> <td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td> <td>TestPassword</td></tr>
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupWikiName.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupWikiName.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupWikiName.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreateGroupWikiName.html
Thu May 9 21:40:05 2013
@@ -28,18 +28,18 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Create Group
WikiName<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Test-group-'+new
Date().getTime()}</td> <td>group</td></tr>
<tr><td>store</td> <td>JanneJalkanen</td>
<td>members</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/EditGroup.jsp?</td>
<td>editgroupurl</td></tr>
<tr><td>store</td> <td>janne</td> <td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td> <td>TestPassword</td></tr>
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreatePage.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreatePage.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreatePage.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/CreatePage.html
Thu May 9 21:40:05 2013
@@ -28,14 +28,14 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Create Page<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Createpage '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=Main</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=Main</td>
<td>url</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created by the web unit tests.</td>
<td>PageContent</td></tr>
<!-- Login -->
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePage.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePage.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePage.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePage.html
Thu May 9 21:40:05 2013
@@ -28,15 +28,15 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Delete Page<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Delete-page '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>admin</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td>
<td>${baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created by the web unit tests.</td>
<td>PageContent</td></tr>
<!-- Login --!>
@@ -54,7 +54,7 @@
<tr><td>type</td> <td>id=editorarea</td>
<td>${PageContent}</td></tr>
<tr><td>clickAndWait</td> <td>ok</td> <td> </td></tr>
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td>
<td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>${PageContent}</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePageNonAdmin.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePageNonAdmin.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePageNonAdmin.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/DeletePageNonAdmin.html
Thu May 9 21:40:05 2013
@@ -28,15 +28,15 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Delete Page<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Delete-page '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td>
<td>${baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created by the web unit tests.</td>
<td>PageContent</td></tr>
<!-- Login --!>
@@ -54,7 +54,7 @@
<tr><td>type</td> <td>id=editorarea</td>
<td>${PageContent}</td></tr>
<tr><td>clickAndWait</td> <td>ok</td> <td> </td></tr>
- <tr><td>open</td> <td>${url}</td>
<td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td>
<td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>${PageContent}</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Login.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Login.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Login.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Login.html
Thu May 9 21:40:05 2013
@@ -28,12 +28,12 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Login<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=Main</td>
<td>url</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=Main</td>
<td>wikiurl</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestLoginname</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td> <td>TestPassword</td></tr>
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html
Thu May 9 21:40:05 2013
@@ -28,9 +28,9 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Logout<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=Main</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=Main</td>
<td>url</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RedirectAfterLogin.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RedirectAfterLogin.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RedirectAfterLogin.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RedirectAfterLogin.html
Thu May 9 21:40:05 2013
@@ -28,14 +28,14 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Redirect Page After
Login<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Redirectpage '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>wikiurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created to test
redirects.</td> <td>RedirectText</td></tr>
<!-- Login -->
@@ -63,7 +63,7 @@
<tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
<!-- Now, from an anonymous session, try to view it, fail, then login -->
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>open</td> <td>${wikiurl}</td> <td> </td></tr>
<tr><td>verifyTextNotPresent</td>
<td>${RedirectText}</td><td> </td></tr>
<tr><td>verifyTitle</td> <td>JSPWiki: Login</td>
<td> </td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenamePage.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenamePage.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenamePage.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenamePage.html
Thu May 9 21:40:05 2013
@@ -28,15 +28,15 @@
<tbody>
<tr><td rowspan="1" colspan="3">JSPWiki Test Rename Page<br></td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Rename-page '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/PageInfo.jsp?page=${page}</td>
<td>infourl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>url</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/PageInfo.jsp?page=${page}</td> <td>infourl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
<tr><td>store</td> <td>This page was created by the rename web unit
tests.</td> <td>PageContent</td></tr>
<!-- Login --!>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenameProfile.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenameProfile.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenameProfile.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/RenameProfile.html
Thu May 9 21:40:05 2013
@@ -51,19 +51,19 @@ C. Try to edit page 'TestRenameProfilePa
This page was created with an ACL by TestRenameProfileUser
-->
</td></tr>
- <tr><td>store</td> <td>/@selenium.context@</td>
<td>baseUrl</td></tr>
+ <tr><td>store</td> <td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
<tr><td>store</td> <td>javascript{'Test Rename Profile Page '+new
Date().getTime()}</td> <td>page</td></tr>
<tr><td>store</td> <td>javascript{'TestRenameProfileUser'+new
Date().getTime()}</td> <td>user</td></tr>
<tr><td>store</td> <td>janne</td>
<td>TestUsername</td></tr>
<tr><td>store</td> <td>myP@5sw0rd</td>
<td>TestPassword</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp?page=${page}</td>
<td>viewurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
- <tr><td>store</td>
<td>${baseUrl}/UserPreferences.jsp?redirect=Main&tab=profile</td>
<td>prefsurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Logout.jsp</td>
<td>logouturl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Wiki.jsp?page=${page}</td>
<td>viewurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Edit.jsp?page=${page}</td>
<td>editurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Group.jsp?</td>
<td>viewgroupurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/NewGroup.jsp?</td>
<td>newgroupurl</td></tr>
+ <tr><td>store</td>
<td>${it_baseUrl}/UserPreferences.jsp?redirect=Main&tab=profile</td>
<td>prefsurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Login.jsp</td>
<td>loginurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/Logout.jsp</td>
<td>logouturl</td></tr>
<tr><td>store</td> <td>This page was created with an ACL by
${user}</td> <td>PageContent</td></tr>
<tr><td rowspan="1" colspan="3"> Create a new user and group (and log
in) -- at the moment, this ALWAYS fails for container-managed
tests.<br/></td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/TestSuite.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/TestSuite.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/TestSuite.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/TestSuite.html
Thu May 9 21:40:05 2013
@@ -36,7 +36,7 @@ names valid. -->
border="1"
class="selenium">
<tbody>
- <tr><td><b>JSPWiki Test Suite for
@selenium.context@</b></td></tr>
+ <tr><td><b>JSPWiki Test Suite for
${it-jspwiki.context}</b></td></tr>
<!-- Anonymous user tests -->
<tr><td><a href="./AnonymousView.html">AnonymousView</a></td></tr>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/ViewPageSource.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/ViewPageSource.html?rev=1480791&r1=1480790&r2=1480791&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/ViewPageSource.html
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/ViewPageSource.html
Thu May 9 21:40:05 2013
@@ -30,11 +30,11 @@
<thead>
<tr><td rowspan="1" colspan="3">ViewPageSource</td></tr>
</thead><tbody>
- <tr><td>store</td>
<td>/@selenium.context@</td>
<td>baseUrl</td></tr>
- <tr><td>open</td>
<td>${baseUrl}/Wiki.jsp?page=Main</td>
<td> </td></tr>
+ <tr><td>store</td>
<td>/${it-jspwiki.context}</td>
<td>it_baseUrl</td></tr>
+ <tr><td>open</td>
<td>${it_baseUrl}/Wiki.jsp?page=Main</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>You have successfully
installed</td>
<td> </td></tr>
<tr><td rowspan="1" colspan="3"> Simply do View Page Source and check
if you get it<br/></td> </tr>
- <tr><td>open</td>
<td>${baseUrl}/Wiki.jsp?page=Main&skin=raw</td>
<td> </td></tr>
+ <tr><td>open</td>
<td>${it_baseUrl}/Wiki.jsp?page=Main&skin=raw</td>
<td> </td></tr>
<tr><td>verifyTextPresent</td> <td>You have successfully installed
[JSPWiki|About].</td> <td> </td></tr>
</tbody></table>
</body>
