Swiftdiff options
| author | Vitaly Takmazov <vitalyster@gmail.com> | 2017-06-16 07:53:01 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-26 10:01:55 (GMT) |
| commit | cfd0f09744c543efb52dcfeaef8a760a766a4d71 (patch) | |
| tree | 0386838162743561dba3f32a2dded6693798c32f | |
| parent | dfe840d2d49ad609ad067460f496d2e1833aa5db (diff) | |
| download | swift-cfd0f09744c543efb52dcfeaef8a760a766a4d71.zip swift-cfd0f09744c543efb52dcfeaef8a760a766a4d71.tar.bz2 | |
Fix FileWriteBytestreamTest under Windows
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Fixes FileWriteBytestreamTest by closing WriteStream before file
deletion which passes.
Tests performed under Windows 10 1703
Change-Id: I0be891af652138af23f8db9e5526d927d39c9856
| -rw-r--r-- | Swiften/FileTransfer/FileWriteBytestream.h | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/WriteBytestream.h | 1 | ||||
| -rw-r--r-- | Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/FileWriteBytestream.h b/Swiften/FileTransfer/FileWriteBytestream.h index c563789..26ab98e 100644 --- a/Swiften/FileTransfer/FileWriteBytestream.h +++ b/Swiften/FileTransfer/FileWriteBytestream.h @@ -19,7 +19,7 @@ namespace Swift { virtual ~FileWriteBytestream(); virtual bool write(const std::vector<unsigned char>&); - void close(); + virtual void close(); private: boost::filesystem::path file; diff --git a/Swiften/FileTransfer/WriteBytestream.h b/Swiften/FileTransfer/WriteBytestream.h index 5d9c3f8..5452317 100644 --- a/Swiften/FileTransfer/WriteBytestream.h +++ b/Swiften/FileTransfer/WriteBytestream.h @@ -26,6 +26,7 @@ namespace Swift { * On success true is returned and \ref onWrite is called. On failure false is returned. */ virtual bool write(const std::vector<unsigned char>&) = 0; + virtual void close() {} boost::signals2::signal<void (const std::vector<unsigned char>&)> onWrite; }; diff --git a/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp b/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp index 7823519..393d1d7 100644 --- a/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp +++ b/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp @@ -34,7 +34,7 @@ class FileWriteBytestreamTest : public CppUnit::TestFixture { CPPUNIT_ASSERT_EQUAL(true, writeBytestream->write(createByteArray("Some data."))); CPPUNIT_ASSERT_EQUAL(true, onWriteWasCalled); - + writeBytestream->close(); boost::filesystem::remove(filename); } |