diff --git a/utilities/acceptance-tests/script/database_cleanser.rb b/utilities/acceptance-tests/script/database_cleanser.rb index 5dfa759a..fba3cf48 100644 --- a/utilities/acceptance-tests/script/database_cleanser.rb +++ b/utilities/acceptance-tests/script/database_cleanser.rb @@ -27,7 +27,7 @@ Parameters: -------------------------------------------------------------------------------- =end require 'open-uri' -require 'property_file_reader' +require File.expand_path('property_file_reader', File.dirname(File.expand_path(__FILE__))) class DatabaseCleanser # ------------------------------------------------------------------------------------ @@ -51,7 +51,7 @@ class DatabaseCleanser args << "--user=#{@mysql_username}" args << "--password=#{@mysql_password}" args << "--database=#{@database_name}" - args << "--version" + args << "--execute=show databases;" result = system("mysql", *args) raise("Can't find the 'mysql' command!") if result == nil raise("Can't connect to MySQL database.") if !result @@ -125,16 +125,22 @@ end # # ------------------------------------------------------------------------------------ # Standalone calling. +# +# Do this if this program was called from the command line. That is, if the command +# expands to the path of this file. # ------------------------------------------------------------------------------------ # -if ARGV.length == 0 - raise("No arguments - usage is: database_cleanser.rb ") -end -if !File.file?(ARGV[0]) - raise "File does not exist: '#{ARGV[0]}'." -end -properties = PropertyFileReader.read(ARGV[0]) +if File.expand_path($0) == File.expand_path(__FILE__) + if ARGV.length == 0 + raise("No arguments - usage is: ruby database_cleanser.rb ") + end + if !File.file?(ARGV[0]) + raise "File does not exist: '#{ARGV[0]}'." + end -dc = DatabaseCleanser.new(properties) -dc.cleanse() + properties = PropertyFileReader.read(ARGV[0]) + + dc = DatabaseCleanser.new(properties) + dc.cleanse() +end \ No newline at end of file diff --git a/utilities/acceptance-tests/script/example.acceptance_test.properties b/utilities/acceptance-tests/script/example.acceptance_test.properties index d885d539..e4225dc2 100644 --- a/utilities/acceptance-tests/script/example.acceptance_test.properties +++ b/utilities/acceptance-tests/script/example.acceptance_test.properties @@ -1,6 +1,19 @@ -webapp_url = http://localhost:8080/vivo/ -tomcat_username = tomcat -tomcat_password = tomcat -mysql_username = vitrodbUsername -mysql_password = vitrodbPassword -database_name = vivo \ No newline at end of file +# +# These properties tell how to set up Selenium to run a test suite. +# +website_url = http://localhost:8080/vivo/ +test_root_directory = C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\suites +output_directory = C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\script\\output +user_extensions_path = C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\selenium\\user-extensions.js +firefox_profile_template_path = C:\\Vitro_stuff\\Selenium\\experiments\\profiles\\selenium + +# +# These properties are needed to cleanse the data model between test suites. +# +tomcat_stop_command = java -Dcatalina.home="C:\Program Files\Apache Software Foundation\Tomcat 6.0" -jar "c:\Program Files\Apache Software Foundation\Tomcat 6.0\bin\bootstrap.jar" stop +tomcat_stop_delay = 3 +tomcat_start_command = start java -Dcatalina.home="C:\Program Files\Apache Software Foundation\Tomcat 6.0" -jar "C:\Program Files\Apache Software Foundation\Tomcat 6.0\bin\bootstrap.jar" +tomcat_start_delay = 180 +mysql_username = vitrodbUsername +mysql_password = vitrodbPassword +database_name = vivo diff --git a/utilities/acceptance-tests/script/run_acceptance_tests.rb b/utilities/acceptance-tests/script/run_acceptance_tests.rb index 1d407380..5be89b1d 100644 --- a/utilities/acceptance-tests/script/run_acceptance_tests.rb +++ b/utilities/acceptance-tests/script/run_acceptance_tests.rb @@ -38,7 +38,8 @@ What are we doing? -------------------------------------------------------------------------------- =end require 'open-uri' -require 'database_cleanser' +require File.expand_path('database_cleanser', File.dirname(File.expand_path(__FILE__))) +require File.expand_path('property_file_reader', File.dirname(File.expand_path(__FILE__))) =begin

