Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/integration/master_personal.py6
-rwxr-xr-xtests/integration/master_slave.py10
-rwxr-xr-xtests/integration/node_client.py2
-rwxr-xr-xtests/units/client/implementations.py4
-rwxr-xr-xtests/units/client/offline_routes.py8
-rwxr-xr-xtests/units/client/online_routes.py16
-rwxr-xr-xtests/units/client/server_routes.py8
-rwxr-xr-xtests/units/model/context.py17
-rwxr-xr-xtests/units/model/implementation.py2
-rwxr-xr-xtests/units/node/node.py4
10 files changed, 55 insertions, 22 deletions
diff --git a/tests/integration/master_personal.py b/tests/integration/master_personal.py
index 6c1dfed..82c66b2 100755
--- a/tests/integration/master_personal.py
+++ b/tests/integration/master_personal.py
@@ -77,6 +77,7 @@ class MasterPersonalTest(tests.Test):
'title': 'title_1',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview1',
'layer': 'pilot',
})
@@ -85,6 +86,7 @@ class MasterPersonalTest(tests.Test):
'title': 'title_2',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview2',
'layer': 'pilot',
})
@@ -95,6 +97,7 @@ class MasterPersonalTest(tests.Test):
'title': 'title_3',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview3',
'layer': 'pilot',
})
@@ -103,6 +106,7 @@ class MasterPersonalTest(tests.Test):
'title': 'title_4',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview4',
'layer': 'pilot',
})
@@ -129,6 +133,7 @@ class MasterPersonalTest(tests.Test):
'title': 'title_5',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview5',
'layer': 'pilot',
})
@@ -141,6 +146,7 @@ class MasterPersonalTest(tests.Test):
'title': 'title_6',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview6',
'layer': 'pilot',
})
diff --git a/tests/integration/master_slave.py b/tests/integration/master_slave.py
index f521a2b..9a870e3 100755
--- a/tests/integration/master_slave.py
+++ b/tests/integration/master_slave.py
@@ -65,6 +65,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title1',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview1',
'layer': 'pilot',
})
@@ -75,6 +76,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title2',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview2',
'layer': 'pilot',
})
@@ -115,6 +117,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title3',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview3',
'layer': 'pilot',
})
@@ -128,6 +131,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title4',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview4',
'layer': 'pilot',
})
@@ -187,6 +191,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title_1',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview1',
'layer': 'pilot',
})
@@ -195,6 +200,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title_2',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview2',
'layer': 'pilot',
})
@@ -205,6 +211,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title_3',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview3',
'layer': 'pilot',
})
@@ -213,6 +220,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title_4',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview4',
'layer': 'pilot',
})
@@ -237,6 +245,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title_5',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview5',
'layer': 'pilot',
})
@@ -249,6 +258,7 @@ class MasterSlaveTest(tests.Test):
'title': 'title_6',
'summary': 'summary',
'description': 'description',
+ 'artifact_icon': 'artifact_icon',
'preview': 'preview6',
'layer': 'pilot',
})
diff --git a/tests/integration/node_client.py b/tests/integration/node_client.py
index a44ce77..c4de2fb 100755
--- a/tests/integration/node_client.py
+++ b/tests/integration/node_client.py
@@ -75,7 +75,7 @@ class NodeClientTest(tests.Test):
def test_ReleaseContext(self):
context = self.cli(['POST', '/context'], stdin={
- 'type': 'content',
+ 'type': 'book',
'title': 'title',
'summary': 'summary',
'description': 'description',
diff --git a/tests/units/client/implementations.py b/tests/units/client/implementations.py
index 06902a0..b77c558 100755
--- a/tests/units/client/implementations.py
+++ b/tests/units/client/implementations.py
@@ -359,7 +359,7 @@ class Implementations(tests.Test):
conn.post(['context'], {
'guid': 'document',
- 'type': 'content',
+ 'type': 'book',
'title': 'title',
'summary': 'summary',
'description': 'description',
@@ -432,7 +432,7 @@ class Implementations(tests.Test):
conn.post(['context'], {
'guid': 'document',
- 'type': 'content',
+ 'type': 'book',
'title': 'title',
'summary': 'summary',
'description': 'description',
diff --git a/tests/units/client/offline_routes.py b/tests/units/client/offline_routes.py
index 2300b7a..a163769 100755
--- a/tests/units/client/offline_routes.py
+++ b/tests/units/client/offline_routes.py
@@ -141,7 +141,7 @@ class OfflineRoutes(tests.Test):
ipc = self.start_offline_client()
guid = ipc.post(['context'], {
- 'type': 'activity',
+ 'type': 'package',
'title': 'title',
'summary': 'summary',
'description': 'description',
@@ -159,13 +159,13 @@ class OfflineRoutes(tests.Test):
ipc.get(['context'], reply=['preview'])['result'])
self.assertEqual(
- file(src_root + '/sugar_network/static/httpdocs/images/missing.png').read(),
+ 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/missing.png'},
+ {'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/missing.png'}],
+ [{'icon': 'http://127.0.0.1:5555/static/images/package.png'}],
ipc.get(['context'], reply=['icon'])['result'])
def test_favorite(self):
diff --git a/tests/units/client/online_routes.py b/tests/units/client/online_routes.py
index 6314948..ddf8a4c 100755
--- a/tests/units/client/online_routes.py
+++ b/tests/units/client/online_routes.py
@@ -228,7 +228,7 @@ class OnlineRoutes(tests.Test):
ipc = IPCConnection()
guid = ipc.post(['context'], {
- 'type': 'activity',
+ 'type': 'package',
'title': 'title',
'summary': 'summary',
'description': 'description',
@@ -246,13 +246,13 @@ class OnlineRoutes(tests.Test):
ipc.get(['context'], reply=['preview'])['result'])
self.assertEqual(
- file(src_root + '/sugar_network/static/httpdocs/images/missing.png').read(),
+ 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/missing.png'},
+ {'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/missing.png'}],
+ [{'icon': 'http://127.0.0.1:8888/static/images/package.png'}],
ipc.get(['context'], reply=['icon'])['result'])
def test_favorite(self):
@@ -486,7 +486,7 @@ Can't find all required implementations:
coroutine.dispatch()
context = ipc.post(['context'], {
- 'type': 'content',
+ 'type': 'book',
'title': 'title',
'summary': 'summary',
'description': 'description',
@@ -545,7 +545,7 @@ Can't find all required implementations:
[(i.guid, i['layer']) for i in local['context'].find(reply='layer')[0]])
self.assertEqual({
'layer': ['clone'],
- 'type': ['content'],
+ 'type': ['book'],
'author': {tests.UID: {'role': 3, 'name': 'test', 'order': 0}},
'title': {'en-us': 'title'},
},
@@ -590,7 +590,7 @@ Can't find all required implementations:
self.assertEqual([], ipc.get(['context', context, 'layer']))
self.assertEqual({
'layer': [],
- 'type': ['content'],
+ 'type': ['book'],
'author': {tests.UID: {'role': 3, 'name': 'test', 'order': 0}},
'title': {'en-us': 'title'},
},
@@ -1181,7 +1181,7 @@ Can't find all required implementations:
ipc = IPCConnection()
guid = ipc.post(['context'], {
- 'type': 'content',
+ 'type': 'book',
'title': 'remote',
'summary': 'summary',
'description': 'description',
diff --git a/tests/units/client/server_routes.py b/tests/units/client/server_routes.py
index c477ff2..47282ce 100755
--- a/tests/units/client/server_routes.py
+++ b/tests/units/client/server_routes.py
@@ -124,7 +124,7 @@ class ServerRoutesTest(tests.Test):
ipc = IPCConnection()
guid = ipc.post(['context'], {
- 'type': 'activity',
+ 'type': 'package',
'title': 'title',
'summary': 'summary',
'description': 'description',
@@ -142,13 +142,13 @@ class ServerRoutesTest(tests.Test):
ipc.get(['context'], reply=['preview'])['result'])
self.assertEqual(
- file(src_root + '/sugar_network/static/httpdocs/images/missing.png').read(),
+ 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/missing.png'},
+ {'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/missing.png'}],
+ [{'icon': 'http://127.0.0.1:5555/static/images/package.png'}],
ipc.get(['context'], reply=['icon'])['result'])
def test_PopulateNode(self):
diff --git a/tests/units/model/context.py b/tests/units/model/context.py
index 25b21b4..b48db6f 100755
--- a/tests/units/model/context.py
+++ b/tests/units/model/context.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
# sugar-lint: disable
+from os.path import exists
+
from __init__ import tests
from sugar_network.node import obs
@@ -40,6 +42,21 @@ class ContextTest(tests.Test):
})
self.assertEqual(['common', 'bar'], ipc.get(['context', guid, 'layer']))
+ def test_DefaultImages(self):
+ self.start_online_client()
+ ipc = IPCConnection()
+
+ guid = ipc.post(['context'], {
+ 'guid': 'guid',
+ 'type': 'activity',
+ 'title': 'title',
+ 'summary': 'summary',
+ 'description': 'description',
+ })
+ assert exists('master/context/gu/guid/artifact_icon.blob')
+ assert exists('master/context/gu/guid/icon.blob')
+ assert exists('master/context/gu/guid/preview.blob')
+
if __name__ == '__main__':
tests.main()
diff --git a/tests/units/model/implementation.py b/tests/units/model/implementation.py
index 6b4bbc3..070df70 100755
--- a/tests/units/model/implementation.py
+++ b/tests/units/model/implementation.py
@@ -70,7 +70,7 @@ class ImplementationTest(tests.Test):
self.node_volume['context'].create({
'guid': 'context',
- 'type': 'content',
+ 'type': 'book',
'title': 'title',
'summary': 'summary',
'description': 'description',
diff --git a/tests/units/node/node.py b/tests/units/node/node.py
index cf0bf73..5c7cb58 100755
--- a/tests/units/node/node.py
+++ b/tests/units/node/node.py
@@ -817,8 +817,8 @@ class NodeTest(tests.Test):
svg = '\n'.join([
'<?xml version="1.0" encoding="UTF-8"?>',
'<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [',
- ' <!ENTITY fill_color "#FFFFFF">',
- ' <!ENTITY stroke_color "#010101">',
+ ' <!ENTITY fill_color "#123456">',
+ ' <!ENTITY stroke_color "#123456">',
']>',
'<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50">',
' <rect x="3" y="7" width="44" height="36" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3"/>',