From: konrad Date: Tue, 28 Dec 2010 19:41:20 +0000 (+0000) Subject: move tests to dptr X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=475f8ab4f02945a8dd38f8d45f3cb9f1d96dd470;p=web%2Fkonrad%2Felam.git move tests to dptr git-svn-id: https://silmor.de/svn/softmagic/elam/trunk@691 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- diff --git a/tests/dptr/dptrpriv.cpp b/tests/dptr/dptrpriv.cpp deleted file mode 100644 index 4e3dc91..0000000 --- a/tests/dptr/dptrpriv.cpp +++ /dev/null @@ -1,35 +0,0 @@ - -#include "dptrtest.h" - -#include - -class DPTR_CLASS_NAME(ClassWithDptr):public DPtr -{ - public: - int num; - Private(){num=0;} -}; -DEFINE_DPTR(ClassWithDptr) - - -QString ClassWithDptr::toString()const -{ - return QString("class with dptr %1").arg(d->num); -} -int ClassWithDptr::num()const{return d->num;} -void ClassWithDptr::setNum(int n){d->num=n;} - -class DPTR_CLASS_NAME(ClassWithSDptr):public SharedDPtr -{ - public: - int num; - Private(){num=0;} -}; -DEFINE_SHARED_DPTR(ClassWithSDptr) - -QString ClassWithSDptr::toString()const -{ - return QString("class with shared dptr %1").arg(d->num); -} -int ClassWithSDptr::num()const{return d->num;} -void ClassWithSDptr::setNum(int n){d->num=n;} diff --git a/tests/dptr/dptrtest.cpp b/tests/dptr/dptrtest.cpp deleted file mode 100644 index 273106c..0000000 --- a/tests/dptr/dptrtest.cpp +++ /dev/null @@ -1,46 +0,0 @@ - -#include "dptrtest.h" - -#include -#include -#include - -void DPtrTest::simpleDP() -{ - QCOMPARE(ClassWithDptr().num(),0); - ClassWithDptr o1;o1.setNum(1); - QCOMPARE(o1.num(),1); - ClassWithDptr o2;o2.setNum(2); - ClassWithDptr o3(o1); - QCOMPARE(o1.num(),1); - QCOMPARE(o2.num(),2); - QCOMPARE(o3.num(),1); - o1=o2; - QCOMPARE(o1.num(),2); - o2.setNum(3); - QCOMPARE(o1.num(),2); - QCOMPARE(o2.num(),3); -} - -void DPtrTest::sharedDP() -{ - QCOMPARE(ClassWithSDptr().num(),0); - ClassWithSDptr o1;o1.setNum(1); - QCOMPARE(o1.num(),1); - ClassWithSDptr o2;o2.setNum(2); - ClassWithSDptr o3(o1); - QCOMPARE(o1.num(),1); - QCOMPARE(o2.num(),2); - QCOMPARE(o3.num(),1); - o1.setNum(4); - QCOMPARE(o1.num(),4); - QCOMPARE(o2.num(),2); - QCOMPARE(o3.num(),4); - o2=o1;o2.setNum(5); - QCOMPARE(o1.num(),5); - QCOMPARE(o2.num(),5); - QCOMPARE(o3.num(),5); -} - - -QTEST_MAIN(DPtrTest) \ No newline at end of file diff --git a/tests/dptr/dptrtest.h b/tests/dptr/dptrtest.h deleted file mode 100644 index 8c821d8..0000000 --- a/tests/dptr/dptrtest.h +++ /dev/null @@ -1,32 +0,0 @@ -#include "../../src/dptr.h" - -#include - -class ClassWithDptr -{ - DECLARE_DPTR(d) - public: - QString toString()const; - int num()const; - void setNum(int); -}; - -class ClassWithSDptr -{ - DECLARE_SHARED_DPTR(d) - public: - QString toString()const; - int num()const; - void setNum(int); -}; - - -#include - -class DPtrTest:public QObject -{ - Q_OBJECT - private slots: - void simpleDP(); - void sharedDP(); -}; diff --git a/tests/dptr/dptrtest.pro b/tests/dptr/dptrtest.pro deleted file mode 100644 index 7abdab0..0000000 --- a/tests/dptr/dptrtest.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = app -TARGET = dptrtest -QT -= gui -CONFIG += qtestlib debug - -SOURCES += dptrtest.cpp dptrpriv.cpp -HEADERS += dptrtest.h \ No newline at end of file