More tests for remotelist

diff --git a/ut/ut_remotelist/ut_remotelist.cpp b/ut/ut_remotelist/ut_remotelist.cpp
index b8dac76..6eb7d8a 100644 (file)
--- a/ut/ut_remotelist/ut_remotelist.cpp
+++ b/ut/ut_remotelist/ut_remotelist.cpp
@@ -16,11 +16,10 @@ void Ut_RemoteList::initTestCase()
     validMfgs.insert(validLetters.at(2), QStringList("Philips"));
     validMfgs.insert(validLetters.at(3), QStringList("Topfield"));
 
-    validModels.insert("Lg", QStringList("AKB69680403"));
-    validModels.insert("Leadtek", QStringList("Y04G0004"));
-    validModels.insert("Microsoft", QStringList("Xbox360"));
-    validModels.insert("Philips", QStringList("15PF4121"));
-    validModels.insert("Topfield", QStringList("PVR5000"));
+//    validModels.insert("Leadtek", QStringList("Y04G0004"));
+//    validModels.insert("Microsoft", QStringList("Xbox360"));
+//    validModels.insert("Philips", QStringList("15PF4121"));
+//    validModels.insert("Topfield", QStringList("PVR5000"));
 }
 
 void Ut_RemoteList::cleanupTestCase()
@@ -70,17 +69,30 @@ void Ut_RemoteList::testManufacturers()
 
     for (int i = 0; i < validMfgs.keys().size(); ++i)
     {
-        for (int j = 0; j < validMfgs.value(validLetters.at(i)).size(); ++j)
+        QString letter = validMfgs.keys().at(i);
+        for (int j = 0; j < validMfgs.value(letter).size(); ++j)
         {
-            QCOMPARE(validMfgs.value(validLetters.at(i)).at(j), 
-                     subject.manufacturers(validLetters.at(i)).at(j));
+            QCOMPARE(validMfgs.value(letter).at(j), 
+                     subject.manufacturers(letter).at(j));
         }
     }
 }
 
 void Ut_RemoteList::testModels()
 {
+    RemoteList subject("remotes.xml");
 
+    for (int i = 0; i < validModels.keys().size(); ++i)
+    {
+        QString mfg = validModels.keys().at(i);
+        for (int j = 0; j < validModels.value(mfg).size(); ++j)
+        {
+            QCOMPARE(validModels.value(mfg).at(j).name,
+                     subject.models(mfg).at(j).name);
+            QCOMPARE(validModels.value(mfg).at(j).file,
+                    subject.models(mfg).at(j).file);
+        }
+    }
 }
 
 

diff --git a/ut/ut_remotelist/ut_remotelist.h b/ut/ut_remotelist/ut_remotelist.h
index 0560529..a904c11 100644 (file)
--- a/ut/ut_remotelist/ut_remotelist.h
+++ b/ut/ut_remotelist/ut_remotelist.h
@@ -4,6 +4,8 @@
 #include <QObject>
 #include <QStringList>
 #include <QMap>
+#include <QList>
+#include "model.h"
 
 class Ut_RemoteList: public QObject
 {
@@ -25,7 +27,7 @@ private slots:
 private:
     QStringList validLetters;
     QMap<QString, QStringList> validMfgs;
-    QMap<QString, QStringList> validModels;
+    QMap<QString, QList<Model> > validModels;
 };
 
 #endif // UT_REMOTELIST_H