Updating set_body_stream_exception test case to work around file stream issue.

Author: stgates

Release/include/cpprest/containerstream.h

@@ -325,9 +325,9 @@ namespace Concurrency { namespace streams {
         {
             pos_type beg(0);
 
-            // Inorder to support relative seeking from the end postion we need to fix an end position.
+            // In order to support relative seeking from the end position we need to fix an end position.
             // Technically, there is no end for the stream buffer as new writes would just expand the buffer.
-            // For now, we assume that the current write_end is the end of the buffer. We use this aritifical
+            // For now, we assume that the current write_end is the end of the buffer. We use this artificial
             // end to restrict the read head from seeking beyond what is available.
 
             pos_type end(m_size);

Release/src/http/client/http_win7.cpp

@@ -654,7 +654,7 @@ class winhttp_client : public _http_client_communicator
         // Capture the current read position of the stream.
         auto rbuf = winhttp_context->_get_readbuffer();
 
-        // Record starting position incase request is challenged for authorization
+        // Record starting position in case request is challenged for authorization
         // and needs to seek back to where reading is started from.
         winhttp_context->m_startingPosition = rbuf.getpos(std::ios_base::in);
 

Release/tests/common/TestRunner/test_runner.cpp

@@ -381,6 +381,8 @@ bool IsTestIgnored(UnitTest::Test *pTest)
     if(pTest->m_properties.Has("Ignore:Windows")) return true;
 #elif defined(__APPLE__)
     if(pTest->m_properties.Has("Ignore:Apple")) return true;
+#elif defined(ANDROID)
+    if(pTest->m_properties.Has("Ignore:Android")) return true;
 #else
     if(pTest->m_properties.Has("Ignore:Linux")) return true;
 #endif

Release/tests/functional/http/client/request_stream_tests.cpp

@@ -316,23 +316,26 @@ class test_exception : public std::exception
     }
 };
 
-// Ignore on WinRT only CodePlex 144
+// Ignore on WinRT CodePlex 144
 #if !defined(__cplusplus_winrt)
-TEST_FIXTURE(uri_address, set_body_stream_exception)
+TEST_FIXTURE(uri_address, set_body_stream_exception,
+    "Ignore:Apple", "296",
+    "Ignore:Android", "296",
+    "Ignore:Linux", "296")
 {
-    utility::string_t fname = U("set_body_stream_exception.txt");
-    fill_file(fname);
-
     test_http_server::scoped_server scoped(m_uri);
     scoped.server();
     http_client client(m_uri);
 
-    auto stream = OPEN_R<uint8_t>(fname).get();
+    streams::producer_consumer_buffer<uint8_t> buf;
+    const char *data = "abcdefghijklmnopqrstuvwxyz";
+    buf.putn(reinterpret_cast<const uint8_t *>(data), 26).wait();
+
     http_request msg(methods::POST);
-    msg.set_body(stream);
+    msg.set_body(buf.create_istream());
     msg.headers().set_content_length(26);
 
-    stream.close(std::ios::in, std::make_exception_ptr(test_exception()));
+    buf.close(std::ios::in, std::make_exception_ptr(test_exception())).wait();
 
     VERIFY_THROWS(client.request(msg).get(), test_exception);
 }
@@ -341,7 +344,10 @@ TEST_FIXTURE(uri_address, set_body_stream_exception)
 // These tests aren't possible on WinRT because they don't
 // specify a Content-Length.
 #if !defined(__cplusplus_winrt)
-TEST_FIXTURE(uri_address, stream_close_early)
+TEST_FIXTURE(uri_address, stream_close_early,
+    "Ignore:Apple", "296",
+    "Ignore:Android", "296",
+    "Ignore:Linux", "296")
 {
     http_client client(m_uri);
     test_http_server::scoped_server scoped(m_uri);
@@ -358,16 +364,16 @@ TEST_FIXTURE(uri_address, stream_close_early)
     unsigned char data[5] = { '1', '2', '3', '4', '5' };
     buf.putn(&data[0], 5).wait();
 
-    buf.close(std::ios::out);
+    buf.close(std::ios::out).wait();
 
     // Verify that the task completes successfully
     http_asserts::assert_response_equals(responseTask.get(), status_codes::OK);
 }
 
- TEST_FIXTURE(uri_address, stream_close_early_with_exception, 
-              "Ignore", "825361",
-              "Ignore:Linux", "TBD",
-              "Ignore:Apple", "The test server has trouble closing.")
+TEST_FIXTURE(uri_address, stream_close_early_with_exception,
+    "Ignore:Apple", "296",
+    "Ignore:Android", "296",
+    "Ignore:Linux", "296")
 {
     http_client client(m_uri);
     test_http_server::scoped_server scoped(m_uri);
@@ -380,7 +386,7 @@ TEST_FIXTURE(uri_address, stream_close_early)
     unsigned char data[5] = { '1', '2', '3', '4', '5' };
     buf.putn(&data[0], 5).wait();
 
-    buf.close(std::ios::out, std::make_exception_ptr(test_exception()));
+    buf.close(std::ios::out, std::make_exception_ptr(test_exception())).wait();
 
     // Verify that the responseTask throws the exception set when closing the stream
     VERIFY_THROWS(responseTask.get(), test_exception);
@@ -389,10 +395,10 @@ TEST_FIXTURE(uri_address, stream_close_early)
 
  // Ignore on WinRT only CodePlex 144
 #if !defined(__cplusplus_winrt)
-TEST_FIXTURE(uri_address, stream_close_early_with_exception_and_contentlength, 
-            "Ignore", "825361",
-            "Ignore:Linux", "TBD", 
-            "Ignore:Apple", "The test server has trouble closing.")
+TEST_FIXTURE(uri_address, stream_close_early_with_exception_and_contentlength,
+    "Ignore:Apple", "296",
+    "Ignore:Android", "296",
+    "Ignore:Linux", "296")
 {
     http_client client(m_uri);
     test_http_server::scoped_server scoped(m_uri);
@@ -405,7 +411,7 @@ TEST_FIXTURE(uri_address, stream_close_early_with_exception_and_contentlength,
     unsigned char data[5] = { '1', '2', '3', '4', '5' };
     buf.putn(&data[0], 5).wait();
 
-    buf.close(std::ios::out, std::make_exception_ptr(test_exception()));
+    buf.close(std::ios::out, std::make_exception_ptr(test_exception())).wait();
 
     // Verify that the responseTask throws the exception set when closing the stream
     VERIFY_THROWS(responseTask.get(), test_exception);
@@ -415,9 +421,9 @@ TEST_FIXTURE(uri_address, stream_close_early_with_exception_and_contentlength,
 // Ignore on WinRT only CodePlex 144
 #if !defined(__cplusplus_winrt)
 TEST_FIXTURE(uri_address, stream_close_early_with_contentlength,
-             "Ignore", "825361",
-             "Ignore:Linux", "TBD", 
-             "Ignore:Apple", "The test server has trouble closing.")
+    "Ignore:Apple", "296",
+    "Ignore:Android", "296",
+    "Ignore:Linux", "296")
 {
     http_client client(m_uri);
     test_http_server::scoped_server scoped(m_uri);
@@ -430,7 +436,7 @@ TEST_FIXTURE(uri_address, stream_close_early_with_contentlength,
     unsigned char data[5] = { '1', '2', '3', '4', '5' };
     buf.putn(&data[0], 5).wait();
 
-    buf.close(std::ios::out);
+    buf.close(std::ios::out).wait();
 
     // Verify that the responseTask throws the exception set when closing the stream
     VERIFY_THROWS(responseTask.get(), http_exception);