From 30ebe3c7cd4b82d2c9dc415f426d829f5a7e756c Mon Sep 17 00:00:00 2001
From: hlm7 <hlm7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 25 Jan 2011 17:45:38 +0000
Subject: [PATCH]

---
 .../AdminSecurity/AdminBookmarkedPage.html    | 162 +++++++++++++++++-
 .../suites/AdminSecurity/Suite.html           |  42 ++---
 .../suites/CreatePeople/Suite.html            |  76 ++++----
 .../suites/CreatePeopleVB/Suite.html          |  10 --
 4 files changed, 215 insertions(+), 75 deletions(-)

diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html
index cef4d536..81aac2e9 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html
@@ -29,6 +29,11 @@
 <thead>
 <tr><td rowspan="1" colspan="3" class="testName">AdminBookmarkedPage</td></tr>
 </thead><tbody>
+<tr>
+	<td>comment</td>
+	<td class="comment">Test various login/logout processes</td>
+	<td></td>
+</tr>
 <tr>
 	<td>deleteAllVisibleCookies</td>
 	<td></td>
@@ -44,14 +49,64 @@
 	<td>/vivo/siteAdmin</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Log in to VIVO</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Log in</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please enter your email address.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Now login and verify secure page is brought up</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginName</td>
+	<td>testAdmin</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>password</td>
+	<td>Password</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Home</td>
+	<td>loginForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Go to Site Information and then logout</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site information</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Site Information Editing Form</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>
@@ -59,6 +114,111 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged out. </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Welcome to VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Log in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Verify back on front page when logging back in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginName</td>
+	<td>testAdmin</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>password</td>
+	<td>Password</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>loginForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Go to a public page, logout, and log back in going to directly to public page</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Log out</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged out. </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please log in to manage content.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=log in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=log in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Log in to VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginName</td>
+	<td>testAdmin</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>password</td>
+	<td>Password</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>loginForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
index cf484042..1d77f57f 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
-<tr><td><a href="AdminBadLogin.html">AdminBadLogin</a></td></tr>
-<tr><td><a href="AdminBookmarkedPage.html">AdminBookmarkedPage</a></td></tr>
-<tr><td><a href="AdminChangePassword.html">AdminChangePassword</a></td></tr>
-<tr><td><a href="AdminLogouts.html">AdminLogouts</a></td></tr>
-<tr><td><a href="NewAdminAccount.html">NewAdminAccount</a></td></tr>
-<tr><td><a href="NewAdminFirstLogin.html">NewAdminFirstLogin</a></td></tr>
-<tr><td><a href="NewAdminDelete.html">NewAdminDelete</a></td></tr>
-</tbody></table>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="AdminBadLogin.html">AdminBadLogin</a></td></tr>
+<tr><td><a href="AdminBookmarkedPage.html">AdminBookmarkedPage</a></td></tr>
+<tr><td><a href="AdminChangePassword.html">AdminChangePassword</a></td></tr>
+<tr><td><a href="AdminLogouts.html">AdminLogouts</a></td></tr>
+<tr><td><a href="NewAdminAccount.html">NewAdminAccount</a></td></tr>
+<tr><td><a href="NewAdminFirstLogin.html">NewAdminFirstLogin</a></td></tr>
+<tr><td><a href="NewAdminDelete.html">NewAdminDelete</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
index c16c57de..5bf1858e 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/Suite.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
@@ -1,43 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
-<tr><td><a href="CreateFacultyMember.html">CreateFacultyMember</a></td></tr>
-<tr><td><a href="CreateLibrarian.html">CreateLibrarian</a></td></tr>
-<tr><td><a href="AddFacultyInfo.html">AddFacultyInfo</a></td></tr>
-<tr><td><a href="EditFacultyInfo.html">EditFacultyInfo</a></td></tr>
-<tr><td><a href="AddFacultyInfo2.html">AddFacultyInfo2</a></td></tr>
-<tr><td><a href="PublicFacultyInfo.html">PublicFacultyInfo</a></td></tr>
-<tr><td><a href="SearchFacultyInfo.html">SearchFacultyInfo</a></td></tr>
-<tr><td><a href="DeleteFacultyInfo.html">DeleteFacultyInfo</a></td></tr>
-<tr><td><a href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
-<tr><td><a href="ChangeFacultyImage.html">ChangeFacultyImage</a></td></tr>
-<tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
-<tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
-<tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
-<tr><td><a href="SetupTestTabs.html">SetupTestTabs</a></td></tr>
-<tr><td><a href="AddFacultyClassAutolink.html">AddFacultyClassAutolink</a></td></tr>
-<tr><td><a href="AddLibrarianClassAutolink.html">AddLibrarianClassAutolink</a></td></tr>
-<tr><td><a href="AddFacultyPosition.html">AddFacultyPosition</a></td></tr>
-<tr><td><a href="AssociateLibToFac.html">AssociateLibToFac</a></td></tr>
-<tr><td><a href="CheckPeopleLinks.html">CheckPeopleLinks</a></td></tr>
-<tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
-<tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
-<tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
-<tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
-<tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
-<tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
-<tr><td><a href="DeleteLibtoFacAssociation.html">DeleteLibtoFacAssociation</a></td></tr>
-<tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
-<tr><td><a href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
-<tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
-</tbody></table>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="CreateFacultyMember.html">CreateFacultyMember</a></td></tr>
+<tr><td><a href="CreateLibrarian.html">CreateLibrarian</a></td></tr>
+<tr><td><a href="AddFacultyInfo.html">AddFacultyInfo</a></td></tr>
+<tr><td><a href="EditFacultyInfo.html">EditFacultyInfo</a></td></tr>
+<tr><td><a href="AddFacultyInfo2.html">AddFacultyInfo2</a></td></tr>
+<tr><td><a href="PublicFacultyInfo.html">PublicFacultyInfo</a></td></tr>
+<tr><td><a href="SearchFacultyInfo.html">SearchFacultyInfo</a></td></tr>
+<tr><td><a href="DeleteFacultyInfo.html">DeleteFacultyInfo</a></td></tr>
+<tr><td><a href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
+<tr><td><a href="ChangeFacultyImage.html">ChangeFacultyImage</a></td></tr>
+<tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
+<tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
+<tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
+<tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
+<tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
+<tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
+<tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
+<tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
+<tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html
index 9d13086f..5bf1858e 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html
@@ -22,21 +22,11 @@
 <tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
 <tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
 <tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
-<tr><td><a href="SetupTestTabs.html">SetupTestTabs</a></td></tr>
-<tr><td><a href="AddFacultyClassAutolink.html">AddFacultyClassAutolink</a></td></tr>
-<tr><td><a href="AddLibrarianClassAutolink.html">AddLibrarianClassAutolink</a></td></tr>
-<tr><td><a href="AddFacultyPosition.html">AddFacultyPosition</a></td></tr>
-<tr><td><a href="AssociateLibToFac.html">AssociateLibToFac</a></td></tr>
-<tr><td><a href="CheckPeopleLinks.html">CheckPeopleLinks</a></td></tr>
 <tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
 <tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
 <tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
 <tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
 <tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
-<tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
-<tr><td><a href="DeleteLibtoFacAssociation.html">DeleteLibtoFacAssociation</a></td></tr>
-<tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
-<tr><td><a href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
 <tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
 </tbody></table>
 </body>