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 /Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp | |
| 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
Diffstat (limited to 'Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp')
| -rw-r--r-- | Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ -7,52 +7,52 @@ #include <boost/bind.hpp> #include <boost/filesystem.hpp> #include <boost/signals2.hpp> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> #include <Swiften/Base/ByteArray.h> #include <Swiften/FileTransfer/FileWriteBytestream.h> using namespace Swift; class FileWriteBytestreamTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(FileWriteBytestreamTest); CPPUNIT_TEST(testSuccessfulWrite); CPPUNIT_TEST(testFailingWrite); CPPUNIT_TEST_SUITE_END(); public: void setUp() { onWriteWasCalled = false; } void testSuccessfulWrite() { boost::filesystem::path filename = boost::filesystem::unique_path("write_file_bytestream_test_%%%%%%%%%%%%%%%%.bin"); std::shared_ptr<WriteBytestream> writeBytestream = std::make_shared<FileWriteBytestream>(filename.string()); writeBytestream->onWrite.connect(boost::bind(&FileWriteBytestreamTest::handleOnWrite, this, _1)); CPPUNIT_ASSERT_EQUAL(true, writeBytestream->write(createByteArray("Some data."))); CPPUNIT_ASSERT_EQUAL(true, onWriteWasCalled); - + writeBytestream->close(); boost::filesystem::remove(filename); } void testFailingWrite() { std::shared_ptr<WriteBytestream> writeBytestream = std::make_shared<FileWriteBytestream>(""); writeBytestream->onWrite.connect(boost::bind(&FileWriteBytestreamTest::handleOnWrite, this, _1)); CPPUNIT_ASSERT_EQUAL(false, writeBytestream->write(createByteArray("Some data."))); CPPUNIT_ASSERT_EQUAL(false, onWriteWasCalled); } void handleOnWrite(const std::vector<unsigned char>& /*data*/) { onWriteWasCalled = true; } private: bool onWriteWasCalled; }; CPPUNIT_TEST_SUITE_REGISTRATION(FileWriteBytestreamTest); |