SF.net SVN: fclient: [464] trunk/fcp2/src/fcp2/test_fcp/test_config.py

[<jU...@us...>]

Revision: 464
          http://fclient.svn.sourceforge.net/fclient/?rev=464&view=rev
Author:   jUrner
Date:     2008-07-01 04:28:03 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
for ease of use, all necessary symbols are now imported to main

Modified Paths:
--------------
    trunk/fcp2/src/fcp2/test_fcp/test_config.py

Modified: trunk/fcp2/src/fcp2/test_fcp/test_config.py
===================================================================
--- trunk/fcp2/src/fcp2/test_fcp/test_config.py	2008-07-01 11:27:56 UTC (rev 463)
+++ trunk/fcp2/src/fcp2/test_fcp/test_config.py	2008-07-01 11:28:03 UTC (rev 464)
@@ -13,12 +13,8 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp2.client import Client
-from fcp2 import consts
-from fcp2 import types
+import fcp2
 
-
-
 del hack
 #<-- rel import hack
 #****************************************************************************************
@@ -35,7 +31,7 @@
 				'default.console.enabled': 'false',
 				}
 				
-		cfg = Client.config.Config(Msg)
+		cfg = fcp2.Config(Msg)
 		
 		# check if all items and values have been set as expected
 		consoleItem = cfg.children.get('console', None)
@@ -44,18 +40,18 @@
 		enabled = consoleItem.children.get('enabled', None)
 		self.failIf(enabled is None)
 		
-		current = enabled.values.get(consts.ConfigValueClass.Current, None)
+		current = enabled.values.get(fcp2.ConfigValueClass.Current, None)
 		self.failIf(current is None)
 		value, valueType = current
 		self.assertEqual(value, 'true')
-		self.assertEqual(valueType, types.FcpTypeBool)
+		self.assertEqual(valueType, fcp2.TypeBool)
 		
 		
-		default = enabled.values.get(consts.ConfigValueClass.Default, None)
+		default = enabled.values.get(fcp2.ConfigValueClass.Default, None)
 		self.failIf(default is None)
 		value, valueType = default
 		self.assertEqual(value, 'false')
-		self.assertEqual(valueType, types.FcpTypeBool)
+		self.assertEqual(valueType, fcp2.TypeBool)
 			
 
 #*********************************************************************************


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