SF.net SVN: fclient: [190] trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py

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

Revision: 190
          http://fclient.svn.sourceforge.net/fclient/?rev=190&view=rev
Author:   jurner
Date:     2008-02-08 10:54:35 -0800 (Fri, 08 Feb 2008)

Log Message:
-----------
added test for gen keypair and subscribe usk

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

Modified: trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py
===================================================================
--- trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py	2008-02-08 18:53:33 UTC (rev 189)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py	2008-02-08 18:54:35 UTC (rev 190)
@@ -473,7 +473,7 @@
 		self.failUnless(self.fcpClient.getRequests() )
 		myRequest = self.fcpClient.getRequest(myIdentifier)
 		self.assertEqual(myIdentifier, myRequest['Identifier'])
-		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Pending)
+		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Null)
 		
 	
 	def testGetData_Success(self):
@@ -534,7 +534,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Success | 
 										consts.RequestStatus.RemovedFromQueue
 										),
@@ -542,8 +542,7 @@
 				)
 		self.failIf(myIdentifier in allRequests)
 		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
-		self.assertHasNextEvent(None)
-		
+			
 	
 		# cheat a bit to test peristence == Forever (client should not remove request)
 		allRequests[myIdentifier] =myRequest
@@ -564,7 +563,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Success),
 				data=data
 				)
@@ -602,7 +601,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Error | 
 										consts.RequestStatus.RemovedFromQueue
 										)
@@ -632,7 +631,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Error
 										),
 				)
@@ -675,7 +674,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Success | 
 										consts.RequestStatus.RemovedFromQueue
 										)
@@ -715,7 +714,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Error | 
 										consts.RequestStatus.RemovedFromQueue
 										)
@@ -758,7 +757,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Success |
 										consts.RequestStatus.RemovedFromQueue
 										)
@@ -798,7 +797,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Success |
 										consts.RequestStatus.RemovedFromQueue
 										)
@@ -835,7 +834,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Pending | 
+				('FcRequestStatus', consts.RequestStatus.Null | 
 										consts.RequestStatus.Error | 
 										consts.RequestStatus.RemovedFromQueue
 										)
@@ -920,7 +919,7 @@
 		
 		# status of our request should be set to removed emidiately, but it should
 		# not be removed from the client
-		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Pending | 
+		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Null | 
 																				consts.RequestStatus.Removed
 																				)
 		self.failUnless(myIdentifier in self.fcpClient.getRequests())
@@ -1009,7 +1008,7 @@
 				self.fcpClient.events.RequestRestored,
 				consts.Message.ClientGet,
 				('Identifier', myIdentifier),
-				('FcRequestStatus', consts.RequestStatus.Null),		# no RequestStatus.Pending flag should be set here
+				('FcRequestStatus', consts.RequestStatus.Restored),		# no RequestStatus.Pending flag should be set here
 				)
 		
 		self.failUnless(myIdentifier in allRequests) 
@@ -1260,14 +1259,95 @@
 #***********************************************************************************
 #
 #***********************************************************************************
-#TODO: class TestSSKKeypair(BaseTestConnectedClient):	
+#TODO: class TestSSKKeypair(BaseTestConnectedClient):
+class TestGenerateKeypair(BaseTestConnectedClient):
+	
+	def testGeberateSSKKeypair(self):
+		myIdentifier = self.fcpClient.generateKeypair(consts.KeyType.SSK)
+		myRequest = self.fcpClient.getRequest(myIdentifier)
+		requestsAll = self.fcpClient.getRequests()
+		
+		self.sendResponseMessage(
+				'SSKKeypair',
+				Identifier=myIdentifier,
+				RequestURI='SSK@public',
+				InsertURI='SSK@private', 
+				)
+			
+		msg = self.assertHasNextEvent(
+				self.fcpClient.events.KeypairGenerated,
+				consts.Message.GenerateSSK,
+				('Identifier', myIdentifier),
+				('FcPublicKey','SSK@public'),
+				('FcPrivateKey','SSK@private'), 
+				('FcRequestStatus', consts.RequestStatus.Success | 
+													consts.RequestStatus.RemovedFromQueue
+													),
+				)
+		self.assertHasNextEvent(None)
+		self.failIf(myIdentifier in requestsAll)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+		
+		
+	def testGeberateUSKKeypair(self):
+		myIdentifier = self.fcpClient.generateKeypair(consts.KeyType.USK)
+		myRequest = self.fcpClient.getRequest(myIdentifier)
+		requestsAll = self.fcpClient.getRequests()
+		
+		self.sendResponseMessage(
+				'SSKKeypair',
+				Identifier=myIdentifier,
+				RequestURI='SSK@public',
+				InsertURI='SSK@private', 
+				)
+			
+		msg = self.assertHasNextEvent(
+				self.fcpClient.events.KeypairGenerated,
+				consts.Message.GenerateSSK,
+				('Identifier', myIdentifier),
+				('FcPublicKey','USK@public'),
+				('FcPrivateKey','USK@private'), 
+				('FcRequestStatus', consts.RequestStatus.Success | 
+													consts.RequestStatus.RemovedFromQueue
+													),
+				)
+		self.assertHasNextEvent(None)
+		self.failIf(myIdentifier in requestsAll)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)	
+	
 
 #***********************************************************************************
 #
 #***********************************************************************************
-#TODO: class TestSubscribeUSK(BaseTestConnectedClient):
+class TestSubscribeUSK(BaseTestConnectedClient):
 
 
+	def testSubscribe(self):
+		
+		myIdentifier = self.fcpClient.subscribeUSK('arbitrary')
+		myRequest = self.fcpClient.getRequest(myIdentifier)
+		requestsAll = self.fcpClient.getRequests()
+				
+		self.failUnless(myIdentifier in requestsAll)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+		
+		self.sendResponseMessage(
+				'SubscribedUSKUpdate',
+				Identifier=myIdentifier,
+				Edition=99,
+				URI='arbitryry/99/', 
+				)
+		
+		msg = self.assertHasNextEvent(
+				self.fcpClient.events.USKUpdated,
+				consts.Message.SubscribedUSKUpdate,
+				('Identifier', myIdentifier),
+				('Edition', 99),
+				('URI', 'arbitryry/99/'),
+				)
+		self.assertHasNextEvent(None)
+		
+		
 	
 #*********************************************************************************
 #
@@ -1282,6 +1362,9 @@
 			TestRestoreRequests,
 			TestDDA,
 			TestCollisions,
+			
+			TestGenerateKeypair,
+			TestSubscribeUSK,
 			)
 	
 	suite = unittest.TestSuite()


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