aboutsummaryrefslogtreecommitdiffstats
path: root/tests/net/maildir/maildirStoreTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/net/maildir/maildirStoreTest.cpp')
-rw-r--r--tests/net/maildir/maildirStoreTest.cpp86
1 files changed, 43 insertions, 43 deletions
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 <vmime::net::maildir::maildirStore> store =
+ vmime::shared_ptr <vmime::net::maildir::maildirStore> store =
vmime::dynamicCast <vmime::net::maildir::maildirStore>(createAndConnectStore());
VASSERT_EQ("*", "kmail", store->getFormat()->getName());
@@ -199,7 +199,7 @@ public:
{
createMaildir(TEST_MAILDIR_COURIER, TEST_MAILDIRFILES_COURIER);
- vmime::ref <vmime::net::maildir::maildirStore> store =
+ vmime::shared_ptr <vmime::net::maildir::maildirStore> store =
vmime::dynamicCast <vmime::net::maildir::maildirStore>(createAndConnectStore());
VASSERT_EQ("*", "courier", store->getFormat()->getName());
@@ -223,11 +223,11 @@ public:
createMaildir(dirs, files);
// Connect to store
- vmime::ref <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> rootFolder = store->getRootFolder();
// Get root folders, not recursive
- const std::vector <vmime::ref <vmime::net::folder> >
+ const std::vector <vmime::shared_ptr <vmime::net::folder> >
rootFolders = rootFolder->getFolders(false);
VASSERT_EQ("1", 2, rootFolders.size());
@@ -253,11 +253,11 @@ public:
createMaildir(dirs, files);
// Connect to store
- vmime::ref <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> rootFolder = store->getRootFolder();
// Get all folders, recursive
- const std::vector <vmime::ref <vmime::net::folder> >
+ const std::vector <vmime::shared_ptr <vmime::net::folder> >
allFolders = rootFolder->getFolders(true);
VASSERT_EQ("1", 5, allFolders.size());
@@ -285,10 +285,10 @@ public:
{
createMaildir(dirs, files);
- vmime::ref <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> rootFolder = store->getRootFolder();
- vmime::ref <vmime::net::folder> folder = store->getFolder
+ vmime::shared_ptr <vmime::net::folder> 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 <vmime::net::message> msg = folder->getMessage(1);
+ vmime::shared_ptr <vmime::net::message> msg = folder->getMessage(1);
folder->fetchMessage(msg, vmime::net::fetchAttributes::SIZE);
@@ -346,17 +346,17 @@ public:
{
createMaildir(dirs, files);
- vmime::ref <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> rootFolder = store->getRootFolder();
// Rename "Folder/SubFolder" to "Folder/foo"
- vmime::ref <vmime::net::folder> folder = store->getFolder
+ vmime::shared_ptr <vmime::net::folder> folder = store->getFolder
(fpath() / "Folder" / "SubFolder");
folder->rename(fpath() / "Folder" / "foo");
// Ensure folder and its subfolders have been renamed
- const std::vector <vmime::ref <vmime::net::folder> >
+ const std::vector <vmime::shared_ptr <vmime::net::folder> >
allFolders = rootFolder->getFolders(true);
VASSERT_EQ("1", 5, allFolders.size());
@@ -387,17 +387,17 @@ public:
{
createMaildir(dirs, files);
- vmime::ref <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> rootFolder = store->getRootFolder();
// Destroy "Folder/SubFolder" (total: 3 folders)
- vmime::ref <vmime::net::folder> folder = store->getFolder
+ vmime::shared_ptr <vmime::net::folder> folder = store->getFolder
(fpath() / "Folder" / "SubFolder");
folder->destroy();
// Ensure folder and its subfolders have been deleted and other folders still exist
- const std::vector <vmime::ref <vmime::net::folder> >
+ const std::vector <vmime::shared_ptr <vmime::net::folder> >
allFolders = rootFolder->getFolders(true);
VASSERT_EQ("1", 2, allFolders.size());
@@ -425,8 +425,8 @@ public:
{
createMaildir(dirs, files);
- vmime::ref <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> 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 <vmime::net::store> store = createAndConnectStore();
- vmime::ref <vmime::net::folder> rootFolder = store->getRootFolder();
+ vmime::shared_ptr <vmime::net::store> store = createAndConnectStore();
+ vmime::shared_ptr <vmime::net::folder> rootFolder = store->getRootFolder();
VASSERT("Before", !store->getFolder(fpath() / "Folder" / "NewFolder")->exists());
@@ -469,12 +469,12 @@ private:
vmime::utility::file::path m_tempPath;
- vmime::ref <vmime::net::store> createAndConnectStore()
+ vmime::shared_ptr <vmime::net::store> createAndConnectStore()
{
- vmime::ref <vmime::net::session> session =
- vmime::create <vmime::net::session>();
+ vmime::shared_ptr <vmime::net::session> session =
+ vmime::make_shared <vmime::net::session>();
- vmime::ref <vmime::net::store> store =
+ vmime::shared_ptr <vmime::net::store> store =
session->getStore(getStoreURL());
store->connect();
@@ -482,8 +482,8 @@ private:
return store;
}
- const vmime::ref <vmime::net::folder> findFolder
- (const std::vector <vmime::ref <vmime::net::folder> >& folders,
+ const vmime::shared_ptr <vmime::net::folder> findFolder
+ (const std::vector <vmime::shared_ptr <vmime::net::folder> >& 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 <vmime::utility::fileSystemFactory> fsf =
+ vmime::shared_ptr <vmime::utility::fileSystemFactory> 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 <vmime::utility::fileSystemFactory> fsf =
+ vmime::shared_ptr <vmime::utility::fileSystemFactory> fsf =
vmime::platform::getHandler()->getFileSystemFactory();
- vmime::ref <vmime::utility::file> rootDir = fsf->create(m_tempPath);
+ vmime::shared_ptr <vmime::utility::file> rootDir = fsf->create(m_tempPath);
rootDir->createDirectory(false);
for (vmime::string const* dir = dirs ; *dir != "*" ; ++dir)
{
- vmime::ref <vmime::utility::file> fdir = fsf->create(m_tempPath / fsf->stringToPath(*dir));
+ vmime::shared_ptr <vmime::utility::file> fdir = fsf->create(m_tempPath / fsf->stringToPath(*dir));
fdir->createDirectory(false);
}
@@ -524,39 +524,39 @@ private:
{
const vmime::string& contents = *(file + 1);
- vmime::ref <vmime::utility::file> ffile = fsf->create(m_tempPath / fsf->stringToPath(*file));
+ vmime::shared_ptr <vmime::utility::file> ffile = fsf->create(m_tempPath / fsf->stringToPath(*file));
ffile->createFile();
- vmime::ref <vmime::utility::fileWriter> fileWriter = ffile->getFileWriter();
- vmime::ref <vmime::utility::outputStream> os = fileWriter->getOutputStream();
+ vmime::shared_ptr <vmime::utility::fileWriter> fileWriter = ffile->getFileWriter();
+ vmime::shared_ptr <vmime::utility::outputStream> os = fileWriter->getOutputStream();
os->write(contents.data(), contents.length());
os->flush();
- fileWriter = NULL;
+ fileWriter = vmime::null;
}
}
void destroyMaildir()
{
- vmime::ref <vmime::utility::fileSystemFactory> fsf =
+ vmime::shared_ptr <vmime::utility::fileSystemFactory> fsf =
vmime::platform::getHandler()->getFileSystemFactory();
recursiveDelete(fsf->create(m_tempPath));
}
- void recursiveDelete(vmime::ref <vmime::utility::file> dir)
+ void recursiveDelete(vmime::shared_ptr <vmime::utility::file> dir)
{
if (!dir->exists() || !dir->isDirectory())
return;
- vmime::ref <vmime::utility::fileIterator> files = dir->getFiles();
+ vmime::shared_ptr <vmime::utility::fileIterator> files = dir->getFiles();
// First, delete files and subdirectories in this directory
while (files->hasMoreElements())
{
- vmime::ref <vmime::utility::file> file = files->nextElement();
+ vmime::shared_ptr <vmime::utility::file> file = files->nextElement();
if (file->isDirectory())
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 12:02:34 +0000