← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/tests/test_chat.py

  • Committer: William Grant
  • Date: 2010-07-27 09:02:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1824.
  • Revision ID: grantw@unimelb.edu.au-20100727090206-pmf5j6lu6xc892q8
Replace semester.semester with semester.{code,url_name,display_name}.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/tests/test_chat.py
19
19
import os
20
20
import random
21
21
 
22
 
try:
23
 
    import json
24
 
except ImportError:
25
 
    import simplejson as json
26
 
 
 
22
import cjson
27
23
from nose.tools import assert_equal, raises
28
24
 
29
25
import ivle.chat
97
93
        """
98
94
        MESSAGE = {}
99
95
        MAGIC = "3EE"
100
 
        content = json.dumps(MESSAGE)
 
96
        content = cjson.encode(MESSAGE)
101
97
        # Digest can be formed with `echo -n "${content}${MAGIC}" | md5sum`
102
98
        DIGEST = '2b59b68e1ac0852b87fb7e64946f2658'
103
99
        expected = {'digest': DIGEST,
104
100
                'content': content}
105
101
        encoded = ivle.chat.encode(MESSAGE, MAGIC)
106
 
        assert_equal(json.loads(encoded), expected)
 
102
        assert_equal(cjson.decode(encoded), expected)
107
103
 
108
104
    def test_encode_decode(self):
109
105
        """Check that a round trip encoding and decoding works