Skip to content

Commit 6b6217c

Browse files
jacomagojacomago
committed
Remove commented out code
1 parent 34ab7d0 commit 6b6217c

File tree

1 file changed

+0
-64
lines changed

1 file changed

+0
-64
lines changed

‎test/testChannelFinderClient.py‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -37,64 +37,6 @@ def testConnection(self):
3737
)
3838

3939

40-
# ===============================================================================
41-
# Test JSON Parsing
42-
# ===============================================================================
43-
"""
44-
class JSONparserTest(ChannelFinderClientTestCase):
45-
46-
multiChannels = {u'channels': {u'channel': [{u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:0', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'0'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'19'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:1', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'1'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'22'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:2', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'2'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'38'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:3', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'3'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'65'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:4', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'4'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'78'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:5', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'5'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'79'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:6', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'6'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'90'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:7', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'7'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'5'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:8', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'8'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'64'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}, {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:9', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'9'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'85'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}]}}
47-
singleChannels = {u'channels': {u'channel': {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:2', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'2'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'38'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}}}
48-
channel = {u'@owner': u'shroffk', u'@name': u'Test_first:a<000>:0:0', u'properties': {u'property': [{u'@owner': u'shroffk', u'@name': u'Test_PropA', u'@value': u'0'}, {u'@owner': u'shroffk', u'@name': u'Test_PropB', u'@value': u'19'}, {u'@owner': u'shroffk', u'@name': u'Test_PropC', u'@value': u'ALL'}]}, u'tags': {u'tag': [{u'@owner': u'shroffk', u'@name': u'Test_TagA'}, {u'@owner': u'shroffk', u'@name': u'Test_TagB'}]}}
49-
noChannel = {u'channels': None}
50-
51-
def setUp(self):
52-
pass
53-
54-
def tearDown(self):
55-
pass
56-
57-
def testSingleChannelsParsing(self):
58-
reply = ChannelFinderClient()._ChannelFinderClient__decodeChannels(self.singleChannels)
59-
self.assertTrue(len(reply) == 1, 'Parse Error');
60-
self.assertTrue(len(reply[0][u'properties']) == len (self.singleChannels[u'channels'][u'channel'][u'properties']['property']), 'single channel peoperties not parsed correctly')
61-
self.assertTrue(len(reply[0][u'tags']) == len(self.singleChannels[u'channels'][u'channel'][u'tags']['tag']), 'tags not correctly parsed')
62-
pass
63-
64-
def testMultiChannelsParsing(self):
65-
reply = ChannelFinderClient()._ChannelFinderClient__decodeChannels(self.multiChannels)
66-
self.assertTrue(len(reply) == len(self.multiChannels[u'channels'][u'channel']), 'incorrect number of channels in parsed result')
67-
pass
68-
69-
def testNoChannelParsing(self):
70-
reply = ChannelFinderClient()._ChannelFinderClient__decodeChannels(self.noChannel)
71-
self.assertTrue(not reply, 'failed parsing an emplty channels list')
72-
73-
def testChannel(self):
74-
reply = ChannelFinderClient()._ChannelFinderClient__decodeChannel(self.channel)
75-
self.assertTrue(reply[u'name'] == self.channel[u'@name'])
76-
self.assertTrue(reply[u'owner'] == self.channel[u'@owner'])
77-
self.assertTrue(len(reply[u'properties']) == len(self.channel[u'properties'][u'property']))
78-
self.assertTrue(len(reply[u'tags']) == len(self.channel[u'tags'][u'tag']))
79-
80-
def testEncodeChannel(self):
81-
encodedChannel = ChannelFinderClient()._ChannelFinderClient__encodeChannels(\
82-
[{u'name':u'Test_first:a<000>:0:0', u'owner':u'shroffk',
83-
u'properties':[{u'name':u'Test_PropA', u'owner':u'shroffk', u'value':u'0'},
84-
{u'name':u'Test_PropB', u'owner':u'shroffk', u'value':u'19'},
85-
{u'name':u'Test_PropC', u'owner':u'shroffk', u'value':u'ALL'}],
86-
u'tags':[{u'name':u'Test_TagA', u'owner':u'shroffk'},
87-
{u'name':u'Test_TagB', u'owner':u'shroffk'}]}])
88-
# print encodedChannel[u'channels'][u'channel']
89-
print "TEST "+ str(encodedChannel[u'channels'][u'channel']) + " == " + str(self.channel)
90-
self.assertTrue(encodedChannel[u'channels'][u'channel'] == self.channel)
91-
92-
def testEncodeChannels(self):
93-
self.assertTrue(self.multiChannels ==
94-
ChannelFinderClient()._ChannelFinderClient__encodeChannels(ChannelFinderClient()._ChannelFinderClient__decodeChannels(self.multiChannels)))
95-
"""
96-
97-
9840
# ===============================================================================
9941
# Test all the tag operations
10042
# ===============================================================================
@@ -1827,10 +1769,4 @@ def getDefaultTestConfig(arg):
18271769

18281770

18291771
if __name__ == "__main__":
1830-
# import sys;sys.argv = ['', 'Test.testConnection']
1831-
# suite = unittest.TestLoader().loadTestsFromTestCase(ErrorTest)
1832-
# unittest.TextTestRunner(verbosity=2).run(suite)
1833-
1834-
# print sys.path
1835-
18361772
unittest.main()

0 commit comments

Comments
 (0)