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

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

Revision: 429
          http://fclient.svn.sourceforge.net/fclient/?rev=429&view=rev
Author:   jUrner
Date:     2008-06-29 09:21:17 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
added tests for putData and putRedirect

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-06-29 16:21:01 UTC (rev 428)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py	2008-06-29 16:21:17 UTC (rev 429)
@@ -1887,16 +1887,18 @@
 #***********************************************************************************
 #TODO:
 #
-# SSK@, USK@
-# putFile / PutDir TestDDA
+# x. check if  TargetFilename handling is ok for CHKs
+#
 
-class Test_clientPut(BaseTestClient):
-		
-	def testPutRedirect_Success(self):
-		# request a arbitrary file
-		myIdentifier = self.client.putRedirect(
-			'my-redirect-name',
-			'SSK@arbitrary-uri',
+class Test_putData(BaseTestClient):
+	
+	def test_putData_Success(self):
+		self.connectClient()
+				
+		myKey = self.client.key.KSK('foo')
+		myIdentifier = self.client.putData(
+			myKey,
+			'any data here'
 			)
 		myRequest = self.client.getRequest(myIdentifier)
 		requestsAll = self.client.getRequests()
@@ -1907,7 +1909,7 @@
 		self.sendResponseMessage(
 				'PutSuccessful',
 				Identifier=myIdentifier,
-				URI='KSK@my-redirect-name'
+				URI=myKey
 				)
 				
 		self.assertHasNextEvent(
@@ -1921,15 +1923,18 @@
 				
 		self.assertHasNextEvent(None)
 		self.assertHasNextMessage(None)
-		self.failIf(requestsAll)		
-			
+		self.failIf(requestsAll)
 		
-	def testPutRedirect_Failure(self):
-		# request a arbitrary file
-		myIdentifier = self.client.putRedirect(
-			'my-redirect-name',
-			'SSK@arbitrary-uri',
+	
+	def test_putData_Failure(self):
+		self.connectClient()
+				
+		myKey = self.client.key.KSK('foo')
+		myIdentifier = self.client.putData(
+			myKey,
+			'any data here'
 			)
+		
 		myRequest = self.client.getRequest(myIdentifier)
 		requestsAll = self.client.getRequests()
 		
@@ -1954,12 +1959,23 @@
 		self.assertHasNextEvent(None)
 		self.assertHasNextMessage(None)
 		self.failIf(requestsAll)		
-			
 		
-	def testCHKPutData_Success(self):
+	
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_putRedirect(BaseTestClient):
+	
+	
+	def testPutRedirect_Success(self):
+		self.connectClient()
+		
 		# request a arbitrary file
-		myIdentifier = self.client.chkPutData(
-			'arbitrary data'
+		myRedirect = self.client.key.KSK('foo')
+		myKey = self.client.key.key('CHK@' + self.client.key.DummyKeyData)
+		myIdentifier = self.client.putRedirect(
+			myRedirect,
+			myKey,
 			)
 		myRequest = self.client.getRequest(myIdentifier)
 		requestsAll = self.client.getRequests()
@@ -1970,7 +1986,7 @@
 		self.sendResponseMessage(
 				'PutSuccessful',
 				Identifier=myIdentifier,
-				URI='CHK@my-redirect-name'
+				URI=myRedirect
 				)
 				
 		self.assertHasNextEvent(
@@ -1987,10 +2003,15 @@
 		self.failIf(requestsAll)		
 			
 		
-	def testCHKPutData_Failure(self):
+	def testPutRedirect_Failure(self):
+		self.connectClient()
+		
 		# request a arbitrary file
-		myIdentifier = self.client.chkPutData(
-			'arbitrary data'
+		myRedirect = self.client.key.KSK('foo')
+		myKey = self.client.key.key('CHK@' + self.client.key.DummyKeyData)
+		myIdentifier = self.client.putRedirect(
+			myRedirect,
+			myKey,
 			)
 		myRequest = self.client.getRequest(myIdentifier)
 		requestsAll = self.client.getRequests()
@@ -2016,9 +2037,13 @@
 		self.assertHasNextEvent(None)
 		self.assertHasNextMessage(None)
 		self.failIf(requestsAll)		
-		
 
-	def testCHKPutDir_Success(self):
+
+
+
+class Test_clientPut(BaseTestClient):
+
+	def XXXtestCHKPutDir_Success(self):
 		# request a arbitrary file
 		myIdentifier = self.client.chkPutDir(
 			'myDirectory'
@@ -2049,7 +2074,7 @@
 		self.failIf(requestsAll)		
 			
 		
-	def testCHKPutDir_Failure(self):
+	def XXXtestCHKPutDir_Failure(self):
 		# request a arbitrary file
 		myIdentifier = self.client.chkPutDir(
 			'myDirectory'
@@ -2080,7 +2105,7 @@
 		self.failIf(requestsAll)	
 
 
-	def testCHKPutFile_Success(self):
+	def XXXtestCHKPutFile_Success(self):
 		# request a arbitrary file
 		myIdentifier = self.client.chkPutFile(
 			'myFile.txt'
@@ -2111,7 +2136,7 @@
 		self.failIf(requestsAll)		
 			
 		
-	def testCHKPutFile_Failure(self):
+	def XXXtestCHKPutFile_Failure(self):
 		# request a arbitrary file
 		myIdentifier = self.client.chkPutFile(
 			'myFile.txt'
@@ -2143,7 +2168,7 @@
 
 
 
-	def testCHKPutMultiple_Success(self):
+	def XXXtestCHKPutMultiple_Success(self):
 		
 		items = [
 					{
@@ -2221,7 +2246,7 @@
 		self.failIf(requestsAll)		
 
 
-	def testCHKPutMultiple_ItemErrors(self):
+	def XXXtestCHKPutMultiple_ItemErrors(self):
 		
 				
 		# upload directory is not allowed
@@ -3245,23 +3270,32 @@
 			Test_iterConnect,
 			Test_CloseConnectionDuplicateClientName,
 			Test_closeNode,
+			Test_disconnectReason,
+						
 			Test_get_setConnectionName,
 			Test_get_setDebugVerbosity,
 			Test_startNode,
 			Test_versionCheckNodeHello,
+			
 			Test_handleMessage,
 			Test_next,
 			Test_run,
 			Test_sendMessage,
 			Test_getConfig,
 			Test_modifyConfig,
+			
 			Test_getData,
 			Test_getFile,
 			Test_getKeyInfo,
-			Test_disconnectReason,
 			
+			Test_putData,
+			Test_putRedirect,
+			
+			#Test_putData,
+			#Test_clientPut,
+			
 			#Test_clientGet,
-			#Test_clientPut,
+			
 			Test_requests,
 			#Test_restoreRequests,
 			#Test_resendRequests,


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