Changeset 2446 for box/trunk/test

Timestamp:

09/01/2009 10:19:46 (3 years ago)

Author:

chris

Message:

Add support for PUT requests in HTTP simulator.

File:

• box/trunk/test/httpserver/testhttpserver.cpp (modified) (3 diffs)

box/trunk/test/httpserver/testhttpserver.cpp

@@ -348 +348 @@
                 
         HTTPResponse GetObject(const std::string& rObjectURI);
+        HTTPResponse PutObject(const std::string& rObjectURI,
+                IOStream& rStreamToSend, const char* pContentType = NULL);
 
         private:
@@ -368 +370 @@
 {
         return FinishAndSendRequest(HTTPRequest::Method_GET, rObjectURI);
+}
+
+HTTPResponse S3Client::PutObject(const std::string& rObjectURI,
+        IOStream& rStreamToSend, const char* pContentType)
+{
+        return FinishAndSendRequest(HTTPRequest::Method_PUT, rObjectURI,
+                &rStreamToSend, pContentType);
 }
 
@@ -684 +693 @@
                 TEST_EQUAL("omgpuppies!\n", response_data);
 
+                // make sure that assigning to HTTPResponse does clear stream
+                response = client.GetObject("/photos/puppy.jpg");
+                TEST_EQUAL(200, response.GetResponseCode());
+                response_data = std::string((const char *)response.GetBuffer(),
+                        response.GetSize());
+                TEST_EQUAL("omgpuppies!\n", response_data);
+
                 response = client.GetObject("/nonexist");
                 TEST_EQUAL(404, response.GetResponseCode());
+                
+                FileStream fs("testfiles/testrequests.pl");
+                response = client.PutObject("/newfile", fs);
+                TEST_EQUAL(200, response.GetResponseCode());
+
+                response = client.GetObject("/newfile");
+                TEST_EQUAL(200, response.GetResponseCode());
+                TEST_THAT(fs.CompareWith(response));
+                TEST_EQUAL(0, ::unlink("testfiles/newfile"));
         }