Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tests/units
diff options
context:
space:
mode:
Diffstat (limited to 'tests/units')
-rwxr-xr-xtests/units/model/context.py21
-rwxr-xr-xtests/units/model/post.py20
-rwxr-xr-xtests/units/node/node.py20
-rwxr-xr-xtests/units/node/stats_node.py30
-rwxr-xr-xtests/units/node/volume.py6
5 files changed, 61 insertions, 36 deletions
diff --git a/tests/units/model/context.py b/tests/units/model/context.py
index b48db6f..f2de64d 100755
--- a/tests/units/model/context.py
+++ b/tests/units/model/context.py
@@ -5,7 +5,9 @@ from os.path import exists
from __init__ import tests
+from sugar_network import db
from sugar_network.node import obs
+from sugar_network.model.context import Context
from sugar_network.client import IPCConnection
from sugar_network.toolkit import coroutine, enforce
@@ -57,6 +59,25 @@ class ContextTest(tests.Test):
assert exists('master/context/gu/guid/icon.blob')
assert exists('master/context/gu/guid/preview.blob')
+ def test_RatingSort(self):
+ directory = db.Volume('db', [Context])['context']
+
+ directory.create({'guid': '1', 'type': 'activity', 'title': '', 'summary': '', 'description': '', 'rating': [0, 0]})
+ directory.create({'guid': '2', 'type': 'activity', 'title': '', 'summary': '', 'description': '', 'rating': [1, 2]})
+ directory.create({'guid': '3', 'type': 'activity', 'title': '', 'summary': '', 'description': '', 'rating': [1, 4]})
+ directory.create({'guid': '4', 'type': 'activity', 'title': '', 'summary': '', 'description': '', 'rating': [10, 10]})
+ directory.create({'guid': '5', 'type': 'activity', 'title': '', 'summary': '', 'description': '', 'rating': [30, 90]})
+
+ self.assertEqual(
+ ['1', '2', '3', '4', '5'],
+ [i.guid for i in directory.find()[0]])
+ self.assertEqual(
+ ['1', '4', '2', '5', '3'],
+ [i.guid for i in directory.find(order_by='rating')[0]])
+ self.assertEqual(
+ ['3', '5', '2', '4', '1'],
+ [i.guid for i in directory.find(order_by='-rating')[0]])
+
if __name__ == '__main__':
tests.main()
diff --git a/tests/units/model/post.py b/tests/units/model/post.py
index 91a0298..931bd66 100755
--- a/tests/units/model/post.py
+++ b/tests/units/model/post.py
@@ -3,6 +3,7 @@
from __init__ import tests
+from sugar_network import db
from sugar_network.client import Connection, keyfile
from sugar_network.model.user import User
from sugar_network.model.context import Context
@@ -41,6 +42,25 @@ class PostTest(tests.Test):
context,
client.get(['post', comment, 'context']))
+ def test_RatingSort(self):
+ directory = db.Volume('db', [Post])['post']
+
+ directory.create({'guid': '1', 'context': '', 'type': 'comment', 'title': '', 'message': '', 'rating': [0, 0]})
+ directory.create({'guid': '2', 'context': '', 'type': 'comment', 'title': '', 'message': '', 'rating': [1, 2]})
+ directory.create({'guid': '3', 'context': '', 'type': 'comment', 'title': '', 'message': '', 'rating': [1, 4]})
+ directory.create({'guid': '4', 'context': '', 'type': 'comment', 'title': '', 'message': '', 'rating': [10, 10]})
+ directory.create({'guid': '5', 'context': '', 'type': 'comment', 'title': '', 'message': '', 'rating': [30, 90]})
+
+ self.assertEqual(
+ ['1', '2', '3', '4', '5'],
+ [i.guid for i in directory.find()[0]])
+ self.assertEqual(
+ ['1', '4', '2', '5', '3'],
+ [i.guid for i in directory.find(order_by='rating')[0]])
+ self.assertEqual(
+ ['3', '5', '2', '4', '1'],
+ [i.guid for i in directory.find(order_by='-rating')[0]])
+
if __name__ == '__main__':
tests.main()
diff --git a/tests/units/node/node.py b/tests/units/node/node.py
index 22c0bd3..388b2ed 100755
--- a/tests/units/node/node.py
+++ b/tests/units/node/node.py
@@ -1217,28 +1217,24 @@ class NodeTest(tests.Test):
self.assertEqual({
'downloads': 2,
- 'rating': 1,
- 'reviews': [1, 1],
+ 'rating': [1, 1],
},
- volume['context'].get('context_1').properties(['downloads', 'rating', 'reviews']))
+ volume['context'].get('context_1').properties(['downloads', 'rating']))
self.assertEqual({
'downloads': 1,
- 'rating': 4,
- 'reviews': [2, 7],
+ 'rating': [2, 7],
},
- volume['context'].get('context_2').properties(['downloads', 'rating', 'reviews']))
+ volume['context'].get('context_2').properties(['downloads', 'rating']))
self.assertEqual({
'downloads': 2,
- 'rating': 2,
- 'reviews': [1, 2],
+ 'rating': [1, 2],
},
- volume['post'].get('topic_1').properties(['downloads', 'rating', 'reviews']))
+ volume['post'].get('topic_1').properties(['downloads', 'rating']))
self.assertEqual({
'downloads': 1,
- 'rating': 0,
- 'reviews': [0, 0],
+ 'rating': [0, 0],
},
- volume['post'].get('topic_2').properties(['downloads', 'rating', 'reviews']))
+ volume['post'].get('topic_2').properties(['downloads', 'rating']))
def test_generate_node_stats_Deletes(self):
node.stats_root.value = 'stats'
diff --git a/tests/units/node/stats_node.py b/tests/units/node/stats_node.py
index 666a183..eab7fb8 100755
--- a/tests/units/node/stats_node.py
+++ b/tests/units/node/stats_node.py
@@ -77,10 +77,8 @@ class StatsTest(tests.Test):
self.assertEqual(3, stats._stats['post']['total'])
stats.commit_objects()
- self.assertEqual([2, 3], volume['context'].get('context')['reviews'])
- self.assertEqual(2, volume['context'].get('context')['rating'])
- self.assertEqual([1, 3], volume['post'].get('topic')['reviews'])
- self.assertEqual(3, volume['post'].get('topic')['rating'])
+ self.assertEqual([2, 3], volume['context'].get('context')['rating'])
+ self.assertEqual([1, 3], volume['post'].get('topic')['rating'])
def test_ContextDownloaded(self):
volume = db.Volume('local', model.RESOURCES)
@@ -188,8 +186,7 @@ class StatsTest(tests.Test):
volume['release'].create({'guid': 'release', 'context': 'context', 'license': 'GPLv3', 'version': '1', 'date': 0, 'stability': 'stable', 'notes': ''})
self.assertEqual(0, volume['context'].get('context')['downloads'])
- self.assertEqual([0, 0], volume['context'].get('context')['reviews'])
- self.assertEqual(0, volume['context'].get('context')['rating'])
+ self.assertEqual([0, 0], volume['context'].get('context')['rating'])
stats = Sniffer(volume, 'stats/node')
request = Request(method='GET', path=['release', 'release', 'data'])
@@ -204,15 +201,13 @@ class StatsTest(tests.Test):
stats.commit_objects()
self.assertEqual(1, volume['context'].get('context')['downloads'])
- self.assertEqual([1, 5], volume['context'].get('context')['reviews'])
- self.assertEqual(5, volume['context'].get('context')['rating'])
+ self.assertEqual([1, 5], volume['context'].get('context')['rating'])
stats.commit()
stats.commit_objects()
self.assertEqual(1, volume['context'].get('context')['downloads'])
- self.assertEqual([1, 5], volume['context'].get('context')['reviews'])
- self.assertEqual(5, volume['context'].get('context')['rating'])
+ self.assertEqual([1, 5], volume['context'].get('context')['rating'])
stats = Sniffer(volume, 'stats/node')
request = Request(method='GET', path=['release', 'release', 'data'])
@@ -226,8 +221,7 @@ class StatsTest(tests.Test):
stats.commit_objects()
self.assertEqual(2, volume['context'].get('context')['downloads'])
- self.assertEqual([2, 6], volume['context'].get('context')['reviews'])
- self.assertEqual(3, volume['context'].get('context')['rating'])
+ self.assertEqual([2, 6], volume['context'].get('context')['rating'])
def test_CommitTopicStats(self):
volume = db.Volume('local', model.RESOURCES)
@@ -236,8 +230,7 @@ class StatsTest(tests.Test):
volume['post'].create({'guid': 'topic', 'type': 'object', 'context': 'context', 'title': '', 'message': ''})
self.assertEqual(0, volume['post'].get('topic')['downloads'])
- self.assertEqual([0, 0], volume['post'].get('topic')['reviews'])
- self.assertEqual(0, volume['post'].get('topic')['rating'])
+ self.assertEqual([0, 0], volume['post'].get('topic')['rating'])
stats = Sniffer(volume, 'stats/node')
request = Request(method='GET', path=['post', 'topic', 'data'])
@@ -251,15 +244,13 @@ class StatsTest(tests.Test):
stats.commit_objects()
self.assertEqual(1, volume['post'].get('topic')['downloads'])
- self.assertEqual([1, 5], volume['post'].get('topic')['reviews'])
- self.assertEqual(5, volume['post'].get('topic')['rating'])
+ self.assertEqual([1, 5], volume['post'].get('topic')['rating'])
stats.commit()
stats.commit_objects()
self.assertEqual(1, volume['post'].get('topic')['downloads'])
- self.assertEqual([1, 5], volume['post'].get('topic')['reviews'])
- self.assertEqual(5, volume['post'].get('topic')['rating'])
+ self.assertEqual([1, 5], volume['post'].get('topic')['rating'])
request = Request(method='GET', path=['post', 'topic', 'data'])
request.principal = 'user'
@@ -272,8 +263,7 @@ class StatsTest(tests.Test):
stats.commit_objects()
self.assertEqual(2, volume['post'].get('topic')['downloads'])
- self.assertEqual([2, 6], volume['post'].get('topic')['reviews'])
- self.assertEqual(3, volume['post'].get('topic')['rating'])
+ self.assertEqual([2, 6], volume['post'].get('topic')['rating'])
def test_Suspend(self):
stats_node_step.value = 5
diff --git a/tests/units/node/volume.py b/tests/units/node/volume.py
index 10a1cdd..512b3e0 100755
--- a/tests/units/node/volume.py
+++ b/tests/units/node/volume.py
@@ -462,10 +462,8 @@ class VolumeTest(tests.Test):
})],
],
[[(j.name,) + i for i in j.get(j.last, j.last)] for j in Rrd('stats/node', 1)])
- self.assertEqual(1, volume['context'].get('context')['rating'])
- self.assertEqual([1, 1], volume['context'].get('context')['reviews'])
- self.assertEqual(1, volume['post'].get('topic_1')['rating'])
- self.assertEqual([1, 1], volume['post'].get('topic_1')['reviews'])
+ self.assertEqual([1, 1], volume['context'].get('context')['rating'])
+ self.assertEqual([1, 1], volume['post'].get('topic_1')['rating'])
records = [
{'resource': 'post'},