Changes: Coverage improvements for MDialog unit tests.

RevBy: trusMe

2 files changed, 43 insertions, 1 deletions

diff --git a/tests/ut_mdialog/ut_mdialog.cpp b/tests/ut_mdialog/ut_mdialog.cpp
index 2646c929..733e7b8b 100644
--- a/tests/ut_mdialog/ut_mdialog.cpp
+++ b/tests/ut_mdialog/ut_mdialog.cpp
@@ -116,6 +116,18 @@ void Ut_MDialog::settersAndGetters()
         QCOMPARE(dialog->isTitleBarVisible(), val);
     }
 
+    for (int i = 0; i < 4; i++) {
+        bool val = i % 2 ? false : true;
+        dialog->setProgressIndicatorVisible(val);
+        QCOMPARE(dialog->isProgressIndicatorVisible(), val);
+    }
+
+    for (int i = 0; i < 4; i++) {
+        bool val = i % 2 ? false : true;
+        dialog->setCloseButtonVisible(val);
+        QCOMPARE(dialog->isCloseButtonVisible(), val);
+    }
+
     {
         QString val;
         val = QString("Test string 1");
@@ -153,6 +165,21 @@ void Ut_MDialog::addStandardButtons()
     QVERIFY(dialog->button(M::YesToAllButton) == 0);
 }
 
+void Ut_MDialog::addNonStandardButtonModel()
+{
+    MButtonModel *mbm1 = new MButtonModel();
+    MButtonModel *mbm2 = new MButtonModel();
+    dialog->addButton(mbm1);
+
+    QVERIFY(dialog->model()->buttons().contains(mbm1));
+    QVERIFY(!dialog->model()->buttons().contains(mbm2));
+
+    dialog->addButton(mbm2);
+
+    QVERIFY(dialog->model()->buttons().contains(mbm1));
+    QVERIFY(dialog->model()->buttons().contains(mbm2));
+}
+
 void Ut_MDialog::addNonStandardButtonsWithRole()
 {
     MButtonModel *b1 = dialog->addButton("Custom Action Button", M::AcceptRole);
@@ -251,5 +278,19 @@ void Ut_MDialog::testRotation()
     MApplication::activeWindow()->setOrientationAngle(M::Angle90);
     QCOMPARE(dialog->preferredSize(), preferredSizePortrait);
 }
-
+/*
+Done:
+mdialog.cpp@"addButton(MButtonModel*)"
+mdialog.cpp@"isProgressIndicatorVisible()"
+mdialog.cpp@"setProgressIndicatorVisible(bool)"
+mdialog.cpp@"isCloseButtonVisible()"
+mdialog.cpp@"setCloseButtonVisible(bool)"
+
+TBD:
+mdialog.cpp@"exec(MWindow*)"
+mdialog.cpp@"layout()"
+mdialog.cpp@"reject()"
+mdialog.cpp@"setLayout(QGraphicsLayout*)"
+mdialog.cpp@"standardButton(MButtonModel*)"
+*/
 QTEST_APPLESS_MAIN(Ut_MDialog);
diff --git a/tests/ut_mdialog/ut_mdialog.h b/tests/ut_mdialog/ut_mdialog.h
index 0925dc5a..79854cc7 100644
--- a/tests/ut_mdialog/ut_mdialog.h
+++ b/tests/ut_mdialog/ut_mdialog.h
@@ -46,6 +46,7 @@ private slots:
     void initVals();
     void settersAndGetters();
     void addStandardButtons();
+    void addNonStandardButtonModel();
     void addNonStandardButtonsWithRole();
     void addInvalidStandardButton();
     void addExistingStandardButton();