24 Aug
2009
24 Aug
'09
13:37
ref: refs/heads/basesystem commit f9c28c0bc01353f7525970edd01b755aad9e9d2a Author: Stefan SchubertDate: Thu Aug 20 14:58:28 2009 +0200 test:ui is running for all testcases --- webclient/test/dummy-host/host.rb | 16 ++++++++- .../test/ui/src/systemtime_test_datepicker.xml | 37 -------------------- webclient/test/ui/src/systemtime_test_login.xml | 6 ++-- webclient/test/ui/src/systemtime_test_lookat.xml | 33 +++++++++++++----- webclient/test/ui/src/systemtime_testsuite.xml | 1 - webclient/test/ui/systemtime_test.rb | 23 +++++------- 6 files changed, 51 insertions(+), 65 deletions(-) diff --git a/webclient/test/dummy-host/host.rb b/webclient/test/dummy-host/host.rb index baf078e..02628c5 100644 --- a/webclient/test/dummy-host/host.rb +++ b/webclient/test/dummy-host/host.rb @@ -155,4 +155,18 @@ put '/permissions/:id.xml' do permission = {"name" => "org.opensuse.yast.webservice.return-permissions", "grant" => true} permission.to_xml(:root => "permission") - end \ No newline at end of file + end + + get '/time.xml' do + ret = Hash.from_xml < 20/08/2009 Europe/Berlin UTC +EOX + ret["systemtime"].to_xml(:root => "systemtime") + + end + + + post '/time.xml' do + time = {"time" => "09:12:16", "date" => "20/08/2009", "timezone" => "Europe/Berlin", "utcstatus" => "UTC"} + time.to_xml(:root => "systemtime") + end diff --git a/webclient/test/ui/src/systemtime_test_datepicker.xml b/webclient/test/ui/src/systemtime_test_datepicker.xml deleted file mode 100644 index 15580d1..0000000 --- a/webclient/test/ui/src/systemtime_test_datepicker.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - Africa Africa/Kampala Africa/Maputo Maputo Africa/Johannesburg Johannesburg Africa/Casablanca Casablanca Africa/Banjul Banjul Africa/Windhoek Windhoek Africa/Maseru Maseru Africa/Luanda Luanda Africa/Lagos Lagos Africa/Kigali Kigali Africa/Douala Douala Africa/Asmara Asmara < timezone> Africa/Malabo Malabo Africa/Lusaka Lusaka Africa/Kinshasa Kinshasa Africa/El_Aaiun El Aaiun Africa/Ceuta Ceuta Africa/Nouakchott Nouakchott Africa/Lubumbashi Lubumbashi Africa/Dar_es_Salaam Dar es Salaam Africa/Dakar Dakar Indian/Reunion Reunion Africa/Ndjamena Ndjamena Africa/Mbabane Mbabane Africa/Khartoum Khartoum Africa/Addis_Ababa Addis Ababa Africa/Ouagadougou Ouagadougou Africa/Harare Harare Africa/Bissau Bissau Africa/Bangui Bangui Africa/Bamako Bamako Africa/Tunis Tunis Africa/Monrovia Monrovia Africa/Djibouti Djibouti Africa/Brazzaville Brazzaville Africa/Algiers Algiers Africa/Abidjan Abidjan Africa/Porto-Novo Porto-Novo Africa/Nairobi Nairobi Africa/Lome Lome Africa/Gaborone Gaborone Africa/Accra Accra Indian/Antananarivo Antananarivo Africa/Sao_Tome Sao Tome Africa/Libreville Libreville Africa/Freetown Freetown Africa/Bujumbura Bujumbura Africa/Tripoli Tripoli Africa/Niamey Niamey Africa/Mogadishu Mogadishu Africa/Kampala Kampala Africa/Conakry Conakry Africa/Cairo Cairo Africa/Blantyre Blantyre Argentina America/Argentina/Buenos_Aires America/Argentina/San_Juan San Juan America/Argentina/Mendoza Mendoza America/Argentina/La_Rioja La Rioja America/Argentina/Jujuy Jujuy America/Argentina/Buenos_Aires Buenos Aires America/Argentina/Rio_Gallegos Rio Gallegos America/Argentina/Ushuaia Ushuaia America/Argentina/San_Luis San Luis America/Argentina/Cordoba Cordoba America/Argentina/Tucuman Tucuman America/Argentina/Catamarca Catamarca Asia Asia/Kolkata Asia/Yerevan Yerevan Asia/Ulaanbaatar Ulan Bator Asia/Magadan Magadan Asia/Choibalsan Choibalsan Asia/Baghdad Baghdad Mideast/Riyadh87 Mideast Riyadh87 Asia/Yakutsk Yakutsk Asia/Pontianak Pontianak Mideast/Riyadh88 Mideast Riyadh88 Asia/Dushanbe Dushanbe Asia/Singapore Singapore Mideast/Riyadh89 Mideast Riyadh89 Asia/Vientiane Vientiane Asia/Tehran Tehran Asia/Damascus Damascus Asia/Karachi Karachi Asia/Baku Baku Asia/Hong_Kong Hongkong A sia/Sakhalin Sakhalin Asia/Tashkent Tashkent Asia/Qatar Qatar Asia/Seoul Seoul Asia/Harbin Harbin Asia/Oral Oral Asia/Jayapura Jayapura Asia/Beijing Beijing Asia/Shanghai Shanghai Asia/Dubai Dubai Asia/Urumqi Urumqi Asia/Kabul Afghanistan Asia/Bangkok Bangkok Asia/Samarkand Samarkand Asia/Amman Amman Asia/Taipei Taipei Asia/Krasnoy arsk Krasnoyarsk Asia/Vladivostok Vladivostok Asia/Kuching Kuching Asia/Muscat Muscat Asia/Omsk Omsk Asia/Aqtau Aqtau Asia/Rangoon Myanmar Asia/Gaza Gaza Asia/Jerusalem Israel Asia/Chongqing Chongqing Asia/Brunei Brunei Asia/Qyzylorda Qyzylorda Asia/Aqtobe Aqtobe Asia/Kuwait Kuwait Asia/Kamchatka Kamchatka Asia/Colombo Colombo Asia /Riyadh Riyadh Asia/Beirut Beirut Asia/Kashgar Kashgar Asia/Almaty Almaty Asia/Thimphu Thimphu Asia/Manila Manila Asia/Macau Macao Asia/Bishkek Bishkek Asia/Ashgabat Ashgabat Asia/Nicosia Nicosia Asia/Jakarta Jakarta Asia/Makassar Makassar Asia/Phnom_Penh Phnom Penh Asia/Aden Aden Asia/Anadyr Anadyr Asia/Dhaka Dhaka Asia/Kuala_Lump ur Kuala Lumpur Asia/Irkutsk Irkutsk Asia/Tbilisi Tbilisi Asia/Yekaterinburg Yekaterinburg Asia/Tokyo Japan Asia/Katmandu Katmandu Asia/Kolkata Kolkata Asia/Dili Dili Asia/Pyongyang Pyongyang Asia/Hovd Hovd Asia/Novosibirsk Novosibirsk Asia/Ho_Chi_Minh Saigon Asia/Bahrain Bahrain Atlantic Atlantic/Madeira Atlantic/Stanley Stanley Atla ntic/St_Helena St Helena Atlantic/Jan_Mayen Jan Mayen America/Miquelon Miquelon Atlantic/Canary Canary Islands Atlantic/Bermuda Bermuda Atlantic/Reykjavik Iceland America/Thule Greenland (Thule) America/Godthab Greenland (Nuuk) Atlantic/Faroe Faroe Islands America/Scoresbysund Greenland (Scoresbysund) Atlantic/Madeira Madeira Atlantic/Azores Azores Atlantic/South_Georgia South Georgia Atlantic/Cape_Verde Cape Verde America/Danmarkshavn Greenland (Danmarkshavn) Australia Australia/Sydney Australia/Sydney New South Wales (Sydney) Australia/Lindeman Lindeman Australia/Darwin Northern Territory (Darwin) Australia/Adelaide South Australia (Adelaide) Australia/Hobart Tasmania (Hobart) Australia/Eucla Eucla Australia/Broken_Hill New South Wales (Broken Hill) Australia/Currie Tasmania (Currie) Australia/Perth Western Australia (Perth) Australia/Melbourne Victoria (Melbourne) Australia/Lord_Howe Lord Howe Island Australia/Brisbane Queensland (Brisbane) Brazil America/Sao_Paulo America/Porto_Velho Porto Velho America/Eirunepe Eirunepe America/Bahia Bahia America/Noronha Fernando de Noronha America/Cuiaba Cuiaba America/Campo_Grande Campo Grande America/Boa_Vista Boa Vista America/Recife Recife America/Manaus Manaus America/Araguaina Araguaina America/Maceio Maceio < /timezone>America/Sao_Paulo Sao Paulo America/Rio_Branco Rio Branco America/Belem Belem America/Fortaleza Fortaleza Canada America/Winnipeg America/Regina Saskatchewan (Regina) America/Rankin_Inlet Rankin Inlet America/Thunder_Bay Thunder Bay America/Resolute Resolute America/Goose_Bay Goose Bay America/Dawson_Creek Dawson Creek America/Atikokan Atikokan America/Whitehorse Yukon (Whitehorse) America/S wift_Current Swift Current America/St_Johns Newfoundland (St Johns) America/Iqaluit Iqaluit America/Blanc-Sablon Blanc-Sablon America/Glace_Bay Glace Bay America/Yellowknife Yellowknife America/Inuvik Inuvik America/Dawson Dawson America/Rainy_River Rainy River America/Pangnirtung Pangnirtung America/Nipigon Nipigon America/Toronto Eastern (Toronto) America/Montreal Montreal America/Moncton Moncton America/Edmon ton Mountain (Edmonton) America/Cambridge_Bay Cambridge Bay America/Winnipeg Central (Winnipeg) America/Vancouver Pacific (Vancouver) America/Halifax Atlantic (Halifax) Central and South America America/La_Paz Atlantic/Stanley Stanley America/Montevideo Uruguay America/Martinique Martinique America/Managua Managua America/La_Paz La Paz America/Grenada Grenada America/Cayman Cayman Islands America/Caracas Caracas America/Anguilla Anguilla America/St_Lucia Saint Lucia America/Costa_Rica Costa Rica America/Havana Havana America/Aruba Aruba America/St_Thomas St Thomas America/Port-au-Prince Port-au-Prince America/Guyana Guyana America/Guatemala Guatemala America/El_Salvador El Salvador America/Dominica Dominica America/Paramaribo Paramaribo America/Panama Panama America/Guayaquil Guayaquil America/Grand_Turk Grand Turk America/Bogota Bogota America/Belize Belize America/St_Vincent St Vincent America/St_Kitts Saint Kitts and Nevis America/Curacao Curacao Pacific/Galapagos Galapagos America/Puerto_Rico Puerto Rico America/Montserrat Montserrat America/Jamaica Jamaica America/Barbados Barbados America/Antigua Antigua America/Nassau Nassau America/Asuncion Asuncion Pacific/Easter Easter Island America/Tegucigalpa Tegucigalpa America/Lima Lima America/Guadeloupe Guadeloupe America/Tortola Tortola America/Santo_Domingo Santo Domingo America/Santiago Chile Continental America/Port_of_Spain Port of Spain America/Cayenne Cayenne Etc Etc/GMT Etc/Zulu Zulu Etc/UTC UTC Etc/Greenwich Greenwich Etc/GMT-9 GMT-9 Etc/GMT-14 GMT-14 Etc/GMT +7 GMT+7 Etc/UCT UCT Etc/GMT-0 GMT-0 Etc/GMT+8 GMT+8 Etc/GMT-1 GMT-1 Etc/GMT+9 GMT+9 Etc/GMT-2 GMT-2 Etc/GMT+0 GMT+0 Etc/GMT-3 GMT-3 Etc/GMT+10 GMT+10 Etc/GMT+1 GMT+1 Etc/GMT-4 GMT-4 Etc/GMT+2 GMT+2 Etc/GMT+11 GMT+11 Etc/Universal Universal Etc/GMT0 GMT0 Etc/GMT-5 GMT-5 Etc/GMT-10 GMT-10 Etc/GMT+3 GMT+3 Etc/GMT+12 GMT+12 Etc/GMT-6 GMT-6 Etc/GMT-11 GMT-11 Etc/GMT+4 GMT+4 Etc/GMT-7 GMT-7 Etc/GMT-12 GMT-12 Etc/GMT+5 GMT+5 Etc/GMT-8 GMT-8 Etc/GMT-13 GMT-13 Etc/GMT+6 GMT+6 Etc/GMT GMT Europe Europe/Prague Europe/Uzhgorod Uzhgorod Europe/Moscow Russia (Moscow) Europe/Jersey Je rsey Europe/Brussels Belgium Europe/Amsterdam Netherlands America/Miquelon Miquelon Europe/Zaporozhye Ukraine (Zaporozhye) Europe/Paris France Europe/Oslo Norway Europe/Malta Malta Europe/Helsinki Finland Europe/Athens Greece Atlantic/Canary Canary Islands Europe/Skopje Macedonia Europe/Monaco Monaco Atlantic/Reykjavik Iceland Europe/San_Marino San Marino Europe/Rome Ital y Europe/Lisbon Portugal Europe/Istanbul Turkey Europe/Dublin Ireland Europe/Bratislava Slovakia Europe/Berlin Germany Europe/Madrid Spain Europe/Isle_of_Man Isle of Man Europe/Guernsey Guernsey Europe/Copenhagen Denmark Europe/Zurich Switzerland Europe/Zagreb Croatia Europe/Tallinn Estonia Europe/Kiev Ukraine (Kiev) Europe/Warsaw Poland Europe/Vilnius Lithuania Europe/Vatican Vatican Europe/Prague Czech Republic Europe/Mariehamn Aaland Islands Europe/Kaliningrad Russia (Kaliningrad) Europe/Gibraltar Gibraltar Europe/Belgrade Serbia Europe/Vienna Austria Europe/Vaduz Liechtenstein Europe/Luxembourg Luxembourg Europe/Ljubljana Slovenia Europe/Andorra Andorra Atlantic/Azores Azores Europe/Simferopol Ukraine (Simferopol) Europe/Minsk Belarus Europe/Lo ndon United Kingdom Europe/Bucharest Romania Europe/Volgograd Russia (Volgograd) Europe/Tirane Albania Europe/Stockholm Sweden Europe/Sofia Bulgaria Europe/Sarajevo Bosnia & Herzegovina Europe/Samara Russia (Samara) Europe/Riga Latvia Europe/Podgorica Montenegro Europe/Chisinau Moldova Europe/Budapest Hungary Global America/Godthab NZ NZ GMT+0 GMT+0 GMT0 GMT0 Antarctica/Syowa Antarctica (Syowa) Antarctica/Mawson Antarctica (Mawson) Navajo Navajo MST MST GMT GMT CST6CDT CST6CDT Arctic/Longyearbyen Arctic Longyearbyen Universal Universal UTC UTC Antarctica/Casey Antarctica (Casey) PST8PDT PST8PDT NZ-CHAT NZ-CHAT America/Thule Greenland (Thule) America/Godthab Greenland (Nuuk) Zulu Zulu WET WET W-SU W-SU UCT UCT MET MET Greenwich Greenwich EST EST America/Scoresbysund Greenland (Scoresbysund) CET CET Antarctica/Vostok Antarctica (Vostok) Antarctica/South_Pole Antarctica (South Pole) Antarctica/Rothera Antarctica (Rothera) Antarctica/Palmer Antarctica (Palmer) Antarctica/McMurdo Antarctica (McMurdo) MST7MDT MST7MDT HST HST EET< /id> EET Antarctica/DumontDUrville Antarctica (DumontDUrville) Antarctica/Davis Antarctica (Davis) America/Danmarkshavn Greenland (Danmarkshavn) GMT-0 GMT-0 EST5EDT EST5EDT Indian Ocean Indian/Maldives Indian/Maldives Maldives Indian/Mauritius Mauritius Indian/Reunion Reunion Indian/Comoro Comoro Indian/Cocos Cocos Islands Indian/Mayotte Mayotte Indian/Mahe Mahe Indian/Chagos Chagos Indian/Kerguelen Kerguelen Indian/Christmas Christmas Island Mexico America/Mexico_City America/Cancun Cancun America/Mazatlan Mazatlan America/Hermosillo Hermosillo America/Merida Merida America/Monterrey Monterrey America/Chihuahua Chihuahua America/Mexico_City Mexico City America/Tijuana Tijuana Pacific Pacific/Tahiti Pacific/Port_Moresby Port_Moresby Pacific/Palau Palau Pacific/Nauru Nauru Pacific/Guam Guam Pacific/Efate Efate Pacific/Gambier Gambier Pacific/Funafuti Funafuti Pacific/Fiji Fiji Pacific/Kosrae Kosrae Pacific/Chatham Chatham Pacific/Apia Apia Pacific/Wake Wake Pacific/Pago_Pago Samoa Pacific/Wallis Wallis Pacific/Ponape Pohnpei Pacific/Auckland New Zealand Pacific/Tongatapu Tongatapu Pacific/Tarawa Tarawa Pacific/Kiritimati Kiritimati Pacific/Guadalcanal Guadalcanal Pacific/Truk Chuuk Pacific/Midway Midway Pacific/Majuro Majuro Pacific/Kwajalein Kwajalein Pacific/Rarotonga Rarotonga Pacific/Noumea Noumea Pacific/Norfolk Norfolk Pacific/Niue Niue Pacific/Enderbury Enderbury Pacific/Tahiti Tahiti Pacific/Pitcairn Pitcairn Pacific/Saipan Saip an Pacific/Marquesas Marquesas Pacific/Johnston Johnston Pacific/Fakaofo Fakaofo Pacific/Dili Dili Russia Asia/Novosibirsk Europe/Moscow Moscow Asia/Yekaterinburg Yekaterinburg Asia/Sakhalin Sakhalin Asia/Kamchatka Kamchatka Asia/Irkutsk Irkutsk Asia/Yakutsk Yakutsk Asia/Vladivostok Vladivostok Asia/Anadyr Anadyr Asia/Omsk Omsk Europe/Kaliningr ad Kaliningrad Asia/Novosibirsk Novosibirsk Asia/Krasnoyarsk Krasnoyarsk Asia/Magadan Magadan Europe/Volgograd Volgograd Europe/Samara Samara USA America/Chicago Pacific/Honolulu Hawaii (Honolulu) America/Chicago Central (Chicago) America/Anchorage Alaska (Anchorage) America/Kentucky/Monticello Kentucky (Monticello) America/Juneau Juneau America/Indiana/Petersburg Indiana (Petersburg) America/Indiana/Indianapolis id> East Indiana (Indianapolis) America/Shiprock Shiprock America/Los_Angeles Pacific (Los Angeles) America/Indiana/Marengo Indiana (Marengo) Pacific/Pago_Pago Samoa (Pago Pago) America/St_Thomas Virgin Islands (St Thomas) America/North_Dakota/New_Salem North Dakota (New Salem) America/Indiana/Vevay Indiana (Vevay) America/Denver Mountain (Denver) America/Menominee Menominee America/Indiana/Winamac Indiana (Winamac) America/Boise Boise < timezone> America/Phoenix Arizona (Phoenix) America/Indiana/Vincennes Indiana (Vincennes) America/Adak Aleutian (Adak) America/New_York Eastern (New York) America/Detroit Michigan (Detroit) America/Puerto_Rico Puerto Rico America/Nome Nome America/Kentucky/Louisville Kentucky (Louisville) America/Yakutat Yakutat America/North_Dakota/Center North Dakota (Center) America/Indiana/Knox Indiana Starke (Knox) America/Indiana/Tell_City Indiana (Tell City) systemtime_test_datepicker - - -- -
- - diff --git a/webclient/test/ui/src/systemtime_test_login.xml b/webclient/test/ui/src/systemtime_test_login.xml index bd804fb..6ec1f78 100644 --- a/webclient/test/ui/src/systemtime_test_login.xml +++ b/webclient/test/ui/src/systemtime_test_login.xml @@ -13,18 +13,18 @@- - systemtime_test_datepicker - -open -/systemtime -- - -click -date_date -- - -assertElementPresent -xpath=//div[@id="ui-datepicker-div"] -- - - -assertElementPresent -css=div#ui-datepicker-div -- open -/hosts +/systemtime clickAndWait -link=localhost +link=dummy-host type login -webyast_guest +webyast type diff --git a/webclient/test/ui/src/systemtime_test_lookat.xml b/webclient/test/ui/src/systemtime_test_lookat.xml index 4f56d47..0f3db07 100644 --- a/webclient/test/ui/src/systemtime_test_lookat.xml +++ b/webclient/test/ui/src/systemtime_test_lookat.xml @@ -13,27 +13,42 @@open -/controlpanel +/systemtime - +clickAndWait -link=Configure Time +assertElementPresent +currenttime ++ + assertElementPresent +utc - assertTextPresent -exact:Region: +click +date_date - assertTextPresent -exact:Timezone: +assertElementPresent +xpath=//div[@id="ui-datepicker-div"] - +assertTextPresent -Hardware clock is set to UTC +assertElementPresent +css=div#ui-datepicker-div ++ + +click +link=21 ++ + diff --git a/webclient/test/ui/src/systemtime_testsuite.xml b/webclient/test/ui/src/systemtime_testsuite.xml index 05113e6..c0b26dc 100644 --- a/webclient/test/ui/src/systemtime_testsuite.xml +++ b/webclient/test/ui/src/systemtime_testsuite.xml @@ -10,7 +10,6 @@clickAndWait +//a[contains(@href, '/logout')] Test Suite systemtime_test_login - systemtime_test_lookat systemtime_test_datepicker