From f9913fa28a27f23fde2d4956c62cbb2fb2bc2ee8 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 21 Nov 2013 22:16:57 +0100 Subject: Boost/C++11 shared pointers. --- tests/net/maildir/maildirStoreTest.cpp | 86 +++++++++++++++++----------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'tests/net/maildir/maildirStoreTest.cpp') diff --git a/tests/net/maildir/maildirStoreTest.cpp b/tests/net/maildir/maildirStoreTest.cpp index 358e095f..34e8249c 100644 --- a/tests/net/maildir/maildirStoreTest.cpp +++ b/tests/net/maildir/maildirStoreTest.cpp @@ -187,7 +187,7 @@ public: { createMaildir(TEST_MAILDIR_KMAIL, TEST_MAILDIRFILES_KMAIL); - vmime::ref store = + vmime::shared_ptr store = vmime::dynamicCast (createAndConnectStore()); VASSERT_EQ("*", "kmail", store->getFormat()->getName()); @@ -199,7 +199,7 @@ public: { createMaildir(TEST_MAILDIR_COURIER, TEST_MAILDIRFILES_COURIER); - vmime::ref store = + vmime::shared_ptr store = vmime::dynamicCast (createAndConnectStore()); VASSERT_EQ("*", "courier", store->getFormat()->getName()); @@ -223,11 +223,11 @@ public: createMaildir(dirs, files); // Connect to store - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); // Get root folders, not recursive - const std::vector > + const std::vector > rootFolders = rootFolder->getFolders(false); VASSERT_EQ("1", 2, rootFolders.size()); @@ -253,11 +253,11 @@ public: createMaildir(dirs, files); // Connect to store - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); // Get all folders, recursive - const std::vector > + const std::vector > allFolders = rootFolder->getFolders(true); VASSERT_EQ("1", 5, allFolders.size()); @@ -285,10 +285,10 @@ public: { createMaildir(dirs, files); - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); - vmime::ref folder = store->getFolder + vmime::shared_ptr folder = store->getFolder (fpath() / "Folder" / "SubFolder" / "SubSubFolder2"); int count, unseen; @@ -298,7 +298,7 @@ public: folder->open(vmime::net::folder::MODE_READ_ONLY); - vmime::ref msg = folder->getMessage(1); + vmime::shared_ptr msg = folder->getMessage(1); folder->fetchMessage(msg, vmime::net::fetchAttributes::SIZE); @@ -346,17 +346,17 @@ public: { createMaildir(dirs, files); - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); // Rename "Folder/SubFolder" to "Folder/foo" - vmime::ref folder = store->getFolder + vmime::shared_ptr folder = store->getFolder (fpath() / "Folder" / "SubFolder"); folder->rename(fpath() / "Folder" / "foo"); // Ensure folder and its subfolders have been renamed - const std::vector > + const std::vector > allFolders = rootFolder->getFolders(true); VASSERT_EQ("1", 5, allFolders.size()); @@ -387,17 +387,17 @@ public: { createMaildir(dirs, files); - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); // Destroy "Folder/SubFolder" (total: 3 folders) - vmime::ref folder = store->getFolder + vmime::shared_ptr folder = store->getFolder (fpath() / "Folder" / "SubFolder"); folder->destroy(); // Ensure folder and its subfolders have been deleted and other folders still exist - const std::vector > + const std::vector > allFolders = rootFolder->getFolders(true); VASSERT_EQ("1", 2, allFolders.size()); @@ -425,8 +425,8 @@ public: { createMaildir(dirs, files); - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); VASSERT("1", store->getFolder(fpath() / "Folder" / "SubFolder")->exists()); VASSERT("2", !store->getFolder(fpath() / "Folder" / "SubSubFolder1")->exists()); @@ -451,8 +451,8 @@ public: { createMaildir(dirs, files); - vmime::ref store = createAndConnectStore(); - vmime::ref rootFolder = store->getRootFolder(); + vmime::shared_ptr store = createAndConnectStore(); + vmime::shared_ptr rootFolder = store->getRootFolder(); VASSERT("Before", !store->getFolder(fpath() / "Folder" / "NewFolder")->exists()); @@ -469,12 +469,12 @@ private: vmime::utility::file::path m_tempPath; - vmime::ref createAndConnectStore() + vmime::shared_ptr createAndConnectStore() { - vmime::ref session = - vmime::create (); + vmime::shared_ptr session = + vmime::make_shared (); - vmime::ref store = + vmime::shared_ptr store = session->getStore(getStoreURL()); store->connect(); @@ -482,8 +482,8 @@ private: return store; } - const vmime::ref findFolder - (const std::vector >& folders, + const vmime::shared_ptr findFolder + (const std::vector >& folders, const vmime::net::folder::path& path) { for (unsigned int i = 0, n = folders.size() ; i < n ; ++i) @@ -492,12 +492,12 @@ private: return folders[i]; } - return NULL; + return vmime::null; } const vmime::utility::url getStoreURL() { - vmime::ref fsf = + vmime::shared_ptr fsf = vmime::platform::getHandler()->getFileSystemFactory(); vmime::utility::url url(std::string("maildir://localhost") @@ -508,15 +508,15 @@ private: void createMaildir(const vmime::string* const dirs, const vmime::string* const files) { - vmime::ref fsf = + vmime::shared_ptr fsf = vmime::platform::getHandler()->getFileSystemFactory(); - vmime::ref rootDir = fsf->create(m_tempPath); + vmime::shared_ptr rootDir = fsf->create(m_tempPath); rootDir->createDirectory(false); for (vmime::string const* dir = dirs ; *dir != "*" ; ++dir) { - vmime::ref fdir = fsf->create(m_tempPath / fsf->stringToPath(*dir)); + vmime::shared_ptr fdir = fsf->create(m_tempPath / fsf->stringToPath(*dir)); fdir->createDirectory(false); } @@ -524,39 +524,39 @@ private: { const vmime::string& contents = *(file + 1); - vmime::ref ffile = fsf->create(m_tempPath / fsf->stringToPath(*file)); + vmime::shared_ptr ffile = fsf->create(m_tempPath / fsf->stringToPath(*file)); ffile->createFile(); - vmime::ref fileWriter = ffile->getFileWriter(); - vmime::ref os = fileWriter->getOutputStream(); + vmime::shared_ptr fileWriter = ffile->getFileWriter(); + vmime::shared_ptr os = fileWriter->getOutputStream(); os->write(contents.data(), contents.length()); os->flush(); - fileWriter = NULL; + fileWriter = vmime::null; } } void destroyMaildir() { - vmime::ref fsf = + vmime::shared_ptr fsf = vmime::platform::getHandler()->getFileSystemFactory(); recursiveDelete(fsf->create(m_tempPath)); } - void recursiveDelete(vmime::ref dir) + void recursiveDelete(vmime::shared_ptr dir) { if (!dir->exists() || !dir->isDirectory()) return; - vmime::ref files = dir->getFiles(); + vmime::shared_ptr files = dir->getFiles(); // First, delete files and subdirectories in this directory while (files->hasMoreElements()) { - vmime::ref file = files->nextElement(); + vmime::shared_ptr file = files->nextElement(); if (file->isDirectory()) { -- cgit v1.2.3