From 8a0509de27d00a6cf66838ccfbf42f24735f30ef Mon Sep 17 00:00:00 2001 From: "locklainn.linden" Date: Wed, 16 Jul 2008 19:00:18 +0000 Subject: [PATCH] better renaming to make clear that it is using message template --- .../base/{packet.py => message_template.py} | 0 ...cketbody.py => message_template_parser.py} | 0 pyogp/lib/base/packet_test.py | 58 +++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) rename pyogp/lib/base/{packet.py => message_template.py} (100%) rename pyogp/lib/base/{makepacketbody.py => message_template_parser.py} (100%) diff --git a/pyogp/lib/base/packet.py b/pyogp/lib/base/message_template.py similarity index 100% rename from pyogp/lib/base/packet.py rename to pyogp/lib/base/message_template.py diff --git a/pyogp/lib/base/makepacketbody.py b/pyogp/lib/base/message_template_parser.py similarity index 100% rename from pyogp/lib/base/makepacketbody.py rename to pyogp/lib/base/message_template_parser.py diff --git a/pyogp/lib/base/packet_test.py b/pyogp/lib/base/packet_test.py index 3ead278..dc884fe 100644 --- a/pyogp/lib/base/packet_test.py +++ b/pyogp/lib/base/packet_test.py @@ -1,105 +1,105 @@ import unittest -import packet +import message_template class PacketTest(unittest.TestCase): #testing each component def test_freqLow(self): - assert packet.decodeFrequency('\xFF\xFF\x01') == 'Low', '0xFFFF01 is supposed to be "Low"' + assert message_template.decodeFrequency('\xFF\xFF\x01') == 'Low', '0xFFFF01 is supposed to be "Low"' def test_freqMedium(self): - assert packet.decodeFrequency('\xFF\x01') == 'Medium', '0xFF01 is supposed to be "Medium"' + assert message_template.decodeFrequency('\xFF\x01') == 'Medium', '0xFF01 is supposed to be "Medium"' def test_freqHigh(self): - assert packet.decodeFrequency('\x01') == 'High', '0x01 is supposed to be "High"' + assert message_template.decodeFrequency('\x01') == 'High', '0x01 is supposed to be "High"' def test_numLow(self): - num = packet.decodeNum('\xFF\xFF\x01') + num = message_template.decodeNum('\xFF\xFF\x01') assert num == 1, 'Outcome: ' + str(num) + ' Expected: 1' def test_numMedium(self): - num = packet.decodeNum('\xFF\x01') + num = message_template.decodeNum('\xFF\x01') assert num == 1, 'Outcome: ' + str(num) + ' Expected: 1' def test_numHigh(self): - num = packet.decodeNum('\x01') + num = message_template.decodeNum('\x01') assert num == 1, 'Outcome: ' + str(num) + ' Expected: 1' #pass cases def test_DecodeLow(self): - assert packet.decodeHeader('\xFF\xFF\x01')[0] == 'TestMessage', 'wrong packet for 0xFFFF01: expected TestMessage' + assert message_template.decodeHeader('\xFF\xFF\x01')[0] == 'TestMessage', 'wrong message_template for 0xFFFF01: expected TestMessage' def test_DecodeMedium(self): - assert packet.decodeHeader('\xFF\x01')[0] == 'ObjectAdd', 'wrong packet for 0xFF01: expected ObjectAdd' + assert message_template.decodeHeader('\xFF\x01')[0] == 'ObjectAdd', 'wrong message_template for 0xFF01: expected ObjectAdd' def test_DecodeHigh(self): - assert packet.decodeHeader('\x01')[0] == 'StartPingCheck', 'wrong packet for 0x01: expected StartPingCheck' + assert message_template.decodeHeader('\x01')[0] == 'StartPingCheck', 'wrong message_template for 0x01: expected StartPingCheck' def test_DecodeLow(self): - assert packet.decodeHeaderPair('Low', 1)[0] == 'TestMessage', 'wrong packet for ("Low", 1): expected TestMessage' + assert message_template.decodeHeaderPair('Low', 1)[0] == 'TestMessage', 'wrong message_template for ("Low", 1): expected TestMessage' def test_DecodePairMedium(self): - assert packet.decodeHeaderPair('Medium', 1)[0] == 'ObjectAdd', 'wrong packet for ("Medium", 1): expected ObjectAdd' + assert message_template.decodeHeaderPair('Medium', 1)[0] == 'ObjectAdd', 'wrong message_template for ("Medium", 1): expected ObjectAdd' def test_DecodePairHigh(self): - assert packet.decodeHeaderPair('High', 1)[0] == 'StartPingCheck', 'wrong packet for ("High", 1): expected StartPingCheck' + assert message_template.decodeHeaderPair('High', 1)[0] == 'StartPingCheck', 'wrong message_template for ("High", 1): expected StartPingCheck' #fail cases def test_DecodeLowFail(self): - assert packet.decodeHeader('\xFF\xFF\x01')[0] != 'TestMessage', 'wrong packet for 0xFFFF01: expected TestMessage' + assert message_template.decodeHeader('\xFF\xFF\x01')[0] != 'TestMessage', 'wrong message_template for 0xFFFF01: expected TestMessage' def test_DecodeMediumFail(self): - assert packet.decodeHeader('\x01')[0] != 'ObjectAdd', 'wrong packet for 0x01: expected ObjectAdd' + assert message_template.decodeHeader('\x01')[0] != 'ObjectAdd', 'wrong message_template for 0x01: expected ObjectAdd' def test_DecodeHighFail(self): - assert packet.decodeHeader('\xFF\x01')[0] != 'StartPingCheck', 'wrong packet for 0xFF01: expected StartPingCheck' + assert message_template.decodeHeader('\xFF\x01')[0] != 'StartPingCheck', 'wrong message_template for 0xFF01: expected StartPingCheck' def test_DecodeLowFail(self): - assert packet.decodeHeaderPair('Medium', 1)[0] != 'TestMessage', 'wrong packet for ("Medium", 1): expected TestMessage' + assert message_template.decodeHeaderPair('Medium', 1)[0] != 'TestMessage', 'wrong message_template for ("Medium", 1): expected TestMessage' def test_DecodePairMediumFail(self): - assert packet.decodeHeaderPair('High', 1)[0] != 'ObjectAdd', 'wrong packet for ("High", 1): expected ObjectAdd' + assert message_template.decodeHeaderPair('High', 1)[0] != 'ObjectAdd', 'wrong message_template for ("High", 1): expected ObjectAdd' def test_DecodePairHighFail(self): - assert packet.decodeHeaderPair('Low', 1)[0] != 'StartPingCheck', 'wrong packet for ("Low", 1): expected StartPingCheck' + assert message_template.decodeHeaderPair('Low', 1)[0] != 'StartPingCheck', 'wrong message_template for ("Low", 1): expected StartPingCheck' - #test encode packetID + #test encode message_templateID def test_encodePackIDLow(self): - pID = packet.encodePacketID('Low', 1) + pID = message_template.encodePacketID('Low', 1) assert pID == '\xFF\xFF\x00\x01', 'Outcome: ' + repr(pID) + ' Expected: ' + r'\xFF\xFF\x00\x01' def test_encodePackIDMedium(self): - pID = packet.encodePacketID('Medium', 1) + pID = message_template.encodePacketID('Medium', 1) assert pID == '\xFF\x01', 'Outcome: ' + repr(pID) + ' Expected: ' + r'\xFF\x01' def test_encodePackIDHigh(self): - pID = packet.encodePacketID('High', 1) + pID = message_template.encodePacketID('High', 1) assert pID == '\x01', 'Outcome: ' + repr(pID) + ' Expected: ' + r'x01' def test_encodeHeaderLow(self): - header = packet.encodeHeader(packet.LL_NONE, 1, 'Low', 1) + header = message_template.encodeHeader(message_template.LL_NONE, 1, 'Low', 1) assert header == '\x00\x00\x00\x00\x01\x00\xff\xff\x00\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\xff\xff\x00\x01' def test_encodeHeaderMedium(self): - header = packet.encodeHeader(packet.LL_NONE, 1, 'Medium', 1) + header = message_template.encodeHeader(message_template.LL_NONE, 1, 'Medium', 1) assert header == '\x00\x00\x00\x00\x01\x00\xff\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\xff\x01' def test_encodeHeaderHigh(self): - header = packet.encodeHeader(packet.LL_NONE, 1, 'High', 1) + header = message_template.encodeHeader(message_template.LL_NONE, 1, 'High', 1) assert header == '\x00\x00\x00\x00\x01\x00\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\x01' def test_encodeHeaderNameLow(self): - header = packet.encodeHeaderName(packet.LL_NONE, 1, 'TestMessage') + header = message_template.encodeHeaderName(message_template.LL_NONE, 1, 'TestMessage') assert header == '\x00\x00\x00\x00\x01\x00\xff\xff\x00\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\xff\xff\x00\x01' def test_encodeHeaderNameMedium(self): - header = packet.encodeHeaderName(packet.LL_NONE, 1, 'ObjectAdd') + header = message_template.encodeHeaderName(message_template.LL_NONE, 1, 'ObjectAdd') assert header == '\x00\x00\x00\x00\x01\x00\xff\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\xff\x01' def test_encodeHeaderNameHigh(self): - header = packet.encodeHeaderName(packet.LL_NONE, 1, 'StartPingCheck') + header = message_template.encodeHeaderName(message_template.LL_NONE, 1, 'StartPingCheck') assert header == '\x00\x00\x00\x00\x01\x00\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\x01' if __name__ == "__main__":