More renaming. Hopefully fixed version number.
This commit is contained in:
@ -17,9 +17,9 @@ testLogger = Gio.DBusProxy.new_for_bus_sync(
|
||||
Gio.BusType.SESSION,
|
||||
Gio.DBusProxyFlags.NONE,
|
||||
None,
|
||||
'org.gnome.Orca',
|
||||
'/org/gnome/Orca',
|
||||
'org.gnome.Orca.Logger',
|
||||
'org.gnome.Cthulhu',
|
||||
'/org/gnome/Cthulhu',
|
||||
'org.gnome.Cthulhu.Logger',
|
||||
None)
|
||||
|
||||
enable_assert = \
|
||||
@ -53,7 +53,7 @@ def setClipboardText(text):
|
||||
clipboard.set_text(text, -1)
|
||||
|
||||
class StartRecordingAction(AtomicAction):
|
||||
'''Tells Orca to log speech and braille output to a string which we
|
||||
'''Tells Cthulhu to log speech and braille output to a string which we
|
||||
can later obtain and use in an assertion (see AssertPresentationAction)'''
|
||||
|
||||
def __init__(self):
|
||||
@ -68,13 +68,13 @@ class StartRecordingAction(AtomicAction):
|
||||
def __str__(self):
|
||||
return 'Start Recording Action'
|
||||
|
||||
def assertListEquality(rawOrcaResults, expectedList):
|
||||
'''Convert raw speech and braille output obtained from Orca into a
|
||||
def assertListEquality(rawCthulhuResults, expectedList):
|
||||
'''Convert raw speech and braille output obtained from Cthulhu into a
|
||||
list by splitting it at newline boundaries. Compare it to the
|
||||
list passed in and return the actual results if they differ.
|
||||
Otherwise, return None to indicate an equality.'''
|
||||
|
||||
results = rawOrcaResults.strip().split("\n")
|
||||
results = rawCthulhuResults.strip().split("\n")
|
||||
|
||||
# Shoot for a string comparison first.
|
||||
#
|
||||
@ -98,7 +98,7 @@ def assertListEquality(rawOrcaResults, expectedList):
|
||||
return None
|
||||
|
||||
class AssertPresentationAction(AtomicAction):
|
||||
'''Ask Orca for the speech and braille logged since the last use
|
||||
'''Ask Cthulhu for the speech and braille logged since the last use
|
||||
of StartRecordingAction and apply an assertion predicate.'''
|
||||
|
||||
totalCount = 0
|
||||
@ -114,7 +114,7 @@ class AssertPresentationAction(AtomicAction):
|
||||
assertionPredicate: method to compare actual results to expected
|
||||
results
|
||||
'''
|
||||
# [[[WDW: the pause is to wait for Orca to process an event.
|
||||
# [[[WDW: the pause is to wait for Cthulhu to process an event.
|
||||
# Probably should think of a better way to do this.]]]
|
||||
#
|
||||
if enable_assert:
|
||||
|
Reference in New Issue
Block a user