Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tests/units/client
diff options
context:
space:
mode:
Diffstat (limited to 'tests/units/client')
-rwxr-xr-xtests/units/client/journal.py18
-rwxr-xr-xtests/units/client/offline_routes.py49
-rwxr-xr-xtests/units/client/online_routes.py49
-rwxr-xr-xtests/units/client/server_routes.py50
4 files changed, 115 insertions, 51 deletions
diff --git a/tests/units/client/journal.py b/tests/units/client/journal.py
index fd36a2a..30c67f8 100755
--- a/tests/units/client/journal.py
+++ b/tests/units/client/journal.py
@@ -107,32 +107,32 @@ class JournalTest(tests.Test):
request.path = ['journal']
response = Response()
self.assertEqual([
- {'guid': 'guid1', 'title': 'title1', 'description': 'description1', 'preview': url + 'guid1/preview'},
- {'guid': 'guid2', 'title': 'title2', 'description': 'description2', 'preview': url + 'guid2/preview'},
- {'guid': 'guid3', 'title': 'title3', 'description': 'description3', 'preview': url + 'guid3/preview'},
+ {'guid': 'guid1', 'title': 'title1', 'description': 'description1', 'preview': {'url': url + 'guid1/preview'}},
+ {'guid': 'guid2', 'title': 'title2', 'description': 'description2', 'preview': {'url': url + 'guid2/preview'}},
+ {'guid': 'guid3', 'title': 'title3', 'description': 'description3', 'preview': {'url': url + 'guid3/preview'}},
],
ds.journal_find(request, response)['result'])
request = Request(offset=1, limit=1, reply=['uid', 'title', 'description', 'preview'])
request.path = ['journal']
self.assertEqual([
- {'guid': 'guid2', 'title': 'title2', 'description': 'description2', 'preview': url + 'guid2/preview'},
+ {'guid': 'guid2', 'title': 'title2', 'description': 'description2', 'preview': {'url': url + 'guid2/preview'}},
],
ds.journal_find(request, response)['result'])
request = Request(query='title3', reply=['uid', 'title', 'description', 'preview'])
request.path = ['journal']
self.assertEqual([
- {'guid': 'guid3', 'title': 'title3', 'description': 'description3', 'preview': url + 'guid3/preview'},
+ {'guid': 'guid3', 'title': 'title3', 'description': 'description3', 'preview': {'url': url + 'guid3/preview'}},
],
ds.journal_find(request, response)['result'])
request = Request(order_by=['+title'], reply=['uid', 'title', 'description', 'preview'])
request.path = ['journal']
self.assertEqual([
- {'guid': 'guid3', 'title': 'title3', 'description': 'description3', 'preview': url + 'guid3/preview'},
- {'guid': 'guid2', 'title': 'title2', 'description': 'description2', 'preview': url + 'guid2/preview'},
- {'guid': 'guid1', 'title': 'title1', 'description': 'description1', 'preview': url + 'guid1/preview'},
+ {'guid': 'guid3', 'title': 'title3', 'description': 'description3', 'preview': {'url': url + 'guid3/preview'}},
+ {'guid': 'guid2', 'title': 'title2', 'description': 'description2', 'preview': {'url': url + 'guid2/preview'}},
+ {'guid': 'guid1', 'title': 'title1', 'description': 'description1', 'preview': {'url': url + 'guid1/preview'}},
],
ds.journal_find(request, response)['result'])
@@ -146,7 +146,7 @@ class JournalTest(tests.Test):
request.path = ['journal', 'guid1']
response = Response()
self.assertEqual(
- {'guid': 'guid1', 'title': 'title1', 'description': 'description1', 'preview': url + 'guid1/preview'},
+ {'guid': 'guid1', 'title': 'title1', 'description': 'description1', 'preview': {'url': url + 'guid1/preview'}},
ds.journal_get(request, response))
def test_GetPropRequest(self):
diff --git a/tests/units/client/offline_routes.py b/tests/units/client/offline_routes.py
index a163769..866e5d9 100755
--- a/tests/units/client/offline_routes.py
+++ b/tests/units/client/offline_routes.py
@@ -146,27 +146,48 @@ class OfflineRoutes(tests.Test):
'summary': 'summary',
'description': 'description',
})
- ipc.request('PUT', ['context', guid, 'preview'], 'image')
+ blob = 'preview_blob'
+ ipc.request('PUT', ['context', guid, 'preview'], blob)
self.assertEqual(
- 'image',
+ blob,
ipc.request('GET', ['context', guid, 'preview']).content)
- self.assertEqual(
- {'preview': 'http://127.0.0.1:5555/context/%s/preview' % guid},
- ipc.get(['context', guid], reply=['preview']))
- self.assertEqual(
- [{'preview': 'http://127.0.0.1:5555/context/%s/preview' % guid}],
- ipc.get(['context'], reply=['preview'])['result'])
+ self.assertEqual({
+ 'preview': {
+ 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+ 'blob_size': len(blob),
+ 'digest': hashlib.sha1(blob).hexdigest(),
+ 'mime_type': 'image/png',
+ },
+ },
+ ipc.get(['context', guid], reply=['preview']))
+ self.assertEqual([{
+ 'preview': {
+ 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+ 'blob_size': len(blob),
+ 'digest': hashlib.sha1(blob).hexdigest(),
+ 'mime_type': 'image/png',
+ },
+ }],
+ ipc.get(['context'], reply=['preview'])['result'])
self.assertEqual(
file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(),
ipc.request('GET', ['context', guid, 'icon']).content)
- self.assertEqual(
- {'icon': 'http://127.0.0.1:5555/static/images/package.png'},
- ipc.get(['context', guid], reply=['icon']))
- self.assertEqual(
- [{'icon': 'http://127.0.0.1:5555/static/images/package.png'}],
- ipc.get(['context'], reply=['icon'])['result'])
+ self.assertEqual({
+ 'icon': {
+ 'url': 'http://127.0.0.1:5555/static/images/package.png',
+ 'mime_type': 'image/png',
+ },
+ },
+ ipc.get(['context', guid], reply=['icon']))
+ self.assertEqual([{
+ 'icon': {
+ 'url': 'http://127.0.0.1:5555/static/images/package.png',
+ 'mime_type': 'image/png',
+ },
+ }],
+ ipc.get(['context'], reply=['icon'])['result'])
def test_favorite(self):
ipc = self.start_offline_client()
diff --git a/tests/units/client/online_routes.py b/tests/units/client/online_routes.py
index ddf8a4c..064a9bb 100755
--- a/tests/units/client/online_routes.py
+++ b/tests/units/client/online_routes.py
@@ -233,27 +233,48 @@ class OnlineRoutes(tests.Test):
'summary': 'summary',
'description': 'description',
})
- ipc.request('PUT', ['context', guid, 'preview'], 'image')
+ blob = 'preview_blob'
+ ipc.request('PUT', ['context', guid, 'preview'], blob, headers={'content-type': 'image/png'})
self.assertEqual(
- 'image',
+ blob,
ipc.request('GET', ['context', guid, 'preview']).content)
- self.assertEqual(
- {'preview': 'http://127.0.0.1:8888/context/%s/preview' % guid},
- ipc.get(['context', guid], reply=['preview']))
- self.assertEqual(
- [{'preview': 'http://127.0.0.1:8888/context/%s/preview' % guid}],
- ipc.get(['context'], reply=['preview'])['result'])
+ self.assertEqual({
+ 'preview': {
+ 'url': 'http://127.0.0.1:8888/context/%s/preview' % guid,
+ 'blob_size': len(blob),
+ 'digest': hashlib.sha1(blob).hexdigest(),
+ 'mime_type': 'image/png',
+ },
+ },
+ ipc.get(['context', guid], reply=['preview']))
+ self.assertEqual([{
+ 'preview': {
+ 'url': 'http://127.0.0.1:8888/context/%s/preview' % guid,
+ 'blob_size': len(blob),
+ 'digest': hashlib.sha1(blob).hexdigest(),
+ 'mime_type': 'image/png',
+ },
+ }],
+ ipc.get(['context'], reply=['preview'])['result'])
self.assertEqual(
file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(),
ipc.request('GET', ['context', guid, 'icon']).content)
- self.assertEqual(
- {'icon': 'http://127.0.0.1:8888/static/images/package.png'},
- ipc.get(['context', guid], reply=['icon']))
- self.assertEqual(
- [{'icon': 'http://127.0.0.1:8888/static/images/package.png'}],
- ipc.get(['context'], reply=['icon'])['result'])
+ self.assertEqual({
+ 'icon': {
+ 'url': 'http://127.0.0.1:8888/static/images/package.png',
+ 'mime_type': 'image/png',
+ },
+ },
+ ipc.get(['context', guid], reply=['icon']))
+ self.assertEqual([{
+ 'icon': {
+ 'url': 'http://127.0.0.1:8888/static/images/package.png',
+ 'mime_type': 'image/png',
+ },
+ }],
+ ipc.get(['context'], reply=['icon'])['result'])
def test_favorite(self):
local = self.start_online_client()
diff --git a/tests/units/client/server_routes.py b/tests/units/client/server_routes.py
index 47282ce..6bbb955 100755
--- a/tests/units/client/server_routes.py
+++ b/tests/units/client/server_routes.py
@@ -3,6 +3,7 @@
import os
import shutil
+import hashlib
from os.path import exists
from __init__ import tests, src_root
@@ -129,27 +130,48 @@ class ServerRoutesTest(tests.Test):
'summary': 'summary',
'description': 'description',
})
- ipc.request('PUT', ['context', guid, 'preview'], 'image')
+ blob = 'preview_blob'
+ ipc.request('PUT', ['context', guid, 'preview'], blob)
self.assertEqual(
- 'image',
+ blob,
ipc.request('GET', ['context', guid, 'preview']).content)
- self.assertEqual(
- {'preview': 'http://127.0.0.1:5555/context/%s/preview' % guid},
- ipc.get(['context', guid], reply=['preview']))
- self.assertEqual(
- [{'preview': 'http://127.0.0.1:5555/context/%s/preview' % guid}],
- ipc.get(['context'], reply=['preview'])['result'])
+ self.assertEqual({
+ 'preview': {
+ 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+ 'blob_size': len(blob),
+ 'digest': hashlib.sha1(blob).hexdigest(),
+ 'mime_type': 'image/png',
+ },
+ },
+ ipc.get(['context', guid], reply=['preview']))
+ self.assertEqual([{
+ 'preview': {
+ 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid,
+ 'blob_size': len(blob),
+ 'digest': hashlib.sha1(blob).hexdigest(),
+ 'mime_type': 'image/png',
+ },
+ }],
+ ipc.get(['context'], reply=['preview'])['result'])
self.assertEqual(
file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(),
ipc.request('GET', ['context', guid, 'icon']).content)
- self.assertEqual(
- {'icon': 'http://127.0.0.1:5555/static/images/package.png'},
- ipc.get(['context', guid], reply=['icon']))
- self.assertEqual(
- [{'icon': 'http://127.0.0.1:5555/static/images/package.png'}],
- ipc.get(['context'], reply=['icon'])['result'])
+ self.assertEqual({
+ 'icon': {
+ 'url': 'http://127.0.0.1:5555/static/images/package.png',
+ 'mime_type': 'image/png',
+ },
+ },
+ ipc.get(['context', guid], reply=['icon']))
+ self.assertEqual([{
+ 'icon': {
+ 'url': 'http://127.0.0.1:5555/static/images/package.png',
+ 'mime_type': 'image/png',
+ },
+ }],
+ ipc.get(['context'], reply=['icon'])['result'])
def test_PopulateNode(self):
os.makedirs('disk/sugar-network')
generated by cgit v0.9.1 at 2024-05-26 11:22:36 (GMT)