SF.net SVN: fclient: [177] trunk/sandbox/fcp/test_fcp/test_fcp2_0_message. py

[<ju...@us...>]

Revision: 177
          http://fclient.svn.sourceforge.net/fclient/?rev=177&view=rev
Author:   jurner
Date:     2008-02-08 00:39:18 -0800 (Fri, 08 Feb 2008)

Log Message:
-----------
test where broken. Fixed

Modified Paths:
--------------
    trunk/sandbox/fcp/test_fcp/test_fcp2_0_message.py

Modified: trunk/sandbox/fcp/test_fcp/test_fcp2_0_message.py
===================================================================
--- trunk/sandbox/fcp/test_fcp/test_fcp2_0_message.py	2008-02-08 08:38:57 UTC (rev 176)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_message.py	2008-02-08 08:39:18 UTC (rev 177)
@@ -15,6 +15,7 @@
 
 from fcp2_0_client import FcpClient
 Message = FcpClient.Message
+import fcp2_0_consts as consts
 
 sys.path.pop(0)
 del parentdir
@@ -34,7 +35,7 @@
 		s.setResponse('NodeHello\nfoo=bar\nEndMessage\n')
 		msg = Message.fromSocket(s)
 		
-		self.failUnless(msg.name == Message.MessageNodeHello)
+		self.failUnless(msg.name == consts.Message.NodeHello)
 		self.failUnless(len(msg.params) == 1)
 		self.failUnless(msg.get('foo', None) == 'bar')
 		
@@ -46,7 +47,7 @@
 		s.setClosed(True)
 		msg = Message.fromSocket(s)
 		
-		self.failUnless(msg.name == Message.MessageClientSocketDied)
+		self.failUnless(msg.name == consts.Message.ClientSocketDied)
 		self.failUnless(msg.get('Exception', None) == socket.error)
 		
 		
@@ -58,7 +59,7 @@
 		s.setError(True)
 		msg = Message.fromSocket(s)
 		
-		self.failUnless(msg.name == Message.MessageClientSocketDied)
+		self.failUnless(msg.name == consts.Message.ClientSocketDied)
 		self.failUnless(msg.get('Exception', None) == socket.error)
 
 	
@@ -67,7 +68,7 @@
 		s = DummySocket()
 		msg = Message.fromSocket(s)
 		
-		self.failUnless(msg.name == Message.MessageClientSocketTimeout)
+		self.failUnless(msg.name == consts.Message.ClientSocketTimeout)
 
 		
 	def testDataFromSocket(self):
@@ -76,7 +77,7 @@
 		s.setResponse('AllData\nDataLength=8\nData\n\nABC\nDEF')
 		msg = Message.fromSocket(s)
 		
-		self.failUnless(msg.name == Message.MessageAllData)
+		self.failUnless(msg.name == consts.Message.AllData)
 		self.failUnless(len(msg.params) == 1)
 		self.failUnless(msg.get('DataLength', None) == '8')
 		self.failUnless(msg.data == '\nABC\nDEF')
@@ -86,7 +87,7 @@
 		"""Sends a simple message"""
 		s = DummySocket()
 		msg = Message(
-			Message.MessageClientHello,
+			consts.Message.ClientHello,
 			foo='bar'
 			)
 		msg.send(s)
@@ -97,50 +98,31 @@
 		"""Sends a message containing a data member"""
 		s = DummySocket('')
 		msg = Message(
-			Message.MessageAllData,
+			consts.Message.AllData,
 			DataLength='5',
 			data='ABCDE'
 			)
 		msg.send(s)
 		self.failUnless(s.bytes == 'AllData\nDataLength=5\nData\nABCDE')	
-	
-		# test error checking of data member
-		msg = Message(
-			Message.MessageAllData,
-			##DataLength='1',	# no data length specified
-			data='A'
-			)
-		self.assertRaises(AssertionError, msg.send, s)
-		msg = Message(
-			Message.MessageAllData,
-			DataLength='1',
-			data='A' * 100
-			)
-		self.assertRaises(AssertionError, msg.send, s)
-		msg = Message(
-			Message.MessageAllData,
-			DataLength='100',
-			data='A'
-			)
-		self.assertRaises(AssertionError, msg.send, s)
-		msg = Message(
-			Message.MessageAllData,
-			DataLength='X',
-			data='A'
-			)
-		self.assertRaises(AssertionError, msg.send, s)
 		
-		
 	
 
 #*********************************************************************************
 #
 #*********************************************************************************
 def suite():
-	return unittest.TestLoader().loadTestsFromTestCase(TestMessageObject)
+	tests = (
+			TestMessageObject,
+			)
 	
+	suite = unittest.TestSuite()
+	for test in tests:
+		suite.addTest(unittest.makeSuite(test))
+	return suite
+	
+	
 def test():
-	unittest.main()
+	unittest.TextTestRunner(verbosity=1).run(suite())
 
 if __name__ == '__main__':
 	test()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.