[gnome-code-assistance] [tests] Add get_object helper
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-code-assistance] [tests] Add get_object helper
- Date: Fri, 15 Nov 2013 00:07:06 +0000 (UTC)
commit 41402437320c0583279e36120aa1b494e055fc00
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Fri Nov 15 01:05:28 2013 +0100
[tests] Add get_object helper
tests/service | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/tests/service b/tests/service
index f9cca90..2595593 100755
--- a/tests/service
+++ b/tests/service
@@ -202,11 +202,11 @@ class ServiceTest:
@test('object')
def test_object(self, path):
- return self.bus.get_object(self.name, self.full_path(path))
+ return self.get_object(path)
@test('interface')
def test_interface(self, path, interface):
- obj = self.bus.get_object(self.name, self.full_path(path))
+ obj = self.get_object(path)
intro = dbus.Interface(obj, 'org.freedesktop.DBus.Introspectable')
xml = intro.Introspect()
@@ -269,7 +269,7 @@ class ServiceTest:
def test_diagnostics(self, d1, d2):
for i, v in enumerate(d1):
if i >= len(d2):
- raise ValueError("Expected diagnostic {0}".format(v))
+ raise ValueError("Expected diagnostic {0} (got {1} diagnostics instead of {2})".format(v,
len(d2), len(d1)))
self.assert_diagnostic(v, d2[i])
@@ -279,10 +279,9 @@ class ServiceTest:
def file_path(self, p):
return os.path.abspath(os.path.join(os.path.dirname(__file__), 'backends', p))
-
def run_parse(self, p):
path = p['path']
- obj = self.bus.get_object(self.name, self.path)
+ obj = self.get_object('/')
iface = dbus.Interface(obj, 'org.gnome.CodeAssist.v1.Service')
doc = iface.Parse(self.file_path(path), '', (0, 0), {})
@@ -307,8 +306,11 @@ class ServiceTest:
for k in docmap:
raise ValueError('Unexpected remote document {0}'.format(k))
+ def get_object(self, path):
+ return self.bus.get_object(self.name, self.full_path(path))
+
def run_parse_all(self, p):
- obj = self.bus.get_object(self.name, self.path)
+ obj = self.get_object('/')
path = self.file_path(p['path'])
docs = [gcatypes.OpenDocument(self.file_path(d)) for d in p['documents']]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]