diff options
| author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-07-21 13:45:12 +0300 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-07-21 14:37:44 +0300 |
| commit | e2630a139542b298fd498f122c5d3b3e9fa144cb (patch) | |
| tree | 81ced656f8df3db8d90c41a4f020f4a01ffc1805 /tests | |
| parent | 5b951366ec2aa1d7d37bf9206953fb365fb06ea7 (diff) | |
Changes: Unit tests: ut_mtoolbar added 2nd costructor test, enabled mobjectmenu unit test execution
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.pro | 2 | ||||
| -rw-r--r-- | tests/ut_mtoolbar/ut_mtoolbar.cpp | 21 | ||||
| -rw-r--r-- | tests/ut_mtoolbar/ut_mtoolbar.h | 1 | ||||
| -rw-r--r-- | tests/ut_mtoolbar/ut_mtoolbar.pro | 7 |
4 files changed, 27 insertions, 4 deletions
diff --git a/tests/tests.pro b/tests/tests.pro index 37a79020..f8786ad4 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -40,7 +40,7 @@ SUBDIRS = \ ut_mlinearlayoutpolicy \ ut_mapplicationmenu \ ut_mapplicationmenuview \ -# ut_mobjectmenu \ + ut_mobjectmenu \ ut_moverlay \ ut_mpannableviewport \ ut_mpannablewidget \ diff --git a/tests/ut_mtoolbar/ut_mtoolbar.cpp b/tests/ut_mtoolbar/ut_mtoolbar.cpp index a23fc404..43b9bb52 100644 --- a/tests/ut_mtoolbar/ut_mtoolbar.cpp +++ b/tests/ut_mtoolbar/ut_mtoolbar.cpp @@ -29,10 +29,12 @@ #include <MSlider> #include <MButtonGroup> #include <MWidgetAction> +#include "mtoolbar_p.h" -MApplication *app; + +MApplication *app(NULL); // TODO: remove this when unneeded in MTextEdit's constructor -MApplicationWindow *appWin; +MApplicationWindow *appWin(NULL); void Ut_MToolBar::init() { @@ -64,6 +66,21 @@ void Ut_MToolBar::testConstructor() QVERIFY(m_subject); } +void Ut_MToolBar::testConstructor2() +{ + class InheritedMToolBar : public MToolBar + { + public: + explicit InheritedMToolBar() + : MToolBar(new MToolBarPrivate(),new MWidgetModel(),NULL) + {}; + }; + //testing protected constructor: MToolBar(MToolBarPrivate *dd, MWidgetModel *model, QGraphicsItem *parent); + InheritedMToolBar* inheritedMToolBar = new InheritedMToolBar(); + QVERIFY(inheritedMToolBar); + delete inheritedMToolBar; +} + void Ut_MToolBar::testDestructor() { MToolBar *toolbar = new MToolBar(); diff --git a/tests/ut_mtoolbar/ut_mtoolbar.h b/tests/ut_mtoolbar/ut_mtoolbar.h index 0189c10a..1a0607d5 100644 --- a/tests/ut_mtoolbar/ut_mtoolbar.h +++ b/tests/ut_mtoolbar/ut_mtoolbar.h @@ -41,6 +41,7 @@ private Q_SLOTS: // class testing void testConstructor(); + void testConstructor2(); void testDestructor(); void testAddAction(); void testAddTextEditAction(); diff --git a/tests/ut_mtoolbar/ut_mtoolbar.pro b/tests/ut_mtoolbar/ut_mtoolbar.pro index 423a512b..d7eb10a1 100644 --- a/tests/ut_mtoolbar/ut_mtoolbar.pro +++ b/tests/ut_mtoolbar/ut_mtoolbar.pro @@ -6,8 +6,13 @@ INCLUDEPATH += $$MSRCDIR/corelib/widgets $$MSRCDIR/corelib/style SOURCES += \ ut_mtoolbar.cpp \ + $$MSRCDIR/corelib/widgets/mtoolbar.cpp \ + $$MSRCDIR/corelib/widgets/core/mwidgetcontroller.cpp \ + $$MSRCDIR/corelib/widgets/core/mwidget.cpp \ HEADERS += \ - ut_mtoolbar.h + ut_mtoolbar.h \ + $$MSRCDIR/corelib/widgets/mtoolbar_p.h \ + $$MSRCDIR/corelib/widgets/core/mwidgetcontroller_p.h \ include(../common_bot.pri) |