diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp index 31699ff33..162bfa5e2 100644 --- a/Net/testsuite/src/SocketTest.cpp +++ b/Net/testsuite/src/SocketTest.cpp @@ -736,7 +736,9 @@ void SocketTest::testSendFile() ostr.close(); Poco::FileInputStream istr(file.path()); - ss.sendFile(istr); + std::streamsize n = ss.sendFile(istr); + assertTrue (n == file.getSize()); + istr.close(); ss.close(); @@ -771,7 +773,9 @@ void SocketTest::testSendFileLarge() ostr.close(); Poco::FileInputStream istr(file.path()); - ss.sendFile(istr); + std::streamsize n = ss.sendFile(istr); + assertTrue (n == file.getSize()); + istr.close(); ss.close(); @@ -809,7 +813,9 @@ void SocketTest::testSendFileRange() const std::streamsize count = 10000; Poco::FileInputStream istr(file.path()); - ss.sendFile(istr, offset, count); + std::streamsize n = ss.sendFile(istr, offset, count); + assertTrue (n == count); + istr.close(); ss.close(); diff --git a/NetSSL_OpenSSL/testsuite/src/SecureStreamSocketTest.cpp b/NetSSL_OpenSSL/testsuite/src/SecureStreamSocketTest.cpp index ddf6006f1..7521c22ba 100644 --- a/NetSSL_OpenSSL/testsuite/src/SecureStreamSocketTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/SecureStreamSocketTest.cpp @@ -259,7 +259,9 @@ void SecureStreamSocketTest::testSendFile() ostr.close(); Poco::FileInputStream istr(file.path()); - ss.sendFile(istr); + std::streamsize n = ss.sendFile(istr); + assertTrue (n == file.getSize()); + istr.close(); ss.close(); @@ -294,7 +296,9 @@ void SecureStreamSocketTest::testSendFileLarge() ostr.close(); Poco::FileInputStream istr(file.path()); - ss.sendFile(istr); + std::streamsize n = ss.sendFile(istr); + assertTrue (n == file.getSize()); + istr.close(); ss.close(); @@ -332,7 +336,9 @@ void SecureStreamSocketTest::testSendFileRange() const std::streamsize count = 10000; Poco::FileInputStream istr(file.path()); - ss.sendFile(istr, offset, count); + std::streamsize n = ss.sendFile(istr, offset, count); + assertTrue (n == count); + istr.close(); ss.close(); @@ -341,9 +347,6 @@ void SecureStreamSocketTest::testSendFileRange() Poco::Thread::sleep(100); } - std::cout << "\n" << fileData.size() << std::endl; - std::cout << "\n" << CopyToStringConnection::data().size() << std::endl; - assertTrue (CopyToStringConnection::data() == fileData.substr(offset, count)); }