SF.net SVN: fclient: [465] trunk/fcp2/src/fcp2/test_fcp/test_key.py

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

Revision: 465
          http://fclient.svn.sourceforge.net/fclient/?rev=465&view=rev
Author:   jUrner
Date:     2008-07-01 04:28:16 -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_key.py

Modified: trunk/fcp2/src/fcp2/test_fcp/test_key.py
===================================================================
--- trunk/fcp2/src/fcp2/test_fcp/test_key.py	2008-07-01 11:28:03 UTC (rev 464)
+++ trunk/fcp2/src/fcp2/test_fcp/test_key.py	2008-07-01 11:28:16 UTC (rev 465)
@@ -13,36 +13,38 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp2.client import Client
-from fcp2 import consts
-from fcp2 import key
-from fcp2 import types
+import fcp2
 
-
-
 del hack
 #<-- rel import hack
+
 #****************************************************************************************
 #
 #****************************************************************************************
+# for testing some valid key data
+DummyKeyData = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,AAAAAAA'	
+
+#****************************************************************************************
+#
+#****************************************************************************************
 class Test_CHK(unittest.TestCase):
 	
 	def test_fromString(self):
 		
-		p = 'CHK@' + key.DummyKeyData + '/'
-		myKey = key.CHK.fromString(p)
-		self.assertEqual(myKey.keyData, key.DummyKeyData)
+		p = 'CHK@' + DummyKeyData + '/'
+		myKey = fcp2.KeyCHK.fromString(p)
+		self.assertEqual(myKey.keyData, DummyKeyData)
 		self.failUnless(myKey.filename is None)
 		self.assertEqual(myKey.toString(), p)
 		
-		p = 'CHK@' + key.DummyKeyData + '/foo/'
-		myKey = key.CHK.fromString(p)
-		self.assertEqual(myKey.keyData, key.DummyKeyData)
+		p = 'CHK@' + DummyKeyData + '/foo/'
+		myKey = fcp2.KeyCHK.fromString(p)
+		self.assertEqual(myKey.keyData, DummyKeyData)
 		self.assertEqual(myKey.filename, 'foo')
 		self.assertEqual(myKey.toString(), p)
 			
 		p = 'CHK@'
-		myKey = key.CHK.fromString(p)
+		myKey = fcp2.KeyCHK.fromString(p)
 		self.failUnless(myKey is None)
 	
 	


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