- renamed all files starting with message_ to a name without message_ - exception: msgdict as dict is a reserved word - moved all tests into the message/ directory - changed all tests to use the new names - changed all modules to use the new names - shortened imports to not use the full path (pyogp.lib.base. but only the short path) - removed makepacketdict.py as it's not needed anymore - moved the data/ directory into message/ as it's local to the msg system and some small cleanups on the way. please run the tests! I haven't adjusted pyogp.interop yet, Enus wanted to look after it.
65 lines
2.0 KiB
Python
65 lines
2.0 KiB
Python
#standard libraries
|
|
import unittest, doctest
|
|
|
|
#third party
|
|
from indra.base import llsd
|
|
|
|
#local libraries
|
|
from pyogp.lib.base.message.llsd_builder import LLSDMessageBuilder
|
|
from pyogp.lib.base.message.types import MsgType
|
|
|
|
class TestLLSDBuilder(unittest.TestCase):
|
|
|
|
def tearDown(self):
|
|
pass
|
|
|
|
def setUp(self):
|
|
pass
|
|
|
|
def test_builder(self):
|
|
builder = LLSDMessageBuilder()
|
|
builder.new_message('TestMessage')
|
|
|
|
builder.next_block('TestBlock1')
|
|
builder.add_data('Test1', 0x00000001, MsgType.MVT_U32)
|
|
|
|
builder.next_block('TestBlock1')
|
|
builder.add_data('Test2', 0x00000001, MsgType.MVT_U32)
|
|
|
|
builder.next_block('NeighborBlock')
|
|
builder.add_data('Test0', 0x00000001, MsgType.MVT_U32)
|
|
builder.add_data('Test1', 0x00000001, MsgType.MVT_U32)
|
|
builder.add_data('Test2', 0x00000001, MsgType.MVT_U32)
|
|
|
|
builder.next_block('NeighborBlock')
|
|
builder.add_data('Test1', 0x00000001, MsgType.MVT_U32)
|
|
builder.add_data('Test1', 0x00000001, MsgType.MVT_U32)
|
|
builder.add_data('Test1', 0x00000001, MsgType.MVT_U32)
|
|
|
|
builder.next_block('NeighborBlock')
|
|
builder.add_data('Test2', 0x00000001, MsgType.MVT_U32)
|
|
builder.add_data('Test2', 0x00000001, MsgType.MVT_U32)
|
|
builder.add_data('Test2', 0x00000001, MsgType.MVT_U32)
|
|
|
|
builder.next_block('TestBlock2')
|
|
builder.add_data('Test1', 0x00000001, MsgType.MVT_U32)
|
|
|
|
msg, size = builder.build_message()
|
|
|
|
try:
|
|
assert len(msg['NeighborBlock']) == 3, "Multiple blocks not" + \
|
|
" correct"
|
|
except:
|
|
assert False, "Message not set up properly"
|
|
|
|
try:
|
|
msg = llsd.format_xml(msg)
|
|
except:
|
|
assert False, "Message not built correctly so it can be formatted"
|
|
|
|
def test_suite():
|
|
from unittest import TestSuite, makeSuite
|
|
suite = TestSuite()
|
|
suite.addTest(makeSuite(TestLLSDBuilder))
|
|
return suite
|