aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Miklas <marcin.miklas@teleca.com>2011-01-17 13:07:45 +0100
committerDaniel d'Andrada <daniel.dandrada@nokia.com>2011-01-25 10:54:56 +0200
commitf69ff7639bc90fc523194673e50724a22a640306 (patch)
tree4dc0205ca2f30aae5d74ffd7816ccb1388c339a6
parenta49534341a46036b940c7f9200c06240f977f81d (diff)
New: Ut_MNavigationBarView::testToolBarViewTypeChange.
RevBy: Daniel d'Andrada Details: Added unit test to check if toolBar's viewType changes correctly updates navigationbar's layout and toolbar's widgetAlignment.
-rw-r--r--tests/ut_mnavigationbarview/ut_mnavigationbarview.cpp24
-rw-r--r--tests/ut_mnavigationbarview/ut_mnavigationbarview.h1
2 files changed, 25 insertions, 0 deletions
diff --git a/tests/ut_mnavigationbarview/ut_mnavigationbarview.cpp b/tests/ut_mnavigationbarview/ut_mnavigationbarview.cpp
index bdca9bbd..a41f3c66 100644
--- a/tests/ut_mnavigationbarview/ut_mnavigationbarview.cpp
+++ b/tests/ut_mnavigationbarview/ut_mnavigationbarview.cpp
@@ -25,6 +25,7 @@
#include <MLinearLayoutPolicy>
#include <mnavigationbarstyle.h>
#include <MToolBar>
+#include <MLayout>
Q_DECLARE_METATYPE(MNavigationBarModel::EscapeButtonModeEnum)
@@ -235,4 +236,27 @@ void Ut_MNavigationBarView::testDockedToolBarChangingItsIsEmptyProperty()
delete toolBar;
}
+void Ut_MNavigationBarView::testToolBarViewTypeChange()
+{
+ MToolBar *toolBar = new MToolBar;
+
+ model->setToolBar(toolBar);
+ model->setEscapeButtonVisible(false);
+ model->setArrowIconVisible(false);
+
+ QCOMPARE(toolBar->property("widgetAlignment").toInt(), (int)Qt::AlignJustify);
+ QCOMPARE(subject->d_func()->layout->policy(), subject->d_func()->toolbarPolicy);
+
+ toolBar->setViewType(MToolBar::tabType);
+
+ QCOMPARE(toolBar->property("widgetAlignment").toInt(), (int)Qt::AlignHCenter);
+ QCOMPARE(subject->d_func()->layout->policy(), subject->d_func()->escapeToolbarMenuPolicy);
+
+ model->setToolBar(0);
+ QCOMPARE(toolBar->property("widgetAlignment").isValid(), false);
+ QCOMPARE(subject->d_func()->layout->policy(), subject->d_func()->toolbarPolicy);
+
+ delete toolBar;
+}
+
QTEST_APPLESS_MAIN(Ut_MNavigationBarView)
diff --git a/tests/ut_mnavigationbarview/ut_mnavigationbarview.h b/tests/ut_mnavigationbarview/ut_mnavigationbarview.h
index d00cb24f..820cd255 100644
--- a/tests/ut_mnavigationbarview/ut_mnavigationbarview.h
+++ b/tests/ut_mnavigationbarview/ut_mnavigationbarview.h
@@ -43,6 +43,7 @@ private slots:
void testIsEmptyProperty();
void testIsEmptyProperty_data();
void testDockedToolBarChangingItsIsEmptyProperty();
+ void testToolBarViewTypeChange();
private:
MNavigationBarView *subject;