SF.net SVN: fclient: [176] trunk/sandbox/fcp/test_fcp/test_fcp2_0_config.py

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

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

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

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

Modified: trunk/sandbox/fcp/test_fcp/test_fcp2_0_config.py
===================================================================
--- trunk/sandbox/fcp/test_fcp/test_fcp2_0_config.py	2008-02-08 08:38:28 UTC (rev 175)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_config.py	2008-02-08 08:38:57 UTC (rev 176)
@@ -15,7 +15,9 @@
 
 from fcp2_0_client import FcpClient
 Message = FcpClient.Message
+import fcp2_0_types as types
 
+
 sys.path.pop(0)
 del parentdir
 #<-- rel import hack
@@ -32,8 +34,8 @@
 		# prep a dummy message and feed it to the config
 		class Msg:
 				params = {
-				'current.console.allowedHosts': 'true',
-				'default.console.allowedHosts': 'false',
+				'current.console.enabled': 'true',
+				'default.console.enabled': 'false',
 				}
 				
 		cfg = FcpClient.Config(Msg)
@@ -42,28 +44,39 @@
 		consoleItem = cfg.children.get('console', None)
 		self.failIf(consoleItem is None)
 				
-		allowedHosts = consoleItem.values.get('allowedHosts', None)
-		self.failIf(allowedHosts is None)
+		enabled = consoleItem.children.get('enabled', None)
+		self.failIf(enabled is None)
 		
-		current = allowedHosts.get(cfg.ValueClassCurrent, None)
-		self.assertEqual(current, 'true')
+		current = enabled.values.get(cfg.ValueClassCurrent, None)
+		self.failIf(current is None)
+		value, valueType = current
+		self.assertEqual(value, 'true')
+		self.assertEqual(valueType, types.FcpTypeBool)
 		
-		default = allowedHosts.get(cfg.ValueClassDefault, None)
-		self.assertEqual(default, 'false')
 		
-		valueType = allowedHosts.get(cfg.ValueClassType, None)
-		self.assertEqual(valueType, cfg.Keys['console.allowedHosts'])
-		
-		
+		default = enabled.values.get(cfg.ValueClassDefault, None)
+		self.failIf(default is None)
+		value, valueType = default
+		self.assertEqual(value, 'false')
+		self.assertEqual(valueType, types.FcpTypeBool)
+			
 
 #*********************************************************************************
 #
 #*********************************************************************************
 def suite():
-	return unittest.TestLoader().loadTestsFromTestCase(TestMessageObject)
+	tests = (
+			TestConfigObject,
+			)
 	
+	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.