From b3f2b45dfd71304dfd6ac8a705b3015d8f27a3d5 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha-pgp@silbe.org>
Date: Mon, 29 Jul 2013 15:29:07 +0000
Subject: tests: Adapt to API changes (native API)

Commit 23164d7f changed the native API to pass paths as byte strings
so that non-UTF8 paths can be passed. Adjust the test cases
accordingly.
---
diff --git a/tests/native_api_v1.txt b/tests/native_api_v1.txt
index 4eee755..1801986 100644
--- a/tests/native_api_v1.txt
+++ b/tests/native_api_v1.txt
@@ -52,11 +52,11 @@ Check everything is there:
 ...  {u'title': 'DS test object 2', u'activity': 'org.sugarlabs.DataStoreTest2'},
 ...  {u'title': 'DS test object 3', u'activity': 'org.sugarlabs.DataStoreTest2'}]
 >>> ds.get_data_path(*o1_oid, byte_arrays=True)
-dbus.String(u'')
+dbus.ByteArray('')
 >>> ds.get_data_path(*o2_oid, byte_arrays=True)
-dbus.String(u'')
+dbus.ByteArray('')
 >>> ds.get_data_path(*o3_oid, byte_arrays=True)
-dbus.String(u'')
+dbus.ByteArray('')
 
 
 Change some metadata without creating a new version:
@@ -129,7 +129,7 @@ You can also pass the data as a file descriptor, useful for streaming:
 
 
 Retrieve and verify the entry with content:
->>> dog_retrieved = ds.get_data_path(*dog_oid)
+>>> dog_retrieved = ds.get_data_path(*dog_oid, byte_arrays=True).decode('utf-8')
 >>> assert(file(dog_retrieved).read() == dog_content)
 >>> os.remove(dog_retrieved)
 
@@ -154,12 +154,12 @@ Update the entry content by passing a file descriptor:
 
 
 Verify updated content:
->>> dog_retrieved = ds.get_data_path(dog_oid[0], dog_updated_version_id)
+>>> dog_retrieved = ds.get_data_path(dog_oid[0], dog_updated_version_id, byte_arrays=True).decode('utf-8')
 >>> assert(file(dog_retrieved).read() == dog_content_2)
 >>> os.remove(dog_retrieved)
 
 
 Verify old content is still accessible:
->>> dog_retrieved = ds.get_data_path(*dog_oid)
+>>> dog_retrieved = ds.get_data_path(*dog_oid, byte_arrays=True).decode('utf-8')
 >>> assert(file(dog_retrieved).read() == dog_content)
 >>> os.remove(dog_retrieved)
--
cgit v0.9.1