Author: ajaquith
Date: Wed Mar 19 19:09:57 2008
New Revision: 639112

URL: http://svn.apache.org/viewvc?rev=639112&view=rev
Log:
Fixed failing Selenium web unit tests so that they run correctly, with two 
exceptions. See tests/etc/selenium/readme.txt; this file includes a few notes 
on how to write Selenium tests so that they will run automatically via the Ant 
"webtests" target.

Modified:
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEdit.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEditAllView.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousCreateGroup.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousView.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousViewImage.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedName.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedPermissions.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupFullName.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupLoginName.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupWikiName.html
    incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreatePage.html
    incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestDeletePage.html
    incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogin.html
    incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogout.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRedirectPageAfterLogin.html
    incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenamePage.html
    
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenameProfile.html
    incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestSuite.html

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEdit.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEdit.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEdit.html 
(original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEdit.html 
Wed Mar 19 19:09:57 2008
@@ -9,13 +9,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>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>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=${page}</td>       
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Edit.jsp?page=${page}</td>       
<td>editurl</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>                           
<td>loginurl</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>This page was created with an ACL by 
janne.</td>    <td>PageContent</td></tr>
 
        <!-- Login -->

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEditAllView.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEditAllView.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEditAllView.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAclJanneEditAllView.html
 Wed Mar 19 19:09:57 2008
@@ -10,13 +10,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>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>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=${page}</td>       
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Edit.jsp?page=${page}</td>       
<td>editurl</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>                           
<td>loginurl</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>This page was created with an ACL by janne.</td>    
<td>PageContent</td></tr>
 
        <!-- Login -->

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousCreateGroup.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousCreateGroup.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousCreateGroup.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousCreateGroup.html
 Wed Mar 19 19:09:57 2008
@@ -12,8 +12,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>../NewGroup.jsp</td>        
<td>newgroupurl</td></tr>
-       <tr><td>store</td>      <td>../UserPreferences.jsp?redirect=Main</td>   
<td>prefsurl</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>open</td>  <td>${prefsurl}</td>    <td>&nbsp;</td></tr>
     <tr><td>verifyElementPresent</td>  <td>css=form#clearCookie 
input[name="ok"]</td>          <td>&nbsp;</td></tr>

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousView.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousView.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousView.html 
(original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousView.html 
Wed Mar 19 19:09:57 2008
@@ -6,23 +6,15 @@
 </head>
 <body> 
 <table cellpadding="1" cellspacing="1" border="1">
-       <tbody>
+  <tbody>
        <tr><td rowspan="1" colspan="3">JSPWiki Test Anonymous 
View<br></td></tr>
-
-       <tr><td>store</td>      <td>../Wiki.jsp?page=Main</td>  
<td>url</td></tr>
-
-    <tr><td>open</td>  <td>${url}</td> <td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextPresent</td>             <td>You have successfully 
installed</td>        <td>&nbsp;</td></tr>
-
-    <tr><td>verifyElementPresent</td>  <td>link=About</td>             
<td></td></tr>
-
-    <tr><td>clickAndWait</td>                  <td>link=About</td>     
<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextPresent</td>             <td>This Wiki is done 
using</td>        <td>&nbsp;</td></tr>
-
-       </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>&nbsp;</td></tr>
+       <tr><td>verifyTextPresent</td>          <td>You have successfully 
installed</td>        <td>&nbsp;</td></tr>
+       <tr><td>verifyElementPresent</td>       <td>link=About</td>             
<td></td></tr>
+       <tr><td>clickAndWait</td>                       <td>link=About</td>     
<td>&nbsp;</td></tr>
+       <tr><td>verifyTextPresent</td>          <td>This Wiki is done 
using</td>        <td>&nbsp;</td></tr>
+  </tbody>
 </table>
-
 </body>
 </html>

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousViewImage.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousViewImage.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousViewImage.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAnonymousViewImage.html
 Wed Mar 19 19:09:57 2008
@@ -12,16 +12,17 @@
        JSPWiki Test Anonymous View Image<br>See if we can view the JSPWiki logo
        </td></tr>
 
-       <tr><td>store</td>      <td>../images/jspwiki_logo_s.png</td>   
<td>imgurl</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>open</td>                  <td>${imgurl}</td>      
<td>&nbsp;</td></tr>
-    <tr><td>assertBodyText</td>        <td></td>                       
<td>&nbsp;</td></tr>
-    
+       <tr><td>open</td>       <td>${imgurl}</td>      <td>&nbsp;</td></tr>
+       <tr><td>assertBodyText</td>     <td></td>                       
<td>&nbsp;</td></tr>
+
        <tr><td>store</td>      <td>../images/jspwiki_logo_ss.png</td>  
<td>imgurl</td></tr>
 
-    <tr><td>open</td>                  <td>${imgurl}</td>      
<td>&nbsp;</td></tr>
-    <tr><td>assertNotBodyText</td>     <td></td>                       
<td>&nbsp;</td></tr>
-    
+       <tr><td>open</td>                       <td>${imgurl}</td>      
<td>&nbsp;</td></tr>
+       <tr><td>assertNotBodyText</td>  <td></td>                       
<td>&nbsp;</td></tr>
+
        </tbody>
 </table>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedName.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedName.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedName.html 
(original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedName.html 
Wed Mar 19 19:09:57 2008
@@ -9,8 +9,9 @@
        <tbody>
        <tr><td rowspan="1" colspan="3">JSPWiki Test Asserted Name<br></td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=Main</td>  
<td>url</td></tr>
-       <tr><td>store</td>      <td>../UserPreferences.jsp?redirect=Main</td>   
<td>prefsurl</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>DonQuixote</td>                             
                <td>TestUsername</td></tr>
 
        <!-- Navigate to Prefs page; see the 'G'day message' for the anonymous 
user -->
@@ -33,6 +34,7 @@
     <!-- Now navigate back to the main page; see the 'G'day message' for the 
test user -->
     <tr><td>verifyTitle</td>           <td>JSPWiki: Main</td>          
<td>&nbsp;</td></tr>
     <tr><td>verifyTextPresent</td>     <td>G&#8217;day</td>            
<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>     <td>DonQuixote</td>             
<td>&nbsp;</td></tr>
     <tr><td>verifyElementPresent</td>  <td>link=${TestUsername}</td>   
<td>&nbsp;</td></tr>
     <tr><td>verifyTextPresent</td>     <td>(not logged in)</td>        
<td>&nbsp;</td></tr>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedPermissions.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedPermissions.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedPermissions.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestAssertedPermissions.html
 Wed Mar 19 19:09:57 2008
@@ -9,14 +9,15 @@
        <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>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>../Wiki.jsp</td>                    
<td>url</td></tr>
-       <tr><td>store</td>      <td>../UserPreferences.jsp?redirect=Main</td>   
<td>prefsurl</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>           
<td>loginurl</td></tr>
-       <tr><td>store</td>      <td>../Group.jsp?</td>          
<td>viewgroupurl</td></tr>
-       <tr><td>store</td>      <td>../NewGroup.jsp?</td>       
<td>newgroupurl</td></tr>
-       <tr><td>store</td>      <td>../EditGroup.jsp?</td>      
<td>editgroupurl</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>janne</td>  <td>TestUsername</td></tr>
     <tr><td>store</td> <td>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupFullName.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupFullName.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupFullName.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupFullName.html
 Wed Mar 19 19:09:57 2008
@@ -9,13 +9,14 @@
        <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>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>../Wiki.jsp</td>                    
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>           
<td>loginurl</td></tr>
-       <tr><td>store</td>      <td>../Group.jsp?</td>          
<td>viewgroupurl</td></tr>
-       <tr><td>store</td>      <td>../NewGroup.jsp?</td>       
<td>newgroupurl</td></tr>
-       <tr><td>store</td>      <td>../EditGroup.jsp?</td>      
<td>editgroupurl</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>janne</td>  <td>TestUsername</td></tr>
     <tr><td>store</td> <td>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupLoginName.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupLoginName.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupLoginName.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupLoginName.html
 Wed Mar 19 19:09:57 2008
@@ -9,13 +9,14 @@
        <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>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>../Wiki.jsp</td>                    
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>           
<td>loginurl</td></tr>
-       <tr><td>store</td>      <td>../Group.jsp?</td>          
<td>viewgroupurl</td></tr>
-       <tr><td>store</td>      <td>../NewGroup.jsp?</td>       
<td>newgroupurl</td></tr>
-       <tr><td>store</td>      <td>../EditGroup.jsp?</td>      
<td>editgroupurl</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>janne</td>  <td>TestUsername</td></tr>
     <tr><td>store</td> <td>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupWikiName.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupWikiName.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupWikiName.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreateGroupWikiName.html
 Wed Mar 19 19:09:57 2008
@@ -9,13 +9,14 @@
        <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>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>../Wiki.jsp</td>                    
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>           
<td>loginurl</td></tr>
-       <tr><td>store</td>      <td>../Group.jsp?</td>          
<td>viewgroupurl</td></tr>
-       <tr><td>store</td>      <td>../NewGroup.jsp?</td>       
<td>newgroupurl</td></tr>
-       <tr><td>store</td>      <td>../EditGroup.jsp?</td>      
<td>editgroupurl</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>janne</td>  <td>TestUsername</td></tr>
     <tr><td>store</td> <td>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreatePage.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreatePage.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreatePage.html 
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestCreatePage.html 
Wed Mar 19 19:09:57 2008
@@ -9,13 +9,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>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>[EMAIL PROTECTED]</td>              
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=Main</td>          
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Edit.jsp?page=${page}</td>       
<td>editurl</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>                   
<td>loginurl</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>This page was created by the web unit tests.</td>   
<td>PageContent</td></tr>
 
        <!-- Login -->

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestDeletePage.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestDeletePage.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestDeletePage.html 
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestDeletePage.html 
Wed Mar 19 19:09:57 2008
@@ -9,14 +9,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>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>[EMAIL PROTECTED]</td>              
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>/JSPWiki-pipo/Wiki.jsp?page=${page}</td>    
<td>url</td></tr>
-       <tr><td>store</td>      <td>/JSPWiki-pipo/Edit.jsp?page=${page}</td>    
<td>editurl</td></tr>
-       <tr><td>store</td>      
<td>/JSPWiki-pipo/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
-       <tr><td>store</td>      <td>/JSPWiki-pipo/Login.jsp</td>                
                <td>loginurl</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>This page was created by the web unit tests.</td>   
<td>PageContent</td></tr>
 
        <!-- Login --!>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogin.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogin.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogin.html 
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogin.html Wed 
Mar 19 19:09:57 2008
@@ -9,13 +9,14 @@
        <tbody>
        <tr><td rowspan="1" colspan="3">JSPWiki Test Login<br></td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=Main</td>  
<td>url</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>janne</td>          
<td>TestLoginname</td></tr>
     <tr><td>store</td> <td>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
     
     <tr><td>open</td>  <td>${url}</td> <td>&nbsp;</td></tr>
 
-    <tr><td>verifyTitle</td>           <td>JSPWiki: Main</td>  
<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>           <td>JSPWiki: Main</td>  
<td>&nbsp;</td></tr>
     <tr><td>verifyTextPresent</td>     <td>G&#8217;day (anonymous guest)</td>  
<td>&nbsp;</td></tr>
 
     <!-- login -->

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogout.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogout.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogout.html 
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestLogout.html Wed 
Mar 19 19:09:57 2008
@@ -9,8 +9,9 @@
        <tbody>
        <tr><td rowspan="1" colspan="3">JSPWiki Test Logout<br></td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=Main</td>  
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>                   
<td>loginurl</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>janne</td>                  
<td>TestUsername</td></tr>
     <tr><td>store</td> <td>[EMAIL PROTECTED]</td>              
<td>TestPassword</td></tr>
        <tr><td>store</td>      <td>JanneJalkanen</td>  <td>wikiname</td></tr>

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRedirectPageAfterLogin.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRedirectPageAfterLogin.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRedirectPageAfterLogin.html
 (original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRedirectPageAfterLogin.html
 Wed Mar 19 19:09:57 2008
@@ -9,14 +9,15 @@
        <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>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>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
+       <tr><td>store</td>      <td>[EMAIL PROTECTED]</td>      
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=${page}</td>       
<td>url</td></tr>
-       <tr><td>store</td>      <td>../Edit.jsp?page=${page}</td>       
<td>editurl</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>                           
<td>loginurl</td></tr>
-    <tr><td>store</td> <td>This page was created to test redirects.</td>       
<td>RedirectText</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>This page was created to test 
redirects.</td>       <td>RedirectText</td></tr>
 
        <!-- Login -->
     <tr><td>open</td>  <td>${loginurl}</td>    <td>&nbsp;</td></tr>
@@ -58,6 +59,9 @@
     <!-- We should be able to see the page now -->
     <tr><td>verifyTextPresent</td>     <td>${RedirectText}</td>        
<td>&nbsp;</td></tr>
 
+    <!-- Log out --!>
+    <tr><td>clickAndWait</td>  <td>link=Log out</td>   <td>&nbsp;</td></tr>
+
        </tbody>
 </table>
 

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenamePage.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenamePage.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenamePage.html 
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenamePage.html 
Wed Mar 19 19:09:57 2008
@@ -9,14 +9,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>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>[EMAIL PROTECTED]</td>              
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>/JSPWiki-pipo/Wiki.jsp?page=${page}</td>    
        <td>url</td></tr>
-       <tr><td>store</td>      <td>/JSPWiki-pipo/Edit.jsp?page=${page}</td>    
        <td>editurl</td></tr>
-       <tr><td>store</td>      
<td>/JSPWiki-pipo/PageInfo.jsp?page=${page}</td>        <td>infourl</td></tr>
-       <tr><td>store</td>      <td>/JSPWiki-pipo/Login.jsp</td>                
                <td>loginurl</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>This page was created by the rename web unit 
tests.</td>    <td>PageContent</td></tr>
 
        <!-- Login --!>

Modified: 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenameProfile.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenameProfile.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenameProfile.html 
(original)
+++ 
incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestRenameProfile.html 
Wed Mar 19 19:09:57 2008
@@ -32,19 +32,20 @@
 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>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>[EMAIL PROTECTED]</td>              
<td>TestPassword</td></tr>
+       <tr><td>store</td>      <td>[EMAIL PROTECTED]</td>              
<td>TestPassword</td></tr>
 
-       <tr><td>store</td>      <td>../Wiki.jsp?page=${page}</td>       
<td>viewurl</td></tr>
-       <tr><td>store</td>      <td>../Edit.jsp?page=${page}</td>       
<td>editurl</td></tr>
-       <tr><td>store</td>      <td>../Group.jsp?</td>          
<td>viewgroupurl</td></tr>
-       <tr><td>store</td>      <td>../NewGroup.jsp?</td>       
<td>newgroupurl</td></tr>
-       <tr><td>store</td>      
<td>../UserPreferences.jsp?redirect=Main&tab=profile</td>       
<td>prefsurl</td></tr>
-       <tr><td>store</td>      <td>../Login.jsp</td>                   
<td>loginurl</td></tr>
-       <tr><td>store</td>      <td>../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>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>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)<br/></td></tr>
     <tr><td>open</td>  <td>${loginurl}?tab=profile</td>        
<td>&nbsp;</td></tr>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestSuite.html
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestSuite.html?rev=639112&r1=639111&r2=639112&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestSuite.html 
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/JSPWikiTestSuite.html Wed 
Mar 19 19:09:57 2008
@@ -13,7 +13,6 @@
            class="selenium">
         <tbody>
                <tr><td><b>JSPWiki Test Suite for 
@selenium.context@</b></td></tr>
-        
         <tr><td><a 
href="./JSPWikiTestAnonymousView.html">JSPWikiTestAnonymousView</a></td></tr>
         <tr><td><a 
href="./JSPWikiTestAnonymousViewImage.html">JSPWikiTestAnonymousViewImage</a></td></tr>
 
@@ -22,10 +21,13 @@
         <tr><td><a 
href="./JSPWikiTestLogin.html">JSPWikiTestLogin</a></td></tr>
         <tr><td><a 
href="./JSPWikiTestLogout.html">JSPWikiTestLogout</a></td></tr>
 
-        <tr><td><a 
href="./JSPWikiTestCreatePage.html">JSPWikiTestCreatePage</a></td></tr>
+        <tr><td><a 
href="./JSPWikiTestCreatePage.html">JSPWikiTestCreatePage</a></td></tr>
         <tr><td><a 
href="./JSPWikiTestRenamePage.html">JSPWikiTestRenamePage</a></td></tr>
-        <tr><td><a 
href="./JSPWikiTestDeletePage.html">JSPWikiTestDeletePage</a></td></tr>
-               
+        <tr><td><a 
href="./JSPWikiTestDeletePage.html">JSPWikiTestDeletePage</a></td></tr>
+
+        <!-- See what happens if user tries to delete a page, but isn't an 
admin -->
+        <tr><td><a 
href="./JSPWikiTestDeletePage.html">JSPWikiTestNoDeletePage</a></td></tr>
+
         <tr><td><a 
href="./JSPWikiTestRedirectPageAfterLogin.html">JSPWikiTestRedirectPageAfterLogin</a></td></tr>
 
         <tr><td><a 
href="./JSPWikiTestAclJanneEdit.html">JSPWikiTestAclJanneEdit</a></td></tr>


Reply via email to