SF.net SVN: fclient: [301] trunk/sandbox/fcp2/test_fcp/test_client.py

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

Revision: 301
          http://fclient.svn.sourceforge.net/fclient/?rev=301&view=rev
Author:   jurner
Date:     2008-02-29 05:02:56 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
added some unittests for resendRequest()

Modified Paths:
--------------
    trunk/sandbox/fcp2/test_fcp/test_client.py

Modified: trunk/sandbox/fcp2/test_fcp/test_client.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_client.py	2008-02-29 13:02:31 UTC (rev 300)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py	2008-02-29 13:02:56 UTC (rev 301)
@@ -1390,9 +1390,17 @@
 		self.assertRaises(ValueError, self.fcpClient.chkPutMultiple, items)
 			
 	
-		
+		# some sloppy tests for other key types
+		def testSSKPutData(self):
+			myIdentifier = self.fcpClient.chkPutData(
+			'arbitrary data'
+			)
+			
+			
 
 
+
+
 #***********************************************************************************
 #
 #***********************************************************************************
@@ -2006,7 +2014,117 @@
 #***********************************************************************************
 #
 #***********************************************************************************
-#TODO: class TestNodeAndPeers(BaseTestConnectedClient):		
+#TODO: class TestNodeAndPeers(BaseTestConnectedClient):
+#***********************************************************************************
+#
+#***********************************************************************************
+#TODO: some tests not yet implemented
+class TestResendRequests(BaseTestClient):
+	
+	def test_resend_CHK(self):
+		myKey = 'CHK@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,AAAAAAA/foo'
+		msg = client.message.Message(
+				consts.Message.ClientPut,
+				URI=myKey,
+				Persistence=consts.Persistence.Connection,
+				)
+		self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+		myIdentifier = msg['Identifier']
+		requestsAll = self.fcpClient.getRequests()
+						
+		newIdentifier = self.fcpClient.resendRequest(msg)
+		
+		self.failIf(myIdentifier in requestsAll)
+		self.failUnless(newIdentifier in requestsAll)
+		
+		self.assertHasNextMessage(
+				consts.Message.ClientPut,
+				('URI', 'CHK@')
+				)
+	
+	def test_resend_SSK(self):
+		myKey = 'SSK@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,AAAAAAA'
+		msg = client.message.Message(
+				consts.Message.ClientPut,
+				URI=myKey + '/foo',
+				Persistence=consts.Persistence.Connection,
+				)
+		self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+		msg['FcPrivateKey'] = myKey
+		myIdentifier = msg['Identifier']
+		requestsAll = self.fcpClient.getRequests()
+						
+		newIdentifier = self.fcpClient.resendRequest(msg)
+		
+		self.failIf(myIdentifier in requestsAll)
+		self.failUnless(newIdentifier in requestsAll)
+		
+		self.assertHasNextMessage(
+				consts.Message.ClientPut,
+				('URI', myKey + '/foo')
+				)
+		
+		
+	def test_resend_USK(self):
+		myKey = 'USK@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,AAAAAAA'
+		msg = client.message.Message(
+				consts.Message.ClientPut,
+				URI=myKey + '/foo',
+				Persistence=consts.Persistence.Connection,
+				)
+		self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+		msg['FcPrivateKey'] = myKey
+		myIdentifier = msg['Identifier']
+		requestsAll = self.fcpClient.getRequests()
+						
+		newIdentifier = self.fcpClient.resendRequest(msg)
+		
+		self.failIf(myIdentifier in requestsAll)
+		self.failUnless(newIdentifier in requestsAll)
+		
+		self.assertHasNextMessage(
+				consts.Message.ClientPut,
+				('URI', myKey + '/foo')
+				)
+	
+	def test_resend_KSK(self):
+		myKey = 'KSK@abs'
+		msg = client.message.Message(
+				consts.Message.ClientPut,
+				URI=myKey,
+				Persistence=consts.Persistence.Connection,
+				)
+		self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+		msg['FcPrivateKey'] = myKey
+		myIdentifier = msg['Identifier']
+		requestsAll = self.fcpClient.getRequests()
+						
+		newIdentifier = self.fcpClient.resendRequest(msg)
+		
+		self.failIf(myIdentifier in requestsAll)
+		self.failUnless(newIdentifier in requestsAll)
+		
+		self.assertHasNextMessage(
+				consts.Message.ClientPut,
+				('URI', myKey)
+				)
+		
+		
+	
+	def test_resend_getKeyInfo(self):
+		pass
+	
+	def test_resend_getData(self):
+		pass
+	
+	def test_resend_getFile(self):
+		pass
+	
+	def test_resend_getFile(self):
+		pass
+		
+	def test_resend_unsupportedRequest(self):
+		pass
 
 #***********************************************************************************
 #
@@ -2295,9 +2413,9 @@
 			TestClientPut,
 			TestRequests,
 			TestRestoreRequests,
+			TestResendRequests,
 			TestDDA,
 			TestCollisions,
-			
 			TestPlugins,
 			TestGenerateKeypair,
 			TestSubscribeUSK,
@@ -2315,7 +2433,7 @@
 if __name__ == "__main__":
     test()
 
-	
+test()
 
 
 


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