[gnome-software] tests: Details page - fixed

[Kalev Lember <klember src gnome org>]

commit 6edcedc7b41641a908c71f42d88a8dea096bbdf2
Author: Martin Simon <martiin siimon gmail com>
Date:   Wed Jun 4 21:22:33 2014 +0200

    tests: Details page - fixed
    
    The searched app was changed to geary. Also ugly states accesses was
    changed to attributes doing the same work.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=725219

 tests/basic.py |  165 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 85 insertions(+), 80 deletions(-)
---
diff --git a/tests/basic.py b/tests/basic.py
index 97461ff..89d7536 100755
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -21,7 +21,8 @@ from dogtail.procedural import *
 try:
     run('gnome-software')
 
-    app = root.application('org.gnome.Software')
+    app_name = 'org.gnome.Software'
+    app = root.application(app_name)
 
     all_button = app.child('All')
     installed_button = app.child('Installed')
@@ -36,105 +37,109 @@ try:
     search_page = app.child('Search page')
     details_page = app.child('Details page')
 
-    website_details_button = details_page.child(roleName='push button', name='Website')
-    history_details_button = details_page.child(roleName='push button', name='History')
-    launch_details_button = details_page.child(roleName='push button', name='Launch')
-
     search_page_listbox = search_page.child(roleName='list box')
 
     all_button.click()
-    assert (all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
+    assert (all_button.checked)
+    assert (not installed_button.checked)
+    assert (not updates_button.checked)
+    assert (overview_page.showing)
+    assert (not installed_page.showing)
+    assert (not updates_page.showing)
+    assert (not search_page.showing)
 
     installed_button.click()
-    assert (not all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
+    assert (not all_button.checked)
+    assert (installed_button.checked)
+    assert (not updates_button.checked)
+    assert (not overview_page.showing)
+    assert (installed_page.showing)
+    assert (not updates_page.showing)
+    assert (not search_page.showing)
 
     updates_button.click()
-    assert (not all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
+    assert (not all_button.checked)
+    assert (not installed_button.checked)
+    assert (updates_button.checked)
+    assert (not overview_page.showing)
+    assert (not installed_page.showing)
+    assert (updates_page.showing)
+    assert (not search_page.showing)
 
     installed_button.click()
-    assert (not all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
+    assert (not all_button.checked)
+    assert (installed_button.checked)
+    assert (not updates_button.checked)
+    assert (not overview_page.showing)
+    assert (installed_page.showing)
+    assert (not updates_page.showing)
+    assert (not search_page.showing)
 
     all_button.click()
-    assert (all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
-
-    type("gimp\n")
+    assert (all_button.checked)
+    assert (not installed_button.checked)
+    assert (not updates_button.checked)
+    assert (overview_page.showing)
+    assert (not installed_page.showing)
+    assert (not updates_page.showing)
+    assert (not search_page.showing)
+
+    type("geary\n")
     doDelay(2)
-    assert (not all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (search_page.getState().contains(pyatspi.STATE_SHOWING))
+    assert (not all_button.checked)
+    assert (not installed_button.checked)
+    assert (not updates_button.checked)
+    assert (not overview_page.showing)
+    assert (not installed_page.showing)
+    assert (not updates_page.showing)
+    assert (search_page.showing)
 
     """Details page test section"""
-    search_page_listbox.child(roleName='label', name='GNU Image Manipulation Program').click()
+    search_page_listbox.child(roleName='label', name='Geary').click()
     doDelay(4)
-    assert (not overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (details_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (install_button.getState().contains(pyatspi.STATE_SHOWING) or 
remove_button.getState().contains(pyatspi.STATE_SHOWING))
-    assert (back_button.getState().contains(pyatspi.STATE_SHOWING))
-    assert (website_details_button.getState().contains(pyatspi.STATE_VISIBLE))
-    assert (history_details_button.getState().contains(pyatspi.STATE_VISIBLE))
-
-    if install_button.getState().contains(pyatspi.STATE_SHOWING):
-        assert (not launch_details_button.getState().contains(pyatspi.STATE_VISIBLE))
+    assert (not overview_page.showing)
+    assert (not installed_page.showing)
+    assert (not updates_page.showing)
+    assert (not search_page.showing)
+    assert (details_page.showing)
+    assert (install_button.showing or remove_button.showing)
+    assert (back_button.showing)
+    assert (root.application(app_name).child('Details page')
+            .child(roleName='push button', name='History')
+            .states.contains(pyatspi.STATE_VISIBLE))
+    assert (root.application(app_name).child('Details page')
+            .child(roleName='push button', name='Website')
+            .states.contains(pyatspi.STATE_VISIBLE))
+
+    if install_button.showing:
+        assert (not root.application(app_name).child('Details page')
+                    .child(roleName='push button', name='Launch')
+                    .states.contains(pyatspi.STATE_VISIBLE))
     else:
-        assert (launch_details_button.getState().contains(pyatspi.STATE_VISIBLE))
+        assert (root.application(app_name).child('Details page')
+                .child(roleName='push button', name='Launch')
+                .states.contains(pyatspi.STATE_VISIBLE))
 
     back_button.click()
-    assert (not all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (search_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not install_button.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not remove_button.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not back_button.getState().contains(pyatspi.STATE_SHOWING))
+    assert (not all_button.checked)
+    assert (not installed_button.checked)
+    assert (not updates_button.checked)
+    assert (not overview_page.showing)
+    assert (not installed_page.showing)
+    assert (not updates_page.showing)
+    assert (search_page.showing)
+    assert (not install_button.showing)
+    assert (not remove_button.showing)
+    assert (not back_button.showing)
 
     keyCombo("Escape")
-    assert (all_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not installed_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (not updates_button.getState().contains(pyatspi.STATE_ARMED))
-    assert (overview_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not installed_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not updates_page.getState().contains(pyatspi.STATE_SHOWING))
-    assert (not search_page.getState().contains(pyatspi.STATE_SHOWING))
+    assert (all_button.checked)
+    assert (not installed_button.checked)
+    assert (not updates_button.checked)
+    assert (overview_page.showing)
+    assert (not installed_page.showing)
+    assert (not updates_page.showing)
+    assert (not search_page.showing)
 
     super_menu = root.application('gnome-shell').child(roleName='menu', name='Software')
     super_menu.click()