Added unit tests for SettingsTable

diff --git a/ut/ut_settingstable/ut_settingstable.cpp b/ut/ut_settingstable/ut_settingstable.cpp
index e1970b7..1ff4b18 100644 (file)
--- a/ut/ut_settingstable/ut_settingstable.cpp
+++ b/ut/ut_settingstable/ut_settingstable.cpp
@@ -11,60 +11,62 @@
 
 /** test functions() */
 
-void Ut_SettingsTable::initTestCase()
+
+void Ut_SettingsTable::testAppendRow()
 {
-    subject = new SettingsTable();
+    SettingsTable subject;
 
-    QVERIFY(subject->verticalHeader()->isVisible() == false);
-    QVERIFY(subject->horizontalHeader()->isVisible() == false);
-}
+    subject.appendRow(QString("testKey1"), QString("testValue1"));
+    subject.appendRow(QString("testKey2"), QString("testValue2"));
+    subject.appendRow(QString("testKey3"), QString("testValue3"));
 
-void Ut_SettingsTable::cleanupTestCase()
-{
-    delete subject;
-}
+    QCOMPARE(subject.rowCount(), 3);
+    QCOMPARE(subject.item(0,0)->text(), QString("testKey1"));
+    QCOMPARE(subject.item(0,1)->text(), QString("testValue1"));
 
-void Ut_SettingsTable::testAppendRow()
-{
-    subject->appendRow(QString("testKey1"), QString("testValue1"));
-    subject->appendRow(QString("testKey2"), QString("testValue2"));
-
-    QCOMPARE(subject->rowCount(), 2);
-    QCOMPARE(subject->item(0,0)->text(), QString("testKey1"));
-    QCOMPARE(subject->item(0,1)->text(), QString("testValue1"));
-    QCOMPARE(subject->item(1,0)->text(), QString("testKey2"));
-    QCOMPARE(subject->item(1,1)->text(), QString("testValue2"));
-    subject->removeAllRows();
+    QCOMPARE(subject.item(1,0)->text(), QString("testKey2"));
+    QCOMPARE(subject.item(1,1)->text(), QString("testValue2"));
+
+    QCOMPARE(subject.item(2,0)->text(), QString("testKey3"));
+    QCOMPARE(subject.item(2,1)->text(), QString("testValue3"));
 }
 
 void Ut_SettingsTable::testRemoveAllRows()
 {
-    subject->removeAllRows();
-    QVERIFY(subject->rowCount() == 0);
+    SettingsTable subject;
+
+    subject.appendRow(QString("testKey1"), QString("testValue1"));
+    subject.appendRow(QString("testKey2"), QString("testValue2"));
+    subject.appendRow(QString("testKey3"), QString("testValue3"));
+
+    subject.removeAllRows();
+    QCOMPARE(subject.rowCount(), 0);
 }
 
 void Ut_SettingsTable::testKey()
 {
-    subject->appendRow(QString("testKey1"), QString("testValue1"));
-    subject->appendRow(QString("testKey2"), QString("testValue2"));
-    subject->appendRow(QString("testKey3"), QString("testValue3"));
-
-    QCOMPARE(subject->key(0), QString("testKey1"));
-    QCOMPARE(subject->key(1), QString("testKey2"));
-    QCOMPARE(subject->key(2), QString("testKey3"));
-    subject->removeAllRows();
+    SettingsTable subject;
+
+    subject.appendRow(QString("testKey1"), QString("testValue1"));
+    subject.appendRow(QString("testKey2"), QString("testValue2"));
+    subject.appendRow(QString("testKey3"), QString("testValue3"));
+
+    QCOMPARE(subject.key(0), QString("testKey1"));
+    QCOMPARE(subject.key(1), QString("testKey2"));
+    QCOMPARE(subject.key(2), QString("testKey3"));
 }
 
 void Ut_SettingsTable::testValue()
 {
-    subject->appendRow(QString("testKey1"), QString("testValue1"));
-    subject->appendRow(QString("testKey2"), QString("testValue2"));
-    subject->appendRow(QString("testKey3"), QString("testValue3"));
-
-    QCOMPARE(subject->value(0), QString("testValue1"));
-    QCOMPARE(subject->value(1), QString("testValue2"));
-    QCOMPARE(subject->value(2), QString("testValue3"));
-    subject->removeAllRows();
+    SettingsTable subject;
+
+    subject.appendRow(QString("testKey1"), QString("testValue1"));
+    subject.appendRow(QString("testKey2"), QString("testValue2"));
+    subject.appendRow(QString("testKey3"), QString("testValue3"));
+
+    QCOMPARE(subject.value(0), QString("testValue1"));
+    QCOMPARE(subject.value(1), QString("testValue2"));
+    QCOMPARE(subject.value(2), QString("testValue3"));
 }
 
 QTEST_MAIN(Ut_SettingsTable)

diff --git a/ut/ut_settingstable/ut_settingstable.h b/ut/ut_settingstable/ut_settingstable.h
index e619684..89dba8e 100644 (file)
--- a/ut/ut_settingstable/ut_settingstable.h
+++ b/ut/ut_settingstable/ut_settingstable.h
@@ -10,14 +10,8 @@ class Ut_SettingsTable : public QObject
 {
     Q_OBJECT
 
-private:
-    SettingsTable *subject;
-
 private slots:
 
-    void initTestCase();
-    void cleanupTestCase();
-
     void testAppendRow();
     void testRemoveAllRows();
     void testKey();