2008-08-21 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/upstream/at-spi2-core.git] / tests / pyatspi / accessibletest.py

diff --git a/tests/pyatspi/accessibletest.py b/tests/pyatspi/accessibletest.py
index 3aa4ca3..29d3aa2 100644 (file)
--- a/tests/pyatspi/accessibletest.py
+++ b/tests/pyatspi/accessibletest.py
@@ -48,14 +48,15 @@ class AccessibleTest(_PasyTest):
                self._path = path
 
        def setup(self, test):
-               self._cache = pyatspi.TestApplicationCache(self._bus, self._path)
+               self._registry = pyatspi.registry.Registry(self._path)
+               self._desktop = self._registry.getDesktop(0)
 
        def test_name(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                test.assertEqual(root.name, "main", "Expected name - \"main\". Recieved - \"%s\"" % (root.name,))
 
        def test_getChildAtIndex(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                a = root.getChildAtIndex(0)
                test.assertEqual(a.name, "gnome-settings-daemon",
                                         "Expected name - \"gnome-settings-daemon\". Recieved - \"%s\"" % (a.name,))
@@ -67,7 +68,7 @@ class AccessibleTest(_PasyTest):
                                         "Expected name - \"nautilus\". Recieved - \"%s\"" % (c.name,))
                
        def test_isEqual(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
 
                a = root.getChildAtIndex(1)
                if not a.isEqual(a):
@@ -86,7 +87,7 @@ class AccessibleTest(_PasyTest):
                        test.fail("Different accessibles found equal")
 
        def test_getApplication(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                application = root.getApplication()
                if not root.isEqual(application):
                        test.fail("Root accessible does not provide itself as its Application")
@@ -98,12 +99,12 @@ class AccessibleTest(_PasyTest):
 
 
        def test_getAttributes(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                #TODO The AttributeSet test needs expanding. Check attributes are passed correctly.
                attr = root.getAttributes()
 
        def test_parent(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
 
                a = root.getChildAtIndex(1)
                pa = a.parent
@@ -111,14 +112,14 @@ class AccessibleTest(_PasyTest):
                        test.fail("Child does not correctly report its parent")
 
        def test_getIndexInParent(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
 
                for i in range(0, root.childCount):
                        child = root.getChildAtIndex(i)
                        test.assertEqual(i, child.getIndexInParent(), "Childs index in parent reported incorrectly")
 
        def test_getLocalizedRoleName(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
 
                ans = "window"
                res = root.getLocalizedRoleName()
@@ -133,17 +134,17 @@ class AccessibleTest(_PasyTest):
                                 "Expected LocalizedRoleName - \"%s\". Recieved - \"%s\"" % (ans, res,))
 
        def test_getRelationSet(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                # Complete test of Relation interface is separate
                rset = root.getRelationSet()
 
        def test_getRole(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                test.assertEqual(root.getRole(), 69,
                                 "Expected role - \"69\". Recieved - \"%d\"" % (root.getRole(),))
 
        def test_getRoleName(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
 
                ans = "window"
                res = root.getRoleName()
@@ -159,17 +160,17 @@ class AccessibleTest(_PasyTest):
 
        def test_getState(self, test):
                # Complete test of StateSet interface is separate
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                state = root.getState()
                list = state.getStates()
 
        def test_childCount(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                test.assertEqual(root.childCount, 11,
                                 "Expected role - \"11\". Recieved - \"%d\"" % (root.childCount,))
 
        def test_description(self, test):
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
                description = "The main accessible object, root of the accessible tree"
                test.assertEqual(root.description, description,
                                 "Expected description - \"%s\". Recieved - \"%s\"" % (description, root.description,))
@@ -189,7 +190,7 @@ class AccessibleTest(_PasyTest):
                It checks a tree of these values is correctly
                passed from Application to AT.
                """
-               root = self._cache.root
+               root = self._desktop.getChildAtIndex(0)
 
                doc = minidom.Document()
                _createNode(root, doc)