diff --git a/kmbox/mbox.cpp b/kmbox/mbox.cpp index b17e0f952..81c99ebca 100644 --- a/kmbox/mbox.cpp +++ b/kmbox/mbox.cpp @@ -1,606 +1,582 @@ /* Copyright (c) 1996-1998 Stefan Taferner Copyright (c) 2009 Bertjan Broeksema This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. NOTE: Most of the code inside here is an slightly adjusted version of kdepim/kmail/kmfoldermbox.cpp. This is why I added a copyright line for Stefan Taferner. Bertjan Broeksema, april 2009 */ #include "mbox.h" #include #include #include #include #include #include #include #include #include #include class MBox::Private { public: Private() : mInitialMboxFileSize( 0 ), mLock( 0 ) {} ~Private() { if ( mMboxFile.isOpen() ) mMboxFile.close(); if ( mLock && mLock->isLocked() ) mLock->unlock(); delete mLock; mLock = 0; } void close() { if ( mMboxFile.isOpen() ) mMboxFile.close(); mFileLocked = false; } QByteArray mAppendedEntries; QList mEntries; bool mFileLocked; quint64 mInitialMboxFileSize; KLockFile *mLock; LockType mLockType; QFile mMboxFile; QString mLockFileName; bool mReadOnly; }; /// private static methods. QByteArray quoteAndEncode(const QString &str) { return QFile::encodeName(KShell::quoteArg(str)); } /// public methods. MBox::MBox() : d(new Private()) { // Set some sane defaults d->mFileLocked = false; d->mLockType = KDELockFile; } MBox::~MBox() { if ( d->mFileLocked ) unlock(); d->close(); delete d; } qint64 MBox::appendEntry( const MessagePtr &entry ) { const QByteArray rawEntry = escapeFrom( entry->encodedContent() ); if ( rawEntry.size() <= 0 ) { kDebug() << "Message added to folder `" << d->mMboxFile.fileName() << "' contains no data. Ignoring it."; return -1; } int nextOffset = d->mAppendedEntries.size() - 1; // Offset of the appended message // Make sure the byte array is large enough to check for an end character. // Then check if the required newlines are there. if ( nextOffset >= 2 ) { if ( nextOffset > 0 && d->mAppendedEntries.at( nextOffset - 1 ) != '\n' ) { if ( d->mAppendedEntries.at( nextOffset - 1 ) != '\n' ) { d->mAppendedEntries.append( "\n\n" ); nextOffset += 2; } else { d->mAppendedEntries.append( "\n" ); ++nextOffset; } } } d->mAppendedEntries.append( mboxMessageSeparator( rawEntry ) ); d->mAppendedEntries.append( rawEntry ); if ( rawEntry[rawEntry.size() - 1] != '\n' ) { d->mAppendedEntries.append( "\n\n" ); } return d->mInitialMboxFileSize + nextOffset; } QList MBox::entryList(const QSet &deletedItems) const { Q_ASSERT(d->mMboxFile.isOpen()); QList result; foreach ( const MsgInfo &info, d->mEntries ) { if ( !deletedItems.contains( info.first ) ) result << info; } return result; } -bool MBox::isValid() const -{ - QString msg; - return isValid(msg); -} - -bool MBox::isValid(QString &errorMsg) const -{ - if ( d->mMboxFile.fileName().isEmpty() ) { - errorMsg = i18n("No file specified."); - return false; - } - - QFileInfo info(d->mMboxFile); - - if (!info.isFile()) { - errorMsg = i18n("%1 is not a file.").arg(info.absoluteFilePath()); - return false; - } - - if (!info.exists()) { - errorMsg = i18n("%1 does not exist").arg(info.absoluteFilePath()); - return false; - } - - switch (d->mLockType) { - case ProcmailLockfile: - if (KStandardDirs::findExe("lockfile").isEmpty()) { - errorMsg = i18n("Could not find the lockfile executable"); - return false; - } - break; - case MuttDotlock: // fall through - case MuttDotlockPrivileged: - if (KStandardDirs::findExe("mutt_dotlock").isEmpty()) { - errorMsg = i18n("Could not find the mutt_dotlock executable"); - return false; - } - break; - default: - break; // We assume fcntl available and lock_none doesn't need a check. - } - - // TODO: Add some heuristics to see if the file actually is a mbox file. - - return true; -} - bool MBox::load( const QString &fileName ) { if ( d->mFileLocked ) return false; d->mMboxFile.setFileName( KUrl(fileName).path() ); if ( ! d->mMboxFile.exists() ) return false; if ( ! lock() ) return false; d->mAppendedEntries.clear(); d->mEntries.clear(); QRegExp regexp("^From .*[0-9][0-9]:[0-9][0-9]"); QByteArray line; quint64 offs = 0; // The offset of the next message to read. bool previousLineIsEmpty; while ( !d->mMboxFile.atEnd() ) { quint64 pos = d->mMboxFile.pos(); previousLineIsEmpty = line.isEmpty(); line = d->mMboxFile.readLine(); if ( regexp.indexIn(line) >= 0 || d->mMboxFile.atEnd() ) { // Found the separator or at end of file, the message starts at offs quint64 msgSize = pos - offs; if( pos > 0 ) { // This is not the separator of the first mail in the file. If pos == 0 // than we matched the separator of the first mail in the file. MsgInfo info; info.first = offs; // The actual mail message size starts just before the seperator. If // there're two new line characters we assume that one of them was added // with the seperator. info.second = previousLineIsEmpty ? (msgSize - 2) : (msgSize - 1); d->mEntries << info; } offs += msgSize; // Mark the beginning of the next message. } } unlock(); // FIXME: What if unlock fails? return true; } bool MBox::lock() { if (d->mLockType == None) return true; d->mFileLocked = false; QStringList args; int rc = 0; switch(d->mLockType) { case KDELockFile: /* FIXME: Don't use the mbox file itself as lock file. if ((rc = d->mLock.lock(KLockFile::ForceFlag))) { kDebug() << "KLockFile lock failed: (" << rc << ") switching to read only mode"; d->mReadOnly = true; } */ break; // We only need to lock the file using the QReadWriteLock case ProcmailLockfile: args << "-l20" << "-r5"; if (!d->mLockFileName.isEmpty()) args << quoteAndEncode(d->mLockFileName); else args << quoteAndEncode(d->mMboxFile.fileName() + ".lock"); rc = QProcess::execute("lockfile", args); if(rc != 0) { kDebug() << "lockfile -l20 -r5 " << d->mMboxFile.fileName() << ": Failed ("<< rc << ") switching to read only mode"; d->mReadOnly = true; // In case the MBox object was created read/write we // set it to read only when locking failed. } else { d->mFileLocked = true; } break; case MuttDotlock: args << quoteAndEncode(d->mMboxFile.fileName()); rc = QProcess::execute("mutt_dotlock", args); if(rc != 0) { kDebug() << "mutt_dotlock " << d->mMboxFile.fileName() << ": Failed (" << rc << ") switching to read only mode"; d->mReadOnly = true; // In case the MBox object was created read/write we // set it to read only when locking failed. } else { d->mFileLocked = true; } break; case MuttDotlockPrivileged: args << "-p" << quoteAndEncode(d->mMboxFile.fileName()); rc = QProcess::execute("mutt_dotlock", args); if(rc != 0) { kDebug() << "mutt_dotlock -p " << d->mMboxFile.fileName() << ":" << ": Failed (" << rc << ") switching to read only mode"; d->mReadOnly = true; } else { d->mFileLocked = true; } break; case None: // This is never reached because of the check at the return 0; // beginning of the function. default: break; } if ( d->mFileLocked ) { if ( !open() ) { const bool unlocked = unlock(); Q_ASSERT( unlocked ); // If this fails we're in trouble. Q_UNUSED( unlocked ); } } return d->mFileLocked; } KMime::Message *MBox::readEntry(quint64 offset) { bool wasLocked = d->mFileLocked; if ( ! wasLocked ) if ( ! lock() ) return 0; // TODO: Add error handling in case locking failed. Q_ASSERT( d->mFileLocked ); Q_ASSERT( d->mMboxFile.isOpen() ); Q_ASSERT( d->mMboxFile.size() > 0 ); if ( offset > static_cast( d->mMboxFile.size() ) ) { unlock(); return 0; } d->mMboxFile.seek(offset); QByteArray line = d->mMboxFile.readLine(); QRegExp regexp("^From .*[0-9][0-9]:[0-9][0-9]"); if (regexp.indexIn(line) < 0) { unlock(); return 0; // The file is messed up or the index is incorrect. } QByteArray message; line = d->mMboxFile.readLine(); while (regexp.indexIn(line) < 0 && !d->mMboxFile.atEnd()) { message += line; line = d->mMboxFile.readLine(); } // Remove te last '\n' added by writeEntry. if (message.endsWith('\n')) message.chop(1); unescapeFrom(message.data(), message.size()); if ( ! wasLocked ) { const bool unlocked = unlock(); Q_ASSERT( unlocked ); Q_UNUSED( unlocked ); } KMime::Message *mail = new KMime::Message(); mail->setContent( KMime::CRLFtoLF( message ) ); mail->parse(); return mail; } QByteArray MBox::readEntryHeaders(quint64 offset) { bool wasLocked = d->mFileLocked; if ( ! wasLocked ) lock(); Q_ASSERT( d->mFileLocked ); Q_ASSERT(d->mMboxFile.isOpen()); Q_ASSERT(d->mMboxFile.size() > 0); Q_ASSERT(static_cast(d->mMboxFile.size()) > offset); d->mMboxFile.seek(offset); QByteArray headers; QByteArray line = d->mMboxFile.readLine(); while (!line[0] == '\n') { headers += line; line = d->mMboxFile.readLine(); } if ( ! wasLocked ) unlock(); return headers; } bool MBox::save( const QString &fileName ) { if ( d->mMboxFile.fileName().isEmpty() || KUrl( fileName ).path() != d->mMboxFile.fileName() ) { // File saved != file loaded from return false; // FIXME: Implement this case } if ( d->mAppendedEntries.size() == 0 ) return true; // Nothing to do. if ( !lock() ) return false; d->mMboxFile.seek( d->mMboxFile.size() ); d->mMboxFile.write( d->mAppendedEntries ); d->mAppendedEntries.clear(); unlock(); return true; } -void MBox::setLockType(LockType ltype) +bool MBox::setLockType(LockType ltype) { - if (d->mFileLocked) - return; // Don't change the method if the file is currently locked. + if (d->mFileLocked) { + kDebug() << "File is currently locked."; + return false; // Don't change the method if the file is currently locked. + } + + switch ( ltype ) { + case KDELockFile: + kDebug() << "KLockFile not supported yet"; // FIXME + return false; + case ProcmailLockfile: + if ( KStandardDirs::findExe( "lockfile" ).isEmpty() ) { + kDebug() << "Could not find the lockfile executable"; + return false; + } + break; + case MuttDotlock: // fall through + case MuttDotlockPrivileged: + if (KStandardDirs::findExe("mutt_dotlock").isEmpty()) { + kDebug() << "Could not find the mutt_dotlock executable"; + return false; + } + break; + default: + break; // We assume fcntl available and lock_none doesn't need a check. + } d->mLockType = ltype; + return true; } void MBox::setLockFile(const QString &lockFile) { d->mLockFileName = lockFile; } bool MBox::unlock() { int rc = 0; QStringList args; switch( d->mLockType ) { case KDELockFile: // FIXME //d->mLock.unlock(); break; case ProcmailLockfile: // QFile::remove returns true on succes so negate the result. if (!d->mLockFileName.isEmpty()) rc = !QFile(d->mLockFileName).remove(); else rc = !QFile(d->mMboxFile.fileName() + ".lock").remove(); break; case MuttDotlock: args << "-u" << quoteAndEncode(d->mMboxFile.fileName()); rc = QProcess::execute("mutt_dotlock", args); break; case MuttDotlockPrivileged: args << "-u" << "-p" << quoteAndEncode(d->mMboxFile.fileName()); rc = QProcess::execute("mutt_dotlock", args); break; case None: // Fall through. default: break; } if ( rc == 0 ) // Unlocking succeeded d->mFileLocked = false; d->mMboxFile.close(); return !d->mFileLocked; } /// private methods bool MBox::open() { if ( d->mMboxFile.isOpen() ) return true; // already open if ( !d->mMboxFile.open( QIODevice::ReadWrite ) ) { // messages file kDebug() << "Cannot open mbox file `" << d->mMboxFile.fileName() << "' FileError:" << d->mMboxFile.error(); return false; } return true; } QByteArray MBox::mboxMessageSeparator(const QByteArray &msg) { KMime::Message mail; mail.setHead(KMime::CRLFtoLF(msg)); mail.parse(); QByteArray seperator = "From "; KMime::Headers::From *from = mail.from(false); if (!from || from->addresses().isEmpty()) seperator += "unknown@unknown.invalid"; else seperator += from->addresses().first() + " "; KMime::Headers::Date *date = mail.date(false); if (!date || date->isEmpty()) seperator += QDateTime::currentDateTime().toString(Qt::TextDate).toUtf8() + '\n'; else seperator += date->as7BitString(false) + '\n'; return seperator; } #define STRDIM(x) (sizeof(x)/sizeof(*x)-1) QByteArray MBox::escapeFrom(const QByteArray &str) { const unsigned int strLen = str.length(); if ( strLen <= STRDIM("From ") ) return str; // worst case: \nFrom_\nFrom_\nFrom_... => grows to 7/6 QByteArray result(int( strLen + 5 ) / 6 * 7 + 1, '\0'); const char * s = str.data(); const char * const e = s + strLen - STRDIM("From "); char * d = result.data(); bool onlyAnglesAfterLF = false; // dont' match ^From_ while ( s < e ) { switch ( *s ) { case '\n': onlyAnglesAfterLF = true; break; case '>': break; case 'F': if ( onlyAnglesAfterLF && qstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 ) *d++ = '>'; // fall through default: onlyAnglesAfterLF = false; break; } *d++ = *s++; } while ( s < str.data() + strLen ) *d++ = *s++; result.truncate( d - result.data() ); return result; } // performs (\n|^)>{n}From_ -> \1>{n-1}From_ conversion void MBox::unescapeFrom(char* str, size_t strLen) { if (!str) return; if ( strLen <= STRDIM(">From ") ) return; // yes, *d++ = *s++ is a no-op as long as d == s (until after the // first >From_), but writes are cheap compared to reads and the // data is already in the cache from the read, so special-casing // might even be slower... const char * s = str; char * d = str; const char * const e = str + strLen - STRDIM(">From "); while ( s < e ) { if ( *s == '\n' && *(s+1) == '>' ) { // we can do the lookahead, since e is 6 chars from the end! *d++ = *s++; // == '\n' *d++ = *s++; // == '>' while ( s < e && *s == '>' ) *d++ = *s++; if ( qstrncmp( s, "From ", STRDIM("From ") ) == 0 ) --d; } *d++ = *s++; // yes, s might be e here, but e is not the end :-) } // copy the rest: while ( s < str + strLen ) *d++ = *s++; if ( d < s ) // only NUL-terminate if it's shorter *d = 0; } #undef STRDIM diff --git a/kmbox/mbox.h b/kmbox/mbox.h index 260748151..254cf45ef 100644 --- a/kmbox/mbox.h +++ b/kmbox/mbox.h @@ -1,200 +1,185 @@ /* Copyright (c) 2009 Bertjan Broeksema This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef MBOX_H #define MBOX_H #include #include #include #include #include "mbox_export.h" typedef QPair MsgInfo; // QPair typedef boost::shared_ptr MessagePtr; class MBOX_EXPORT MBox { public: enum LockType { KDELockFile, // Uses KLockFile ProcmailLockfile, MuttDotlock, MuttDotlockPrivileged, None }; public: MBox(); /** * Closes the file if it is still open. */ ~MBox(); /** * Appends @param entry to the MBox. Returns the offset in the file * where the added message starts or -1 if the entry was not added (e.g. * when it doesn't contain data). */ qint64 appendEntry( const MessagePtr &entry ); /** * Retrieve MsgInfo objects for all emails from the file except the * @param deleteItems. The @param deletedItems should be a list of file * offsets of messages which are deleted. * * Each MsgInfo object contains the offset and the size of the messages in * the file which are not marked as deleted. * * Note: One must call open() before calling this method. */ QList entryList(const QSet &deletedItems = QSet()) const; - /** - * Checks if the file exists and if it can be opened for read/write. Also - * checks if the selected lock method is available when it is set to - * procmail_lockfile or one of the mutt_dotlock variants. - */ - bool isValid() const; - - /** - * @see isValid() - * @param errorMsg can be used to find out what kind of error occurred and - * passed onto the user. - */ - bool isValid(QString &errorMsg) const; - - /** * Loads a mbox on disk into the current mbox. Messages already present are * *not* preserved. This method does not load the full messages into memory * but only the offsets of the messages and their sizes. If the file * currently is locked this method will do nothing and return false. * Appended messages that are not written yet will get lost. * * @param fileName the name of the mbox on disk. * @return true, if successful, false on error. * * @see save( const QString & ) */ bool load( const QString &fileName ); /** * Locks the mbox file using the configured lock method. This can be used * for consecutive calls to readEntry and readEntryHeaders. Calling lock() * before these calls prevents the mbox file being locked for every call. * * @return true if locked successful, false on error. * * @see setLockType( LockType ), unlock() */ bool lock(); /** * Reads the entire message from the file at given @param offset. If the * mbox file is not locked this method will lock the file before reading and * unlock it after reading. If the file already is locked, it will not * unlock the file after reading the entry. * * @param offset The start position of the entry in the mbox file. * @return Message at given offset or 0 if the the file could not be locked * or the offset > fileSize. * * @see lock(), unlock() */ KMime::Message *readEntry( quint64 offset ); /** * Reads the headers of the message at given @param offset. If the * mbox file is not locked this method will lock the file before reading and * unlock it after reading. If the file already is locked, it will not * unlock the file after reading the entry. * * @param offset The start position of the entry in the mbox file. * @return QByteArray containing the raw Entry data. * * @see lock(), unlock() */ QByteArray readEntryHeaders(quint64 offset); /** * Writes the mbox to disk. If the fileName is empty only appended messages * will be written to the file that was passed to load( const QString & ). * Otherwise the contents of the file that was loaded with load is copied to * @p fileName first. * * @param fileName the name of the file * @return true if the save was successful; false otherwise. * * @see load( const QString & ) */ bool save( const QString &fileName = QString() ); /** - * Sets the locktype that should be used for locking the mbox file. The - * isValid method will check if the lock method is available when the - * procmail_lockfile or one of the mutt_dotlock variants is set. + * Sets the locktype that should be used for locking the mbox file. If the + * new LockType cannot be used (e.g. the lockfile executable could not be + * found) the LockType will not be changed. * * This method will not do anything if the mbox obeject is currently locked * to make sure that it doesn't leave a locked file for one of the lockfile * / mutt_dotlock methods. */ - void setLockType(LockType ltype); + bool setLockType(LockType ltype); /** * Sets the lockfile that should be used by the procmail or the KDE lock * file method. If this method is not called and one of the before mentioned * lock methods is used the name of the lock file will be equal to * MBOXFILENAME.lock. */ void setLockFile(const QString &lockFile); /** * Unlock the mbox file. * * @return true if the unlock was successful, false otherwise. * * @see lock() */ bool unlock(); private: bool open(); static QByteArray escapeFrom(const QByteArray &msg); /** * Generates a mbox message sperator line for given message. */ static QByteArray mboxMessageSeparator(const QByteArray &msg); /** * Unescapes the raw message read from the file. */ static void unescapeFrom(char *msg, size_t size); private: class Private; Private *d; }; #endif // MBOX_H diff --git a/kmbox/tests/mboxtest.cpp b/kmbox/tests/mboxtest.cpp index 48dad958e..ed6d94e2e 100644 --- a/kmbox/tests/mboxtest.cpp +++ b/kmbox/tests/mboxtest.cpp @@ -1,147 +1,105 @@ /* Copyright (C) 2009 Bertjan Broeksema This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "mboxtest.h" #include "mboxtest.moc" #include #include #include #include #include QTEST_KDEMAIN_CORE(MboxTest) #include "../mbox.h" static const char * testDir = "libmbox-unit-test"; static const char * testFile = "test-mbox-file"; QString MboxTest::fileName() { return mTempDir->name() + testFile; } void MboxTest::initTestCase() { - /* mTempDir = new KTempDir( KStandardDirs::locateLocal("tmp", testDir ) ); QDir temp(mTempDir->name()); QVERIFY(temp.exists()); - QFile mboxfile(fileName()); - mboxfile.open(QFile::ReadWrite); - - // Put some testdata in the file. - QTextStream out(&mboxfile); - out << "From: me@me.me" << endl; - + QFile mboxfile( fileName() ); + mboxfile.open( QIODevice::WriteOnly ); mboxfile.close(); QVERIFY(mboxfile.exists()); - */ -} - -void MboxTest::testClose() -{ - /* - MBox mbox1(fileName(), true); // ReadOnly - mbox1.open(); - mbox1.close(); - - QFile mboxfile(fileName()); - QVERIFY(mboxfile.exists()); // It should not get deleted on close. - - MBox mbox2(fileName(), false); - mbox2.open(); - mbox2.close(); - - QVERIFY(mboxfile.exists()); // It should not get deleted on close. - */ } -void MboxTest::testIsValid() +void MboxTest::testSetLockMethod() { - /* - MBox mbox1(fileName(), true); // ReadOnly - QVERIFY(mbox1.isValid()); // FCNTL is the default lock method. + MBox mbox1; - if (!KStandardDirs::findExe("lockfile").isEmpty()) { - mbox1.setLockType(MBox::ProcmailLockfile); - QVERIFY(mbox1.isValid()); + if ( !KStandardDirs::findExe( "lockfile" ).isEmpty() ) { + QVERIFY( mbox1.setLockType(MBox::ProcmailLockfile) ); } else { - mbox1.setLockType(MBox::ProcmailLockfile); - QVERIFY(!mbox1.isValid()); + QVERIFY( !mbox1.setLockType( MBox::ProcmailLockfile ) ); } - if (!KStandardDirs::findExe("mutt_dotlock").isEmpty()) { - mbox1.setLockType(MBox::MuttDotlock); - QVERIFY(mbox1.isValid()); - mbox1.setLockType(MBox::MuttDotlockPrivileged); - QVERIFY(mbox1.isValid()); + if ( !KStandardDirs::findExe("mutt_dotlock").isEmpty() ) { + QVERIFY( mbox1.setLockType( MBox::MuttDotlock ) ); + QVERIFY( mbox1.setLockType( MBox::MuttDotlockPrivileged ) ); } else { - mbox1.setLockType(MBox::MuttDotlock); - QVERIFY(!mbox1.isValid()); - mbox1.setLockType(MBox::MuttDotlockPrivileged); - QVERIFY(!mbox1.isValid()); + QVERIFY( !mbox1.setLockType( MBox::MuttDotlock ) ); + QVERIFY( !mbox1.setLockType( MBox::MuttDotlockPrivileged ) ); } - mbox1.setLockType(MBox::None); - QVERIFY(mbox1.isValid()); - - MBox mbox2(fileName(), false); - QVERIFY(mbox2.isValid()); - - MBox mbox3("2_Non-ExistingFile", true); - QVERIFY(!mbox3.isValid()); - - MBox mbox4("2_Non-ExistingFile", false); - QVERIFY(!mbox4.isValid()); - */ + QVERIFY( mbox1.setLockType( MBox::None ) ); + QEXPECT_FAIL("", "KDELockFile method is not yet implmented", Continue); + QVERIFY( mbox1.setLockType( MBox::KDELockFile ) ); } void MboxTest::testProcMailLock() { /* // It really only makes sense to test this if the lockfile executable can be // found. MBox mbox(fileName(), true); mbox.setLockType(MBox::ProcmailLockfile); if (!KStandardDirs::findExe("lockfile").isEmpty()) { QVERIFY(!QFile(fileName() + ".lock").exists()); QCOMPARE(mbox.open(), 0); QVERIFY(QFile(fileName() + ".lock").exists()); mbox.close(); QVERIFY(!QFile(fileName() + ".lock").exists()); } else { QVERIFY(!QFile(fileName() + ".lock").exists()); QVERIFY(mbox.open() != 0); QEXPECT_FAIL("", "This only works when procmail is installed.", Continue); QVERIFY(QFile(fileName() + ".lock").exists()); mbox.close(); QVERIFY(!QFile(fileName() + ".lock").exists()); } */ } void MboxTest::cleanupTestCase() { mTempDir->unlink(); } diff --git a/kmbox/tests/mboxtest.h b/kmbox/tests/mboxtest.h index f51ec1e20..ccf16eee1 100644 --- a/kmbox/tests/mboxtest.h +++ b/kmbox/tests/mboxtest.h @@ -1,44 +1,43 @@ /* Copyright (c) 2009 Bertjan Broeksema This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef MBOXTEST_H #define MBOXTEST_H #include class KTempDir; class MboxTest : public QObject { Q_OBJECT private Q_SLOTS: void initTestCase(); - void testClose(); - void testIsValid(); + void testSetLockMethod(); void testProcMailLock(); void cleanupTestCase(); private: QString fileName(); private: KTempDir *mTempDir; }; #endif // MBOXTEST_H