src/capabilities/unittest/unittest.pro
src/modules.pri
src/privacy/unittest/unittest.pro
src/unittest/unittest.pro
src/utilities/unittest/unittest.pro
@@ -37,6 +37,9 @@ src/Makefile
src/config.h
src/psi.app
src/psi
+src/capabilities/unittest/Makefile
+src/unittest/Makefile
+src/utilities/unittest/Makefile
src/AutoUpdater/guitest/Makefile
src/AutoUpdater/guitest/testapp-2.0/Makefile
src/AutoUpdater/guitest/testapp-2.0/testapp.app
@@ -44,4 +47,4 @@ src/AutoUpdater/guitest/testapp-2.0/testapp-2.0.zip
src/AutoUpdater/guitest/testapp/Makefile
src/AutoUpdater/guitest/testapp/testapp.app
src/plugins/*/*/Makefile
-
+checker
.gitignore
@@ -41,7 +41,6 @@ Dependency options:
--disable-aspell Disable use of ASPELL
--with-aspell-inc=[path] Path to Aspell include files
--with-aspell-lib=[path] Path to Aspell library files
- --enable-tests Enable use of Tests
--enable-debug Enable debugging support
EOT
@@ -249,11 +248,6 @@ while [ $# -gt 0 ]; do
shift
;;
- --enable-tests)
- QC_ENABLE_tests="Y"
- shift
- ;;
-
--enable-debug)
QC_ENABLE_DEBUG="Y"
shift
@@ -298,7 +292,6 @@ echo QC_DISABLE_ghbnr=$QC_DISABLE_ghbnr
echo QC_DISABLE_aspell=$QC_DISABLE_aspell
echo QC_WITH_ASPELL_INC=$QC_WITH_ASPELL_INC
echo QC_WITH_ASPELL_LIB=$QC_WITH_ASPELL_LIB
-echo QC_ENABLE_tests=$QC_ENABLE_tests
echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
echo
fi
@@ -1140,28 +1133,6 @@ public:
return true;
}
};
-#line 1 "tests.qcm"
-/*
------BEGIN QCMOD-----
-name: Tests
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_tests
-//----------------------------------------------------------------------------
-class qc_tests : public ConfObj
-{
-public:
- qc_tests(Conf *c) : ConfObj(c) {}
- QString name() const { return "tests"; }
- QString shortname() const { return "tests"; }
- bool exec()
- {
- conf->addExtra("CONFIG += tests");
- return true;
- }
-};
#line 1 "debug.qcm"
/*
-----BEGIN QCMOD-----
@@ -1264,9 +1235,6 @@ cat >$1/modules_new.cpp <<EOT
o = new qc_aspell(conf);
o->required = false;
o->disabled = false;
- o = new qc_tests(conf);
- o->required = false;
- o->disabled = true;
o = new qc_debug(conf);
o->required = true;
o->disabled = false;
@@ -2259,7 +2227,6 @@ export QC_DISABLE_ghbnr
export QC_DISABLE_aspell
export QC_WITH_ASPELL_INC
export QC_WITH_ASPELL_LIB
-export QC_ENABLE_tests
export QC_ENABLE_DEBUG
export QC_VERBOSE
rm -rf .qconftemp
configure
@@ -18,13 +18,3 @@ qca-static {
SUBDIRS += \
iris \
src
-
-tests {
- SUBDIRS += \
- third-party/cppunit \
- qa/unittest \
- qa/guitest
-
- QMAKE_EXTRA_TARGETS += check
- check.commands += make -C qa/unittest check
-}
psi.pro
@@ -27,9 +27,6 @@
<dep type='xss'/>
<dep type='ghbnr'/>
<dep type='aspell'/>
- <dep type='tests'>
- <disabled/>
- </dep>
<dep type='debug'>
<required/>
</dep>
psi.qc
@@ -29,7 +29,6 @@
#include <QStringList>
#include <QTimer>
#include <QPair>
-#include <QApplication>
#include <QDebug>
#include "capsregistry.h"
src/capabilities/capsmanager.cpp
@@ -18,7 +18,7 @@
*
*/
-#include <QApplication>
+#include <QCoreApplication>
#include <QDebug>
#include <QTextCodec>
#include <QFile>
src/capabilities/capsregistry.cpp
@@ -5,12 +5,13 @@
// FIXME: This test suite is far from complete
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <QObject>
+#include <QtTest/QtTest>
+#include "qttestutil/qttestutil.h"
#include "protocol/discoinfoquerier.h"
-#include "xmpp_jid.h"
-#include "capsmanager.h"
+#include "xmpp/jid/jid.h"
+#include "capabilities/capsmanager.h"
using namespace XMPP;
@@ -57,127 +58,92 @@ public:
// -----------------------------------------------------------------------------
-class CapsManagerTest : public CppUnit::TestFixture
+class CapsManagerTest : public QObject
{
- CPPUNIT_TEST_SUITE(CapsManagerTest);
+ Q_OBJECT
- CPPUNIT_TEST(testUpdateCaps);
-
- CPPUNIT_TEST(testCapsEnabled);
- CPPUNIT_TEST(testCapsEnabled_NoCaps);
-
- CPPUNIT_TEST(testDisableCaps);
-
- CPPUNIT_TEST_SUITE_END();
-
-public:
- CapsManagerTest();
-
- void setUp();
- void tearDown();
-
- void addContact(const QString& jid, const QString& client, const QString& version, const QStringList& capabilities);
- CapsManager* createManager(const QString& jid);
-
- void testUpdateCaps();
- void testCapsEnabled();
- void testCapsEnabled_NoCaps();
- void testDisableCaps();
-
-private:
- CapsRegistry registry_;
- TestDiscoInfoQuerier* querier_;
- CapsManager* manager_;
-};
+ private slots:
+ void initTestCase() {
+ manager_ = NULL;
+ querier_ = new TestDiscoInfoQuerier();
+ }
-CPPUNIT_TEST_SUITE_REGISTRATION(CapsManagerTest);
+ void cleanupTestCase() {
+ delete manager_;
+ }
-// -----------------------------------------------------------------------------
+ void testUpdateCaps()
+ {
+ QStringList capabilities;
+ capabilities << "c1" << "c2" << "c3";
+ addContact("you@example.com/a", "myclient", "myversion", capabilities);
+ CapsManager* manager = createManager("me@example.com");
+
+ manager->updateCaps("you@example.com/a", "myclient", "myversion", "c1 c2");
+ XMPP::Features features(manager->features("you@example.com/a"));
+
+ QCOMPARE(querier_->nb_getdiscoinfo_called_, 3U);
+ QVERIFY(features.test(QStringList("myversion_f1")));
+ QVERIFY(features.test(QStringList("c1_f1")));
+ QVERIFY(features.test(QStringList("c1_f2")));
+ QVERIFY(features.test(QStringList("c2_f1")));
+ QVERIFY(features.test(QStringList("c2_f2")));
+ }
-CapsManagerTest::CapsManagerTest()
-{
-}
+ void testCapsEnabled() {
+ QStringList capabilities;
+ capabilities << "c1" << "c2";
+ addContact("you@example.com/a", "myclient", "myversion", capabilities);
+ CapsManager* manager = createManager("me@example.com");
-void CapsManagerTest::setUp()
-{
- manager_ = NULL;
- querier_ = new TestDiscoInfoQuerier();
-}
+ manager->updateCaps("you@example.com/a", "myclient", "myversion", "c1 c2");
-void CapsManagerTest::tearDown()
-{
- delete manager_;
-}
-
-CapsManager* CapsManagerTest::createManager(const QString& jid)
-{
- manager_ = new CapsManager(jid, ®istry_, querier_);
- return manager_;
-}
-
-void CapsManagerTest::addContact(const QString& jid, const QString& client,
-const QString& version, const QStringList& capabilities)
-{
- XMPP::DiscoItem i;
- i.setFeatures(XMPP::Features(version + "_f1"));
- querier_->addInfo(jid, client + "#" + version, i);
-
- foreach(QString s, capabilities) {
- XMPP::DiscoItem i2;
- QStringList f;
- f << s + "_f1" << s + "_f2";
- i2.setFeatures(XMPP::Features(f));
- querier_->addInfo(jid, client + "#" + s, i2);
- }
-}
+ QVERIFY(manager->capsEnabled("you@example.com/a"));
+ }
+ void testCapsEnabled_NoCaps() {
+ CapsManager* manager = createManager("me@example.com/a");
-void CapsManagerTest::testUpdateCaps()
-{
- QStringList capabilities;
- capabilities << "c1" << "c2" << "c3";
- addContact("you@example.com/a", "myclient", "myversion", capabilities);
- CapsManager* manager = createManager("me@example.com");
-
- manager->updateCaps("you@example.com/a", "myclient", "myversion", "c1 c2");
- XMPP::Features features(manager->features("you@example.com/a"));
-
- CPPUNIT_ASSERT_EQUAL(3U, querier_->nb_getdiscoinfo_called_);
- CPPUNIT_ASSERT(features.test(QStringList("myversion_f1")));
- CPPUNIT_ASSERT(features.test(QStringList("c1_f1")));
- CPPUNIT_ASSERT(features.test(QStringList("c1_f2")));
- CPPUNIT_ASSERT(features.test(QStringList("c2_f1")));
- CPPUNIT_ASSERT(features.test(QStringList("c2_f2")));
-}
-
-void CapsManagerTest::testCapsEnabled()
-{
- QStringList capabilities;
- capabilities << "c1" << "c2";
- addContact("you@example.com/a", "myclient", "myversion", capabilities);
- CapsManager* manager = createManager("me@example.com");
+ QVERIFY(!manager->capsEnabled("you@example.com/b"));
+ }
- manager->updateCaps("you@example.com/a", "myclient", "myversion", "c1 c2");
+ void testDisableCaps() {
+ QStringList capabilities;
+ capabilities << "c1" << "c2";
+ addContact("you@example.com/a", "myclient", "myversion", capabilities);
+ CapsManager* manager = createManager("me@example.com");
+ manager->updateCaps("you@example.com/a", "myclient", "myversion", "c1 c2");
- CPPUNIT_ASSERT(manager->capsEnabled("you@example.com/a"));
-}
+ manager->disableCaps("you@example.com/a");
-void CapsManagerTest::testCapsEnabled_NoCaps()
-{
- CapsManager* manager = createManager("me@example.com/a");
+ QVERIFY(!manager->capsEnabled("you@example.com/a"));
+ }
- CPPUNIT_ASSERT(!manager->capsEnabled("you@example.com/b"));
-}
+ private:
+ void addContact(const QString& jid, const QString& client, const QString& version, const QStringList& capabilities) {
+ XMPP::DiscoItem i;
+ i.setFeatures(XMPP::Features(version + "_f1"));
+ querier_->addInfo(jid, client + "#" + version, i);
+
+ foreach(QString s, capabilities) {
+ XMPP::DiscoItem i2;
+ QStringList f;
+ f << s + "_f1" << s + "_f2";
+ i2.setFeatures(XMPP::Features(f));
+ querier_->addInfo(jid, client + "#" + s, i2);
+ }
+ }
-void CapsManagerTest::testDisableCaps()
-{
- QStringList capabilities;
- capabilities << "c1" << "c2";
- addContact("you@example.com/a", "myclient", "myversion", capabilities);
- CapsManager* manager = createManager("me@example.com");
- manager->updateCaps("you@example.com/a", "myclient", "myversion", "c1 c2");
+ CapsManager* createManager(const QString& jid) {
+ manager_ = new CapsManager(jid, ®istry_, querier_);
+ return manager_;
+ }
- manager->disableCaps("you@example.com/a");
+ private:
+ CapsRegistry registry_;
+ TestDiscoInfoQuerier* querier_;
+ CapsManager* manager_;
+};
- CPPUNIT_ASSERT(!manager->capsEnabled("you@example.com/a"));
-}
+QTTESTUTIL_REGISTER_TEST(CapsManagerTest);
+#include "capsmanagertest.moc"
src/capabilities/unittest/capsmanagertest.cpp
@@ -2,123 +2,84 @@
* Copyright (C) 2007, Remko Troncon
*/
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <QObject>
+#include <QtTest/QtTest>
-#include "capsspec.h"
+#include "qttestutil/qttestutil.h"
+#include "capabilities/capsspec.h"
-// -----------------------------------------------------------------------------
-
-class CapsSpecTest : public CppUnit::TestFixture
+class CapsSpecTest : public QObject
{
- CPPUNIT_TEST_SUITE(CapsSpecTest);
- CPPUNIT_TEST(testConstructor);
+ Q_OBJECT
- CPPUNIT_TEST(testEqualsNotEquals_Equal);
- CPPUNIT_TEST(testEqualsNotEquals_NotEqual);
+ private slots:
+ void testConstructor() {
+ CapsSpec c("a","b","c d");
- CPPUNIT_TEST(testSmallerThan);
- CPPUNIT_TEST(testSmallerThan_SameNode);
- CPPUNIT_TEST(testSmallerThan_SameNodeVersion);
- CPPUNIT_TEST(testSmallerThan_Equals);
+ QVERIFY(c.node() == "a");
+ QVERIFY(c.version() == "b");
+ QVERIFY(c.extensions() == "c d");
+ }
- CPPUNIT_TEST(testFlatten);
+ void testEqualsNotEquals_Equal() {
+ CapsSpec c1("a","b","c d");
+ CapsSpec c2("a","b","c d");
- CPPUNIT_TEST_SUITE_END();
+ QVERIFY(c1 == c2);
+ QVERIFY(!(c1 != c2));
+ }
-public:
- CapsSpecTest();
+ void testEqualsNotEquals_NotEqual() {
+ CapsSpec c1("a","b","c d");
+ CapsSpec c2("a","e","c d");
- void testConstructor();
- void testFlatten();
- void testEqualsNotEquals_Equal();
- void testEqualsNotEquals_NotEqual();
- void testSmallerThan();
- void testSmallerThan_SameNode();
- void testSmallerThan_SameNodeVersion();
- void testSmallerThan_Equals();
-};
+ QVERIFY(!(c1 == c2));
+ QVERIFY(c1 != c2);
+ }
-CPPUNIT_TEST_SUITE_REGISTRATION(CapsSpecTest);
+ void testSmallerThan() {
+ CapsSpec c1("a","b","c");
+ CapsSpec c2("d","e","f");
-// -----------------------------------------------------------------------------
+ QVERIFY(c1 < c2);
+ QVERIFY(!(c2 < c1));
+ }
-CapsSpecTest::CapsSpecTest()
-{
-}
+ void testSmallerThan_SameNode() {
+ CapsSpec c1("a","b","c");
+ CapsSpec c2("a","e","f");
-void CapsSpecTest::testConstructor()
-{
- CapsSpec c("a","b","c d");
+ QVERIFY(c1 < c2);
+ QVERIFY(!(c2 < c1));
+ }
- CPPUNIT_ASSERT(c.node() == "a");
- CPPUNIT_ASSERT(c.version() == "b");
- CPPUNIT_ASSERT(c.extensions() == "c d");
-}
+ void testSmallerThan_SameNodeVersion() {
+ CapsSpec c1("a","b","c");
+ CapsSpec c2("a","b","f");
-void CapsSpecTest::testEqualsNotEquals_Equal()
-{
- CapsSpec c1("a","b","c d");
- CapsSpec c2("a","b","c d");
+ QVERIFY(c1 < c2);
+ QVERIFY(!(c2 < c1));
+ }
- CPPUNIT_ASSERT(c1 == c2);
- CPPUNIT_ASSERT(!(c1 != c2));
-}
+ void testSmallerThan_Equals() {
+ CapsSpec c1("a","b","c");
+ CapsSpec c2("a","b","c");
-void CapsSpecTest::testEqualsNotEquals_NotEqual()
-{
- CapsSpec c1("a","b","c d");
- CapsSpec c2("a","e","c d");
+ QVERIFY(!(c1 < c2));
+ QVERIFY(!(c2 < c1));
+ }
- CPPUNIT_ASSERT(!(c1 == c2));
- CPPUNIT_ASSERT(c1 != c2);
-}
-
-void CapsSpecTest::testSmallerThan()
-{
- CapsSpec c1("a","b","c");
- CapsSpec c2("d","e","f");
-
- CPPUNIT_ASSERT(c1 < c2);
- CPPUNIT_ASSERT(!(c2 < c1));
-}
-
-void CapsSpecTest::testSmallerThan_SameNode()
-{
- CapsSpec c1("a","b","c");
- CapsSpec c2("a","e","f");
+ void testFlatten() {
+ CapsSpec c("a","b","c d");
- CPPUNIT_ASSERT(c1 < c2);
- CPPUNIT_ASSERT(!(c2 < c1));
-}
+ CapsSpecs cs = c.flatten();
-void CapsSpecTest::testSmallerThan_SameNodeVersion()
-{
- CapsSpec c1("a","b","c");
- CapsSpec c2("a","b","f");
-
- CPPUNIT_ASSERT(c1 < c2);
- CPPUNIT_ASSERT(!(c2 < c1));
-}
-
-void CapsSpecTest::testSmallerThan_Equals()
-{
- CapsSpec c1("a","b","c");
- CapsSpec c2("a","b","c");
-
- CPPUNIT_ASSERT(!(c1 < c2));
- CPPUNIT_ASSERT(!(c2 < c1));
-}
-
-void CapsSpecTest::testFlatten()
-{
- CapsSpec c("a","b","c d");
-
- CapsSpecs cs = c.flatten();
-
- CPPUNIT_ASSERT_EQUAL(3, cs.count());
- CPPUNIT_ASSERT(cs[0] == CapsSpec("a", "b", "b"));
- CPPUNIT_ASSERT(cs[1] == CapsSpec("a", "b", "c"));
- CPPUNIT_ASSERT(cs[2] == CapsSpec("a", "b", "d"));
-}
+ QCOMPARE(cs.count(), 3);
+ QVERIFY(cs[0] == CapsSpec("a", "b", "b"));
+ QVERIFY(cs[1] == CapsSpec("a", "b", "c"));
+ QVERIFY(cs[2] == CapsSpec("a", "b", "d"));
+ }
+};
+QTTESTUTIL_REGISTER_TEST(CapsSpecTest);
+#include "capsspectest.moc"
src/capabilities/unittest/capsspectest.cpp
@@ -1,3 +1,3 @@
SOURCES += \
- $$PWD/capsspectest.cpp \
- $$PWD/capsmanagertest.cpp
+ $$PWD/capsmanagertest.cpp \
+ $$PWD/capsspectest.cpp
src/capabilities/unittest/unittest.pri
@@ -2,72 +2,43 @@
* Copyright (C) 2007, Remko Troncon
*/
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <QObject>
+#include <QtTest/QtTest>
+#include "qttestutil/qttestutil.h"
#include "common.h"
int versionStringToInt(const char* version);
-// -----------------------------------------------------------------------------
-
-class CommonTest : public CppUnit::TestFixture
+class CommonTest : public QObject
{
- CPPUNIT_TEST_SUITE(CommonTest);
-
- CPPUNIT_TEST(testVersionStringToInt);
- CPPUNIT_TEST(testVersionStringToInt_TooManyParts);
- CPPUNIT_TEST(testVersionStringToInt_TooFewParts);
- CPPUNIT_TEST(testVersionStringToInt_NonNumericPart);
- CPPUNIT_TEST(testVersionStringToInt_TooBigPart);
- CPPUNIT_TEST(testVersionStringToInt_TooSmallPart);
-
- CPPUNIT_TEST_SUITE_END();
-
-public:
- CommonTest();
+ Q_OBJECT
- void testVersionStringToInt();
- void testVersionStringToInt_TooManyParts();
- void testVersionStringToInt_TooFewParts();
- void testVersionStringToInt_NonNumericPart();
- void testVersionStringToInt_TooBigPart();
- void testVersionStringToInt_TooSmallPart();
-};
+ private slots:
+ void testVersionStringToInt() {
+ QCOMPARE(versionStringToInt("4.3.0"), 0x00040300);
+ }
-CPPUNIT_TEST_SUITE_REGISTRATION(CommonTest);
+ void testVersionStringToInt_TooManyParts() {
+ QCOMPARE(versionStringToInt("4.3.0.1"), 0);
+ }
-CommonTest::CommonTest()
-{
-}
+ void testVersionStringToInt_TooFewParts() {
+ QCOMPARE(versionStringToInt("4.3"), 0);
+ }
-void CommonTest::testVersionStringToInt()
-{
- CPPUNIT_ASSERT_EQUAL(0x00040300, versionStringToInt("4.3.0"));
-}
+ void testVersionStringToInt_NonNumericPart() {
+ QCOMPARE(versionStringToInt("4.A.3"), 0);
+ }
-void CommonTest::testVersionStringToInt_TooManyParts()
-{
- CPPUNIT_ASSERT_EQUAL(0, versionStringToInt("4.3.0.1"));
-}
+ void testVersionStringToInt_TooBigPart() {
+ QCOMPARE(versionStringToInt("4.256.4"), 0);
+ }
-void CommonTest::testVersionStringToInt_TooFewParts()
-{
- CPPUNIT_ASSERT_EQUAL(0, versionStringToInt("4.3"));
-}
-
-void CommonTest::testVersionStringToInt_NonNumericPart()
-{
- CPPUNIT_ASSERT_EQUAL(0, versionStringToInt("4.A.3"));
-}
-
-void CommonTest::testVersionStringToInt_TooBigPart()
-{
- CPPUNIT_ASSERT_EQUAL(0, versionStringToInt("4.256.4"));
-}
+ void testVersionStringToInt_TooSmallPart() {
+ QCOMPARE(versionStringToInt("4.-1.4"), 0);
+ }
+};
-void CommonTest::testVersionStringToInt_TooSmallPart()
-{
- CPPUNIT_ASSERT_EQUAL(0, versionStringToInt("4.-1.4"));
-}
+QTTESTUTIL_REGISTER_TEST(CommonTest);
src/unittest/commontest.cpp
@@ -2,153 +2,113 @@
* Copyright (C) 2007, Remko Troncon
*/
+#include <QObject>
+#include <QtTest/QtTest>
#include <QList>
#include <QStringList>
#include <QBuffer>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
+#include "qttestutil/qttestutil.h"
+#include "utilities/iodeviceopener.h"
-#include "iodeviceopener.h"
-
-// -----------------------------------------------------------------------------
-
-class IODeviceOpenerTest : public CppUnit::TestFixture
-{
- CPPUNIT_TEST_SUITE(IODeviceOpenerTest);
-
- CPPUNIT_TEST(testConstructor);
- CPPUNIT_TEST(testConstructor_Open);
- CPPUNIT_TEST(testConstructor_OpenInSubsetMode);
- CPPUNIT_TEST(testConstructor_OpenInWrongMode);
- CPPUNIT_TEST(testConstructor_Unopenable);
-
- CPPUNIT_TEST(testDestructor);
- CPPUNIT_TEST(testDestructor_Open);
- CPPUNIT_TEST(testDestructor_OpenInWrongMode);
-
- CPPUNIT_TEST_SUITE_END();
-
-public:
- IODeviceOpenerTest();
-
- void testConstructor();
- void testConstructor_Open();
- void testConstructor_OpenInSubsetMode();
- void testConstructor_OpenInWrongMode();
- void testConstructor_Unopenable();
-
- void testDestructor();
- void testDestructor_Open();
- void testDestructor_OpenInWrongMode();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(IODeviceOpenerTest);
-
-// -----------------------------------------------------------------------------
-
-class UnopenableBuffer : public QBuffer
+class IODeviceOpenerTest : public QObject
{
-public:
- UnopenableBuffer() : QBuffer() { }
+ Q_OBJECT
- bool open(QIODevice::OpenMode) { return false; }
-};
+ private slots:
+ void testConstructor() {
+ QBuffer buffer;
-// -----------------------------------------------------------------------------
+ IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
-IODeviceOpenerTest::IODeviceOpenerTest()
-{
-}
+ QVERIFY(buffer.isOpen());
+ QVERIFY(QIODevice::WriteOnly == buffer.openMode());
+ QVERIFY(opener.isOpen());
+ }
-void IODeviceOpenerTest::testConstructor()
-{
- QBuffer buffer;
+ void testConstructor_Open() {
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadOnly);
- IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
+ IODeviceOpener opener(&buffer, QIODevice::ReadOnly);
- CPPUNIT_ASSERT(buffer.isOpen());
- CPPUNIT_ASSERT(QIODevice::WriteOnly == buffer.openMode());
- CPPUNIT_ASSERT(opener.isOpen());
-}
+ QVERIFY(buffer.isOpen());
+ QVERIFY(QIODevice::ReadOnly == buffer.openMode());
+ QVERIFY(opener.isOpen());
+ }
-void IODeviceOpenerTest::testConstructor_Open()
-{
- QBuffer buffer;
- buffer.open(QIODevice::ReadOnly);
+ void testConstructor_OpenInSubsetMode() {
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadWrite);
- IODeviceOpener opener(&buffer, QIODevice::ReadOnly);
+ IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
- CPPUNIT_ASSERT(buffer.isOpen());
- CPPUNIT_ASSERT(QIODevice::ReadOnly == buffer.openMode());
- CPPUNIT_ASSERT(opener.isOpen());
-}
+ QVERIFY(buffer.isOpen());
+ QVERIFY(QIODevice::ReadWrite == buffer.openMode());
+ QVERIFY(opener.isOpen());
+ }
-void IODeviceOpenerTest::testConstructor_OpenInSubsetMode()
-{
- QBuffer buffer;
- buffer.open(QIODevice::ReadWrite);
+ void testConstructor_OpenInWrongMode() {
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadOnly);
- IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
+ IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
- CPPUNIT_ASSERT(buffer.isOpen());
- CPPUNIT_ASSERT(QIODevice::ReadWrite == buffer.openMode());
- CPPUNIT_ASSERT(opener.isOpen());
-}
+ QVERIFY(buffer.isOpen());
+ QVERIFY(QIODevice::ReadOnly == buffer.openMode());
+ QVERIFY(!opener.isOpen());
+ }
-void IODeviceOpenerTest::testConstructor_OpenInWrongMode()
-{
- QBuffer buffer;
- buffer.open(QIODevice::ReadOnly);
+ void testConstructor_Unopenable() {
+ UnopenableBuffer buffer;
- IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
+ IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
- CPPUNIT_ASSERT(buffer.isOpen());
- CPPUNIT_ASSERT(QIODevice::ReadOnly == buffer.openMode());
- CPPUNIT_ASSERT(!opener.isOpen());
-}
+ QVERIFY(!opener.isOpen());
+ }
-void IODeviceOpenerTest::testConstructor_Unopenable()
-{
- UnopenableBuffer buffer;
+ void testDestructor() {
+ QBuffer buffer;
- IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
+ {
+ IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
+ }
- CPPUNIT_ASSERT(!opener.isOpen());
-}
+ QVERIFY(!buffer.isOpen());
+ }
-void IODeviceOpenerTest::testDestructor()
-{
- QBuffer buffer;
+ void testDestructor_Open() {
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadOnly);
- {
- IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
- }
+ {
+ IODeviceOpener opener(&buffer, QIODevice::ReadOnly);
+ }
- CPPUNIT_ASSERT(!buffer.isOpen());
-}
+ QVERIFY(buffer.isOpen());
+ }
-void IODeviceOpenerTest::testDestructor_Open()
-{
- QBuffer buffer;
- buffer.open(QIODevice::ReadOnly);
+ void testDestructor_OpenInWrongMode() {
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadOnly);
- {
- IODeviceOpener opener(&buffer, QIODevice::ReadOnly);
- }
+ {
+ IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
+ }
- CPPUNIT_ASSERT(buffer.isOpen());
-}
+ QVERIFY(buffer.isOpen());
+ QVERIFY(QIODevice::ReadOnly == buffer.openMode());
+ }
-void IODeviceOpenerTest::testDestructor_OpenInWrongMode()
-{
- QBuffer buffer;
- buffer.open(QIODevice::ReadOnly);
+ private:
+ class UnopenableBuffer : public QBuffer
+ {
+ public:
+ UnopenableBuffer() : QBuffer() { }
- {
- IODeviceOpener opener(&buffer, QIODevice::WriteOnly);
- }
+ bool open(QIODevice::OpenMode) { return false; }
+ };
+};
- CPPUNIT_ASSERT(buffer.isOpen());
- CPPUNIT_ASSERT(QIODevice::ReadOnly == buffer.openMode());
-}
+QTTESTUTIL_REGISTER_TEST(IODeviceOpenerTest);
+#include "iodeviceopenertest.moc"
src/utilities/unittest/iodeviceopenertest.cpp
@@ -1,5 +1,5 @@
-INCLUDEPATH *= $$PWD
-DEPENDPATH *= $$PWD
+INCLUDEPATH *= $$PWD $$PWD/..
+DEPENDPATH *= $$PWD $$PWD/..
HEADERS += \
$$PWD/maybe.h \
src/utilities/utilities.pri
qa/unittest/unittest.cpp
qa/unittest/unittest.pro
qa/unittest/unittestutil.cpp
qa/unittest/unittestutil.h
qcm/tests.qcm
third-party/cppunit/cppunit.pri
third-party/cppunit/cppunit.pro
third-party/cppunit/cppunit/COPYING
third-party/cppunit/cppunit/config-auto.h
third-party/cppunit/cppunit/include/cppunit/AdditionalMessage.h
third-party/cppunit/cppunit/include/cppunit/Asserter.h
third-party/cppunit/cppunit/include/cppunit/BriefTestProgressListener.h
third-party/cppunit/cppunit/include/cppunit/CompilerOutputter.h
third-party/cppunit/cppunit/include/cppunit/Exception.h
third-party/cppunit/cppunit/include/cppunit/Message.h
third-party/cppunit/cppunit/include/cppunit/Outputter.h
third-party/cppunit/cppunit/include/cppunit/Portability.h
third-party/cppunit/cppunit/include/cppunit/Protector.h
third-party/cppunit/cppunit/include/cppunit/SourceLine.h
third-party/cppunit/cppunit/include/cppunit/SynchronizedObject.h
third-party/cppunit/cppunit/include/cppunit/Test.h
third-party/cppunit/cppunit/include/cppunit/TestAssert.h
third-party/cppunit/cppunit/include/cppunit/TestCaller.h
third-party/cppunit/cppunit/include/cppunit/TestCase.h
third-party/cppunit/cppunit/include/cppunit/TestComposite.h
third-party/cppunit/cppunit/include/cppunit/TestFailure.h
third-party/cppunit/cppunit/include/cppunit/TestFixture.h
third-party/cppunit/cppunit/include/cppunit/TestLeaf.h
third-party/cppunit/cppunit/include/cppunit/TestListener.h
third-party/cppunit/cppunit/include/cppunit/TestPath.h
third-party/cppunit/cppunit/include/cppunit/TestResult.h
third-party/cppunit/cppunit/include/cppunit/TestResultCollector.h
third-party/cppunit/cppunit/include/cppunit/TestRunner.h
third-party/cppunit/cppunit/include/cppunit/TestSuccessListener.h
third-party/cppunit/cppunit/include/cppunit/TestSuite.h
third-party/cppunit/cppunit/include/cppunit/TextOutputter.h
third-party/cppunit/cppunit/include/cppunit/TextTestProgressListener.h
third-party/cppunit/cppunit/include/cppunit/TextTestResult.h
third-party/cppunit/cppunit/include/cppunit/TextTestRunner.h
third-party/cppunit/cppunit/include/cppunit/XmlOutputter.h
third-party/cppunit/cppunit/include/cppunit/XmlOutputterHook.h
third-party/cppunit/cppunit/include/cppunit/config/CppUnitApi.h
third-party/cppunit/cppunit/include/cppunit/config/SelectDllLoader.h
third-party/cppunit/cppunit/include/cppunit/config/SourcePrefix.h
third-party/cppunit/cppunit/include/cppunit/config/config-bcb5.h
third-party/cppunit/cppunit/include/cppunit/config/config-evc4.h
third-party/cppunit/cppunit/include/cppunit/config/config-mac.h
third-party/cppunit/cppunit/include/cppunit/config/config-msvc6.h
third-party/cppunit/cppunit/include/cppunit/extensions/AutoRegisterSuite.h
third-party/cppunit/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h
third-party/cppunit/cppunit/include/cppunit/extensions/HelperMacros.h
third-party/cppunit/cppunit/include/cppunit/extensions/Orthodox.h
third-party/cppunit/cppunit/include/cppunit/extensions/RepeatedTest.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestCaseDecorator.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestDecorator.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestFactory.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestFactoryRegistry.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestFixtureFactory.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestNamer.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestSetUp.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestSuiteBuilderContext.h
third-party/cppunit/cppunit/include/cppunit/extensions/TestSuiteFactory.h
third-party/cppunit/cppunit/include/cppunit/extensions/TypeInfoHelper.h
third-party/cppunit/cppunit/include/cppunit/plugin/DynamicLibraryManager.h
third-party/cppunit/cppunit/include/cppunit/plugin/DynamicLibraryManagerException.h
third-party/cppunit/cppunit/include/cppunit/plugin/PlugInManager.h
third-party/cppunit/cppunit/include/cppunit/plugin/PlugInParameters.h
third-party/cppunit/cppunit/include/cppunit/plugin/TestPlugIn.h
third-party/cppunit/cppunit/include/cppunit/plugin/TestPlugInDefaultImpl.h
third-party/cppunit/cppunit/include/cppunit/portability/CppUnitDeque.h
third-party/cppunit/cppunit/include/cppunit/portability/CppUnitMap.h
third-party/cppunit/cppunit/include/cppunit/portability/CppUnitSet.h
third-party/cppunit/cppunit/include/cppunit/portability/CppUnitStack.h
third-party/cppunit/cppunit/include/cppunit/portability/CppUnitVector.h
third-party/cppunit/cppunit/include/cppunit/portability/FloatingPoint.h
third-party/cppunit/cppunit/include/cppunit/portability/Stream.h
third-party/cppunit/cppunit/include/cppunit/tools/Algorithm.h
third-party/cppunit/cppunit/include/cppunit/tools/StringTools.h
third-party/cppunit/cppunit/include/cppunit/tools/XmlDocument.h
third-party/cppunit/cppunit/include/cppunit/tools/XmlElement.h
third-party/cppunit/cppunit/include/cppunit/ui/text/TestRunner.h
third-party/cppunit/cppunit/include/cppunit/ui/text/TextTestRunner.h
third-party/cppunit/cppunit/src/cppunit/AdditionalMessage.cpp
third-party/cppunit/cppunit/src/cppunit/Asserter.cpp
third-party/cppunit/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp
third-party/cppunit/cppunit/src/cppunit/BriefTestProgressListener.cpp
third-party/cppunit/cppunit/src/cppunit/CompilerOutputter.cpp
third-party/cppunit/cppunit/src/cppunit/DefaultProtector.cpp
third-party/cppunit/cppunit/src/cppunit/DefaultProtector.h
third-party/cppunit/cppunit/src/cppunit/DllMain.cpp
third-party/cppunit/cppunit/src/cppunit/DynamicLibraryManager.cpp
third-party/cppunit/cppunit/src/cppunit/DynamicLibraryManagerException.cpp
third-party/cppunit/cppunit/src/cppunit/Exception.cpp
third-party/cppunit/cppunit/src/cppunit/Message.cpp
third-party/cppunit/cppunit/src/cppunit/PlugInManager.cpp
third-party/cppunit/cppunit/src/cppunit/PlugInParameters.cpp
third-party/cppunit/cppunit/src/cppunit/Protector.cpp
third-party/cppunit/cppunit/src/cppunit/ProtectorChain.cpp
third-party/cppunit/cppunit/src/cppunit/ProtectorChain.h
third-party/cppunit/cppunit/src/cppunit/ProtectorContext.h
third-party/cppunit/cppunit/src/cppunit/RepeatedTest.cpp
third-party/cppunit/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp
third-party/cppunit/cppunit/src/cppunit/SourceLine.cpp
third-party/cppunit/cppunit/src/cppunit/StringTools.cpp
third-party/cppunit/cppunit/src/cppunit/SynchronizedObject.cpp
third-party/cppunit/cppunit/src/cppunit/Test.cpp
third-party/cppunit/cppunit/src/cppunit/TestAssert.cpp
third-party/cppunit/cppunit/src/cppunit/TestCase.cpp
third-party/cppunit/cppunit/src/cppunit/TestCaseDecorator.cpp
third-party/cppunit/cppunit/src/cppunit/TestComposite.cpp
third-party/cppunit/cppunit/src/cppunit/TestDecorator.cpp
third-party/cppunit/cppunit/src/cppunit/TestFactoryRegistry.cpp
third-party/cppunit/cppunit/src/cppunit/TestFailure.cpp
third-party/cppunit/cppunit/src/cppunit/TestLeaf.cpp
third-party/cppunit/cppunit/src/cppunit/TestNamer.cpp
third-party/cppunit/cppunit/src/cppunit/TestPath.cpp
third-party/cppunit/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp
third-party/cppunit/cppunit/src/cppunit/TestResult.cpp
third-party/cppunit/cppunit/src/cppunit/TestResultCollector.cpp
third-party/cppunit/cppunit/src/cppunit/TestRunner.cpp
third-party/cppunit/cppunit/src/cppunit/TestSetUp.cpp
third-party/cppunit/cppunit/src/cppunit/TestSuccessListener.cpp
third-party/cppunit/cppunit/src/cppunit/TestSuite.cpp
third-party/cppunit/cppunit/src/cppunit/TestSuiteBuilderContext.cpp
third-party/cppunit/cppunit/src/cppunit/TextOutputter.cpp
third-party/cppunit/cppunit/src/cppunit/TextTestProgressListener.cpp
third-party/cppunit/cppunit/src/cppunit/TextTestResult.cpp
third-party/cppunit/cppunit/src/cppunit/TextTestRunner.cpp
third-party/cppunit/cppunit/src/cppunit/TypeInfoHelper.cpp
third-party/cppunit/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp
third-party/cppunit/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp
third-party/cppunit/cppunit/src/cppunit/XmlDocument.cpp
third-party/cppunit/cppunit/src/cppunit/XmlElement.cpp
third-party/cppunit/cppunit/src/cppunit/XmlOutputter.cpp
third-party/cppunit/cppunit/src/cppunit/XmlOutputterHook.cpp
a6b39b3bf297140c9e3d759b80d88e7a279c0368
Remko Tronçon
git@el-tramo.be
http://github.com/psi-im/psi/commit/ab6903e2a3c920398e30f27b65ade84fa214d045
ab6903e2a3c920398e30f27b65ade84fa214d045
2008-09-24T07:17:00-07:00
2008-09-24T07:17:00-07:00
Ported CppUnit tests to QtTest.
Removed third-party/cppunit and tests.qcm module.
0901f42692c3c45a0ab74caff7d110405c5d59c1
Remko Tronçon
git@el-tramo.be