Test suite results

@@ -76,6 +77,14 @@ class AcceptanceRunner # and URL. # def sanity_checks_on_parameters() + raise("Properties file must contain a value for 'website_url'") if @website_url == nil + raise("Properties file must contain a value for 'test_root_directory'") if @test_root_directory == nil + raise("Properties file must contain a value for 'output_directory'") if @output_directory == nil + raise("Properties file must contain a value for 'user_extensions_path'") if @user_extensions_path == nil + raise("Properties file must contain a value for 'firefox_profile_template_path'") if @firefox_profile_template_path == nil + raise("Properties file must contain a value for 'suite_timeout_limit'") if @suite_timeout_limit == nil + raise("Properties file must contain a value for 'selenium_jar_path'") if @selenium_jar_path == nil + confirm_is_readable_directory(@test_root_directory, "Test root directory") if get_sub_directories(@test_root_directory).empty? raise "Test root directory '#{@test_root_directory}' has no sub-directories." @@ -147,36 +156,77 @@ class AcceptanceRunner # def run_all_suites() get_sub_directories(@test_root_directory).each do |suite_path| - cleanse_data_model() - run_test_suite(suite_path) + suite_file_path = File.expand_path("Suite.html", suite_path) + if File.exist?(suite_file_path) + cleanse_data_model() + run_test_suite(suite_file_path) + end end end - + + # Before each suite, call the cleanser. def cleanse_data_model() - puts "BOGUS cleanse_data_model()" + # puts "BOGUS cleanse_data_model()" + @database_cleanser.cleanse() end - - def run_test_suite(suite_path) - puts "BOGUS run_test_suite()" + + def run_test_suite(suite_file_path) + puts "BOGUS run_test_suite(#{suite_file_path})" + + suite_name = File.basename(File.dirname(suite_file_path)) + output_file = File.expand_path("#{suite_name}_output.html", @output_directory) + + args = [] + args << "-jar" << @selenium_jar_path + args << "-singleWindow" + args << "-timeout" << @suite_timeout_limit.to_s + args << "-userExtensions" << @user_extensions_path + args << "-firefoxProfileTemplate" << @firefox_profile_template_path + args << "-htmlSuite" << "*firefox" << @website_url << suite_file_path << output_file + + result = system("java", *args) + raise("Can't find the 'java' command!") if result == nil + if !result + puts ">>>> result: #{result}" + puts ">>>> $?: #{$?}" + log_error("Can't run the suite at '#{suite_file_path}: command was 'java' #{args}") if !result + elsif $?.exitstatus != 0 + log_error("Suite failed at '#{suite_file_path}: return code was #{$?.exitstatus}, command was 'java' #{args}") + end end def create_summary_html() puts "BOGUS create_summary_html()" end + def log_error(message) + File.open(@log_file, File::CREAT | File::APPEND | File::WRONLY) do |f| + f.print(message + "\n") + end + puts "LOG LOG: '#{message}'" + end + # ------------------------------------------------------------------------------------ public # ------------------------------------------------------------------------------------ # Set up and get ready to process. # - def initialize(website_url, test_root_directory, output_directory, user_extensions_path, firefox_profile_template_path) - @website_url = website_url - @test_root_directory = test_root_directory - @output_directory = output_directory - @user_extensions_path = user_extensions_path - @firefox_profile_template_path = firefox_profile_template_path + def initialize(properties) + @website_url = properties['website_url'] + @test_root_directory = properties['test_root_directory'] + @output_directory = properties['output_directory'] + @user_extensions_path = properties['user_extensions_path'] + @firefox_profile_template_path = properties['firefox_profile_template_path'] + @suite_timeout_limit = properties['suite_timeout_limit'].to_i + @selenium_jar_path = properties['selenium_jar_path'] + sanity_checks_on_parameters() + + @database_cleanser = DatabaseCleanser.new(properties) + + @log_file = File.expand_path("log_file.txt", @output_directory) + end # Run all of the test suites and produce an output summary page. @@ -186,16 +236,20 @@ class AcceptanceRunner end end -# ------------------------------------------------------------------------ -# Main routine -# ------------------------------------------------------------------------ +# +# +# ------------------------------------------------------------------------------------ +# Standalone calling. +# ------------------------------------------------------------------------------------ +# +if ARGV.length == 0 + raise("No arguments - usage is: ruby run_acceptance_test.rb ") +end +if !File.file?(ARGV[0]) + raise "File does not exist: '#{ARGV[0]}'." +end -# BOGUS test harness -website_url = "http://localhost:8080/vivo/" -test_root_directory = "C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\suites" -output_directory = "C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\script\\output" -user_extensions_path = "C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\selenium\\user-extensions.js" -firefox_profile_template_path = "C:\\Vitro_stuff\\Selenium\\experiments\\profiles\\selenium" +properties = PropertyFileReader.read(ARGV[0]) -ar = AcceptanceRunner.new(website_url, test_root_directory, output_directory, user_extensions_path, firefox_profile_template_path) -ar.run() \ No newline at end of file +ar = AcceptanceRunner.new(properties) +ar.run() diff --git a/utilities/acceptance-tests/script/run_suite.bat b/utilities/acceptance-tests/script/run_suite.bat index 77b8ab7d..ab5d1739 100644 --- a/utilities/acceptance-tests/script/run_suite.bat +++ b/utilities/acceptance-tests/script/run_suite.bat @@ -10,5 +10,5 @@ SET SEL_OPTS=%SEL_OPTS% -htmlSuite "*firefox" "http://localhost:8080/vivo/" ".. SET Path=%Path%;C:\Program Files (x86)\Mozilla Firefox @echo on -java -jar selenium-server.jar %SEL_OPTS% +java -jar ..\selenium\selenium-server.jar %SEL_OPTS% diff --git a/utilities/acceptance-tests/script/vivo_output.html b/utilities/acceptance-tests/script/vivo_output.html index 40e00f80..fbd4af5a 100644 --- a/utilities/acceptance-tests/script/vivo_output.html +++ b/utilities/acceptance-tests/script/vivo_output.html @@ -54,7 +54,7 @@ a { totalTime: -13 +34 numTestTotal: @@ -62,23 +62,23 @@ a { numTestPasses: -6 - - -numTestFailures: -1 - - -numCommandPasses: -72 - - -numCommandFailures: 0 +numTestFailures: +7 + + +numCommandPasses: +15 + + +numCommandFailures: +8 + + numCommandErrors: -1 +7 Selenium Version: @@ -91,13 +91,13 @@ a { - - - - - - - + + + + + + +
Test Suite
Create New User
First Time Login
Try New Password
Edit User Info
Confirm Edited Info
Delete New User
Test Suite
Create New User
First Time Login
Try New Password
Edit User Info
Confirm Edited Info
Delete New User
Bookmark Without Logging In
@@ -107,12 +107,12 @@ a { CreateNewUser.html
- + - + - + @@ -129,157 +129,157 @@ a { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -292,12 +292,12 @@ a {
Create New User
Create New User
open .XHR ERROR: URL = http://localhost:8080/vivo/. Response_Code = 500 Error_Message = Internal Server Error
assertTitlelink=Log in
assertTitle VIVO Site AdministrationActual value '' did not match 'VIVO Site Administration'
type username defaultAdmin
type password Password
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
comment Create a new user
clickAndWait link=User accounts
assertTitle User Accounts
clickAndWait //input[@value='Add new user account']
assertTitle User Account Editing Form
type Username User Mgmt
type FirstName User
type LastName Mgmt
type Md5password UserMgmt
comment Enter a mis-matched confirmation password
type passwordConfirmation somethingElse
click primaryAction
assertAlert The passwords do not match.
comment Now enter a correct password
type passwordConfirmation UserMgmt
clickAndWait primaryAction
assertTitle User Account Control Panel
comment Confirm values for new user
verifyText //tr[1]/td[2] User Mgmt
verifyText //tr[2]/td[2] User
verifyText //tr[3]/td[2] Mgmt
verifyText //tr[4]/td[2] 0
verifyTextPresent unprivileged
comment Log out
clickAndWait link=Log out
assertTitle VIVO FirstTimeLogin.html
- + - + - + @@ -324,192 +324,192 @@ a { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -522,7 +522,7 @@ a {
First Time Login
First Time Login
open .XHR ERROR: URL = http://localhost:8080/vivo/. Response_Code = 500 Error_Message = Internal Server Error
assertTitleTry the wrong password
type usernameUser MgmtElement username not found
type password incorrect
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
verifyTextPresent (1st login; initial password entered incorrectly)
verifyTextPresent Please try entering provided password again
comment Now the correct password
type password UserMgmt
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
verifyTextPresent (1st login; changing to new private password)
verifyTextPresent Please now choose a private password
comment Try changing to an invalid password
type password junk
click loginSubmitMode
assertAlert Please enter a password between 6 and 12 characters long
comment Now try a valid one
type password newPassword
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
verifyTextPresent (changing to new password)
verifyTextPresent Please re-enter new private password
comment Re-enter it incorrectly
type password garbage
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
verifyTextPresent (password incorrect)
verifyTextPresent Incorrect password: try again
comment Now re-enter it correctly
type password newPassword
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
comment Are we logged in?
verifyTextPresent Logged in as
verifyTextPresent User Mgmt
comment Log out
clickAndWait loginSubmitMode
assertTitle VIVO TryNewPassword.html
- + @@ -559,37 +559,37 @@ a { - + - + - + - + - + - + - + - + @@ -602,7 +602,7 @@ a {
Try New Password
Try New Password
openloginSubmitMode
assertTitle VIVO Site AdministrationActual value 'Apache Tomcat/6.0.24 - Error report' did not match 'VIVO Site Administration'
comment Confirm that it worked
verifyTextPresent Logged in as
verifyTextPresent User Mgmt
comment Log out
clickAndWait loginSubmitMode
assertTitle VIVO EditUserInfo.html
- + @@ -614,6 +614,11 @@ a { + + + + + @@ -645,146 +650,166 @@ a { - - + + - + + + + + + - + - + - + + + + + + - + - + + + + + + - + - + - + - - - + + + - - - - - - - - - - - - - - - - + - + - + + + + + + - + - + - + - + + + + + + - + - + - + + + + + + - + - + - + - + + + + + + - + @@ -797,7 +822,7 @@ a {
EditUserInfo
Edit User Info
openVIVO
commentLogin as default admin
clickAndWait link=Log in
clickAndWaitlink=User accountscommentGo to user management for our new user account
clickAndWaitlink=User accountsElement link=User accounts not found
assertTitle User Accounts
clickAndWait link=User Mgmt
assertTitle User Account Control Panel
commentOpen the editing form
clickAndWait //input[@value='Edit User Account']
assertTitle User Account Editing Form
commentChange the User Name and the Last Name
type Username User Management
type LastName Management
clickAndWait primaryAction
assertTitle User Account Control Panel
clickAndWait//input[@value='Edit User Account']
commentOpen the "Reset Password" form
assertTitleUser Account Editing Form
clickAndWait_cancel
assertTitleUser Account Control Panel
clickAndWait //input[@value='Reset Password']
assertTitle User Account Editing Form
commentTry two passwords that don't match
type Md5password otherPassword
type passwordConfirmation somethingElse
click primaryAction
assertAlert The passwords do not match.
commentTry passwords that match, but are too long
type passwordConfirmation otherPassword
click primaryAction
assertAlert Please enter a password between 6 and 12 characters long.
commentTry a good password, with a good match.
type Md5password resetPasswd
type passwordConfirmation resetPasswd
clickAndWait primaryAction
assertTitle User Account Control Panel
commentLog out
clickAndWait link=Log out
assertTitle VIVO ConfirmEditedInfo.html
- + @@ -879,30 +904,30 @@ a { - + - + - + - + - + - + - + - +
Confirm Edited Info
Confirm Edited Info
openVIVO Site Administration
verifyTextPresent Logged in asfalse
verifyTextPresent User Managementfalse
comment Log out
clickAndWait loginSubmitModeTimed out after 30000ms
assertTitle VIVOActual value 'VIVO Site Administration' did not match 'VIVO'
@@ -912,12 +937,12 @@ a {
DeleteNewUser.html
- + - + - + @@ -934,117 +959,117 @@ a { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1057,13 +1082,23 @@ a {
Delete New User
Delete New User
open .XHR ERROR: URL = http://localhost:8080/vivo/. Response_Code = 500 Error_Message = Internal Server Error
assertTitlelink=Log in
assertTitle VIVO Site AdministrationActual value '' did not match 'VIVO Site Administration'
type username defaultAdmin
type password Password
clickAndWait loginSubmitMode
assertTitle VIVO Site Administration
comment Go to User Accounts
clickAndWait link=User accounts
assertTitle User Accounts
verifyElementPresent link=User Management
comment View the new user account, and edit it.
clickAndWait link=User Management
assertTitle User Account Control Panel
clickAndWait //input[@value='Edit User Account']
assertTitle User Account Editing Form
comment Delete the account
click _delete
assertConfirmation Are you SURE you want to delete this user? If in doubt, CANCEL.
waitForPageToLoad 5000
assertTitle User Accounts
verifyElementNotPresent link=User Management
comment Log out
clickAndWait link=Log out
assertTitle VIVO BookmarkWithoutLoggingIn.html
- + + + + + + + + + + + @@ -1084,20 +1119,30 @@ a { - - - - + + + + - + + + + + + + + + + + - + - + @@ -1111,99 +1156,40 @@ a {
BookmarkWithoutLoggingIn
Bookmark Without Logging In
commentTry to view Data Property Hierarchy page without logging in
open ./showDataPropertyHierarchy?home=1
commentIt takes us to login page instead
assertTitle VIVO Site AdministrationloginSubmitMode
assertTitleData Property HierarchyActual value 'VIVO Site Administration' did not match 'Data Property Hierarchy'
commentAfter logging in, we go to the Data Property Hierarchy page, as intended.
verifyTitleData Property HierarchyActual value 'Apache Tomcat/6.0.24 - Error report' did not match 'Data Property Hierarchy'
verifyTextPresent Data Property Hierarchyfalse
commentLog out
click link=Log outElement link=Log out not found
assertTitle
 info: Starting test /selenium-server/tests/CreateNewUser.html
 info: Executing: |open | . |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542015944
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542015945
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542015991
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542015991
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826435545
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826435545
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826435679
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826435679
+error: XHR failed with message Internal Server Error
+warn: currentTest.recordFailure: XHR ERROR: URL = http://localhost:8080/vivo/. Response_Code = 500 Error_Message = Internal Server Error
 info: Executing: |assertTitle | VIVO |  |
 info: Executing: |comment | Login as defaultAdmin |  |
 info: Executing: |clickAndWait | link=Log in |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |type | username | defaultAdmin |
-info: Executing: |type | password | Password |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |comment | Create a new user |  |
-info: Executing: |clickAndWait | link=User accounts |  |
-info: Executing: |assertTitle | User Accounts |  |
-info: Executing: |clickAndWait | //input[@value='Add new user account'] |  |
-info: Executing: |assertTitle | User Account Editing Form |  |
-info: Executing: |type | Username | User Mgmt |
-info: Executing: |type | FirstName | User |
-info: Executing: |type | LastName | Mgmt |
-info: Executing: |type | Md5password | UserMgmt |
-info: Executing: |comment | Enter a mis-matched confirmation password |  |
-info: Executing: |type | passwordConfirmation | somethingElse |
-info: Executing: |click | primaryAction |  |
-info: Executing: |assertAlert | The passwords do not match. |  |
-info: Executing: |comment | Now enter a correct password |  |
-info: Executing: |type | passwordConfirmation | UserMgmt |
-info: Executing: |clickAndWait | primaryAction |  |
-info: Executing: |assertTitle | User Account Control Panel |  |
-info: Executing: |comment | Confirm values for new user |  |
-info: Executing: |verifyText | //tr[1]/td[2] | User Mgmt |
-info: Executing: |verifyText | //tr[2]/td[2] | User |
-info: Executing: |verifyText | //tr[3]/td[2] | Mgmt |
-info: Executing: |verifyText | //tr[4]/td[2] | 0 |
-info: Executing: |verifyTextPresent | unprivileged |  |
-info: Executing: |comment | Log out |  |
-info: Executing: |clickAndWait | link=Log out |  |
-info: Executing: |assertTitle | VIVO |  |
+error: Actual value '' did not match 'VIVO Site Administration'
+warn: currentTest.recordFailure: Actual value '' did not match 'VIVO Site Administration'
 info: Starting test /selenium-server/tests/FirstTimeLogin.html
 info: Executing: |open | . |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542017777
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542017777
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542017785
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542017785
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826436087
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826436087
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826436219
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826436219
+error: XHR failed with message Internal Server Error
+warn: currentTest.recordFailure: XHR ERROR: URL = http://localhost:8080/vivo/. Response_Code = 500 Error_Message = Internal Server Error
 info: Executing: |assertTitle | VIVO |  |
 info: Executing: |comment | Login for the first time |  |
 info: Executing: |clickAndWait | link=Log in |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
 info: Executing: |comment | Try the wrong password |  |
 info: Executing: |type | username | User Mgmt |
-info: Executing: |type | password | incorrect |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |verifyTextPresent | (1st login; initial password entered incorrectly) |  |
-info: Executing: |verifyTextPresent | Please try entering provided password again |  |
-info: Executing: |comment | Now the correct password |  |
-info: Executing: |type | password | UserMgmt |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |verifyTextPresent | (1st login; changing to new private password) |  |
-info: Executing: |verifyTextPresent | Please now choose a private password |  |
-info: Executing: |comment | Try changing to an invalid password |  |
-info: Executing: |type | password | junk |
-info: Executing: |click | loginSubmitMode |  |
-info: Executing: |assertAlert | Please enter a password between 6 and 12 characters long |  |
-info: Executing: |comment | Now try a valid one |  |
-info: Executing: |type | password | newPassword |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |verifyTextPresent | (changing to new password) |  |
-info: Executing: |verifyTextPresent | Please re-enter new private password |  |
-info: Executing: |comment | Re-enter it incorrectly |  |
-info: Executing: |type | password | garbage |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |verifyTextPresent | (password incorrect) |  |
-info: Executing: |verifyTextPresent | Incorrect password: try again |  |
-info: Executing: |comment | Now re-enter it correctly |  |
-info: Executing: |type | password | newPassword |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |comment | Are we logged in? |  |
-info: Executing: |verifyTextPresent | Logged in as |  |
-info: Executing: |verifyTextPresent | User Mgmt |  |
-info: Executing: |comment | Log out |  |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO |  |
+error: Element username not found
+warn: currentTest.recordFailure: Element username not found
 info: Starting test /selenium-server/tests/TryNewPassword.html
 info: Executing: |open | . |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542020879
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542020879
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542020896
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542020896
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826436567
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826436567
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826436587
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826436587
 info: Executing: |assertTitle | VIVO |  |
 info: Executing: |comment | Log in with new password |  |
 info: Executing: |clickAndWait | link=Log in |  |
@@ -1211,60 +1197,32 @@ info: Executing: |type | username | User Mgmt |
 info: Executing: |type | password | newPassword |
 info: Executing: |clickAndWait | loginSubmitMode |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |comment | Confirm that it worked |  |
-info: Executing: |verifyTextPresent | Logged in as |  |
-info: Executing: |verifyTextPresent | User Mgmt |  |
-info: Executing: |comment | Log out |  |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO |  |
+error: Actual value 'Apache Tomcat/6.0.24 - Error report' did not match 'VIVO Site Administration'
+warn: currentTest.recordFailure: Actual value 'Apache Tomcat/6.0.24 - Error report' did not match 'VIVO Site Administration'
 info: Starting test /selenium-server/tests/EditUserInfo.html
 info: Executing: |open | . |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542022553
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542022553
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542022572
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542022572
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826437055
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826437056
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826437077
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826437077
 info: Executing: |assertTitle | VIVO |  |
+info: Executing: |comment | Login as default admin |  |
 info: Executing: |clickAndWait | link=Log in |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
 info: Executing: |type | username | defaultAdmin |
 info: Executing: |type | password | Password |
 info: Executing: |clickAndWait | loginSubmitMode |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
+info: Executing: |comment | Go to user management for our new user account |  |
 info: Executing: |clickAndWait | link=User accounts |  |
-info: Executing: |assertTitle | User Accounts |  |
-info: Executing: |clickAndWait | link=User Mgmt |  |
-info: Executing: |assertTitle | User Account Control Panel |  |
-info: Executing: |clickAndWait | //input[@value='Edit User Account'] |  |
-info: Executing: |assertTitle | User Account Editing Form |  |
-info: Executing: |type | Username | User Management |
-info: Executing: |type | LastName | Management |
-info: Executing: |clickAndWait | primaryAction |  |
-info: Executing: |assertTitle | User Account Control Panel |  |
-info: Executing: |clickAndWait | //input[@value='Edit User Account'] |  |
-info: Executing: |assertTitle | User Account Editing Form |  |
-info: Executing: |clickAndWait | _cancel |  |
-info: Executing: |assertTitle | User Account Control Panel |  |
-info: Executing: |clickAndWait | //input[@value='Reset Password'] |  |
-info: Executing: |assertTitle | User Account Editing Form |  |
-info: Executing: |type | Md5password | otherPassword |
-info: Executing: |type | passwordConfirmation | somethingElse |
-info: Executing: |click | primaryAction |  |
-info: Executing: |assertAlert | The passwords do not match. |  |
-info: Executing: |type | passwordConfirmation | otherPassword |
-info: Executing: |click | primaryAction |  |
-info: Executing: |assertAlert | Please enter a password between 6 and 12 characters long. |  |
-info: Executing: |type | Md5password | resetPasswd |
-info: Executing: |type | passwordConfirmation | resetPasswd |
-info: Executing: |clickAndWait | primaryAction |  |
-info: Executing: |assertTitle | User Account Control Panel |  |
-info: Executing: |clickAndWait | link=Log out |  |
-info: Executing: |assertTitle | VIVO |  |
+error: Element link=User accounts not found
+warn: currentTest.recordFailure: Element link=User accounts not found
 info: Starting test /selenium-server/tests/ConfirmEditedInfo.html
 info: Executing: |open | . |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542025594
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542025594
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542025613
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542025613
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826437789
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826437789
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826437810
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826437810
 info: Executing: |assertTitle | VIVO |  |
 info: Executing: |comment | Try to log in with original username |  |
 info: Executing: |clickAndWait | link=Log in |  |
@@ -1281,55 +1239,49 @@ info: Executing: |type | password | resetPasswd |
 info: Executing: |clickAndWait | loginSubmitMode |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
 info: Executing: |verifyTextPresent | Logged in as |  |
+warn: currentTest.recordFailure: false
 info: Executing: |verifyTextPresent | User Management |  |
+warn: currentTest.recordFailure: false
 info: Executing: |comment | Log out |  |
 info: Executing: |clickAndWait | loginSubmitMode |  |
+warn: currentTest.recordFailure: Timed out after 30000ms
 info: Executing: |assertTitle | VIVO |  |
+error: Actual value 'VIVO Site Administration' did not match 'VIVO'
+warn: currentTest.recordFailure: Actual value 'VIVO Site Administration' did not match 'VIVO'
 info: Starting test /selenium-server/tests/DeleteNewUser.html
 info: Executing: |open | . |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542026736
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542026736
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542026760
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542026760
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826468862
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826468862
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826468998
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826468998
+error: XHR failed with message Internal Server Error
+warn: currentTest.recordFailure: XHR ERROR: URL = http://localhost:8080/vivo/. Response_Code = 500 Error_Message = Internal Server Error
 info: Executing: |assertTitle | VIVO |  |
 info: Executing: |comment | Log in as default admin |  |
 info: Executing: |clickAndWait | link=Log in |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |type | username | defaultAdmin |
-info: Executing: |type | password | Password |
-info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | VIVO Site Administration |  |
-info: Executing: |comment | Go to User Accounts |  |
-info: Executing: |clickAndWait | link=User accounts |  |
-info: Executing: |assertTitle | User Accounts |  |
-info: Executing: |verifyElementPresent | link=User Management |  |
-info: Executing: |comment | View the new user account, and edit it. |  |
-info: Executing: |clickAndWait | link=User Management |  |
-info: Executing: |assertTitle | User Account Control Panel |  |
-info: Executing: |clickAndWait | //input[@value='Edit User Account'] |  |
-info: Executing: |assertTitle | User Account Editing Form |  |
-info: Executing: |comment | Delete the account |  |
-info: Executing: |click | _delete |  |
-info: Executing: |assertConfirmation | Are you SURE you want to delete this user? If in doubt, CANCEL. |  |
-info: Executing: |waitForPageToLoad | 5000 |  |
-info: Executing: |assertTitle | User Accounts |  |
-info: Executing: |verifyElementNotPresent | link=User Management |  |
-info: Executing: |comment | Log out |  |
-info: Executing: |clickAndWait | link=Log out |  |
-info: Executing: |assertTitle | VIVO |  |
+error: Actual value '' did not match 'VIVO Site Administration'
+warn: currentTest.recordFailure: Actual value '' did not match 'VIVO Site Administration'
 info: Starting test /selenium-server/tests/BookmarkWithoutLoggingIn.html
+info: Executing: |comment | Try to view Data Property Hierarchy page without logging in |  |
 info: Executing: |open | ./showDataPropertyHierarchy?home=1 |  |
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542028593
-info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267542028593
-info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267542028642
-info: onXhrStateChange(): xhr.readyState = 3 method = HEAD time = 1267542028642
-info: onXhrStateChange(): xhr.readyState = 3 method = HEAD time = 1267542028643
-info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267542028643
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826469407
+info: onXhrStateChange(): xhr.readyState = 1 method = HEAD time = 1267826469408
+info: onXhrStateChange(): xhr.readyState = 2 method = HEAD time = 1267826469478
+info: onXhrStateChange(): xhr.readyState = 3 method = HEAD time = 1267826469478
+info: onXhrStateChange(): xhr.readyState = 4 method = HEAD time = 1267826469549
+info: Executing: |comment | It takes us to login page instead |  |
 info: Executing: |assertTitle | VIVO Site Administration |  |
 info: Executing: |type | username | defaultAdmin |
 info: Executing: |type | password | Password |
 info: Executing: |clickAndWait | loginSubmitMode |  |
-info: Executing: |assertTitle | Data Property Hierarchy |  |
-error: Actual value 'VIVO Site Administration' did not match 'Data Property Hierarchy'
-warn: currentTest.recordFailure: Actual value 'VIVO Site Administration' did not match 'Data Property Hierarchy'
+info: Executing: |comment | After logging in, we go to the Data Property Hierarchy page, as intended. |  |
+info: Executing: |verifyTitle | Data Property Hierarchy |  |
+warn: currentTest.recordFailure: Actual value 'Apache Tomcat/6.0.24 - Error report' did not match 'Data Property Hierarchy'
+info: Executing: |verifyTextPresent | Data Property Hierarchy |  |
+warn: currentTest.recordFailure: false
+info: Executing: |comment | Log out |  |
+info: Executing: |click | link=Log out |  |
+error: Element link=Log out not found
+warn: currentTest.recordFailure: Element link=Log out not found
\ No newline at end of file