Merge branch 'master' of mercury.wipsl.com:/var/git/irwi

Conflicts:
	ut/stubs/qnetworkreply.cpp
	ut/stubs/qnetworkreply.h

diff --git a/debian/changelog b/debian/changelog
index 6ad8530..490423a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+irwi (0.2-2) unstable; urgency=low
+
+  * Public release
+
+ -- Torste Aikio <zokier@unknown>  Tue, 29 Jun 2010 12:17:33 +0300
+
 irwi (0.2-1) unstable; urgency=low
 
   * Rewrite of the core

diff --git a/debian/postinst b/debian/postinst
index a5bf173..76dfdc9 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,3 +2,4 @@
 
 echo 'include "/home/user/.config/irwi/lirc.conf"' >> /etc/lircd.conf
 sed -i '/^include/!d' /etc/lircd.conf
+echo -n > /home/user/.config/irwi/irwi.conf

diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp
index 4579540..1e7c18b 100644 (file)
--- a/src/advsettingsdlg.cpp
+++ b/src/advsettingsdlg.cpp
@@ -8,7 +8,7 @@
 #include "advsettingsdlg.h"
 #include "settingstable.h"
 
-AdvSettingsDlg::AdvSettingsDlg(QDialog *parent)
+AdvSettingsDlg::AdvSettingsDlg(QWidget *parent)
     : QDialog(parent)
     , layout(NULL)
     , btnLayout(NULL)
@@ -71,7 +71,7 @@ void AdvSettingsDlg::refreshList()
 void AdvSettingsDlg::setDefaults()
 {
     settings->setValue("lircPort", 8765);
-    settings->setValue("remoteName", "No remote selected");
+    settings->setValue("remoteName", "");
     settings->setValue("lircConf", "/home/user/.config/irwi/lirc.conf");
     settings->setValue("cmd0", "VOLUP");
     settings->setValue("cmd1", "VOLDOWN");

diff --git a/src/advsettingsdlg.h b/src/advsettingsdlg.h
index f05bd04..b7b779d 100644 (file)
--- a/src/advsettingsdlg.h
+++ b/src/advsettingsdlg.h
@@ -14,7 +14,7 @@ class AdvSettingsDlg : public QDialog
     Q_OBJECT
 
 public:
-    AdvSettingsDlg(QDialog *parent);
+    AdvSettingsDlg(QWidget *parent);
     ~AdvSettingsDlg();
 
 private:

diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index 6f3f33f..5fd823d 100644 (file)
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -1,5 +1,6 @@
 #include "mainwidget.h"
 #include "settingsdlg.h"
+#include "advsettingsdlg.h"
 
 #include <QInputDialog>
 #include <QPainter>
@@ -10,6 +11,9 @@
 MainWidget::MainWidget (QWidget *parent)
     : QWidget(parent)
 {
+    // reset settings to defaults
+    AdvSettingsDlg asd(this);
+
     layout = new QGridLayout(this);
 
     settings = new QSettings(this);

diff --git a/src/remote.cpp b/src/remote.cpp
index 8795c9a..f94dbf0 100644 (file)
--- a/src/remote.cpp
+++ b/src/remote.cpp
@@ -145,7 +145,7 @@ void Remote::infoRequestFinished(QNetworkReply *reply)
     if (reply->error() == QNetworkReply::NoError) {
         m_rating    = QString(reply->readLine(20)).toInt();
         m_voteCount = QString(reply->readLine(20)).toInt();
-        m_mfg       = QString(reply->readLine(20));
+        m_mfg       = QString(reply->readLine(20)).trimmed();
     }
     reply->close();
     reply->deleteLater();

diff --git a/ut/stubs/qnetworkreply.cpp b/ut/stubs/qnetworkreply.cpp
index 95dd27e..b5427da 100644 (file)
--- a/ut/stubs/qnetworkreply.cpp
+++ b/ut/stubs/qnetworkreply.cpp
@@ -1,19 +1,20 @@
 #include "qnetworkreply.h"
 
-QByteArray QNetworkReply::content;
-
+QBuffer QNetworkReply::data;
 
 QNetworkReply::QNetworkReply()
 {
+    data.open(QIODevice::ReadOnly);
 }
 
 QNetworkReply::~QNetworkReply()
 {
+    close();
 }
 
 QByteArray QNetworkReply::readAll()
 {
-    return QByteArray();
+    return data.data();
 }
 
 int QNetworkReply::error() const
@@ -23,6 +24,7 @@ int QNetworkReply::error() const
 
 void QNetworkReply::close()
 {
+    data.close();
 }
 
 void QNetworkReply::deleteLater()
@@ -31,7 +33,7 @@ void QNetworkReply::deleteLater()
 
 QByteArray QNetworkReply::readLine(qint64 maxlen)
 {
-    return QByteArray();
+    return data.readLine(maxlen);
 }
 
 

diff --git a/ut/stubs/qnetworkreply.h b/ut/stubs/qnetworkreply.h
index 84d491f..7990728 100644 (file)
--- a/ut/stubs/qnetworkreply.h
+++ b/ut/stubs/qnetworkreply.h
@@ -2,6 +2,7 @@
 #define QNETWORKREPLY_H
 
 #include <QByteArray>
+#include <QBuffer>
 
 class QNetworkReply
 {
@@ -18,8 +19,7 @@ public:
     void deleteLater();
     QByteArray readLine(qint64 maxlen = 0);
 
-public:
-    static QByteArray content;
+    static QBuffer data;
 };
 
 #endif // QNETWORKREPLY_H

diff --git a/ut/ut_remote/ut_remote.cpp b/ut/ut_remote/ut_remote.cpp
index d221de0..2915f77 100644 (file)
--- a/ut/ut_remote/ut_remote.cpp
+++ b/ut/ut_remote/ut_remote.cpp
@@ -1,12 +1,13 @@
 #include <QSettings>
 #include "ut_remote.h"
-
-#include <fstream>
+#include "rating.h"
+#include <QNetworkReply>
+#include "qnetworkaccessmanager.h"
 
 #include <QtTest>
 #include <QDebug>
+#include <QMutex>
 
-#include "qnetworkaccessmanager.h"
 
 #define private public
 #include "remote.h"
@@ -16,6 +17,8 @@ void reset()
 {
     QNetworkAccessManager::urls.clear();
     QSettings::values.clear();
+    QNetworkReply::data.close();
+    QNetworkReply::data.setData("");
 }
 
 void Ut_Remote::initTestCase()
@@ -44,14 +47,33 @@ void Ut_Remote::cleanup()
 
 void Ut_Remote::testSaveToFile_normal()
 {
+    connect(subject, SIGNAL(saveFinished()),
+            this, SLOT(wakeTest()));
     subject->m_name = "testname";
+    QSettings settings;
+    settings.setValue("lircConf", "/tmp/irwiTestLircConf");
+    QNetworkReply::data.close();
+    QNetworkReply::data.setData("testdata");
+    QNetworkReply::data.open(QIODevice::ReadOnly);
+
     subject->saveToFile();
+
+    //wait for signal
+    QMutex mutex;
+    mutex.lock();
+    cond.wait(&mutex, 1000);
+    mutex.unlock();
+
     QCOMPARE(QNetworkAccessManager::urls.count(), 1);
     QCOMPARE(QNetworkAccessManager::urls[0], 
             QString("http://mercury.wipsl.com/irwi/uploaded/testname"));
-    QSettings settings;
     QCOMPARE(settings.value("remoteName", "fail").toString(), 
             QString("testname"));
+    QFile f("/tmp/irwiTestLircConf");
+    f.open(QIODevice::ReadOnly);
+    QByteArray testData = f.readAll();
+    f.close();
+    QCOMPARE(testData, QNetworkReply::data.data());
 }
 
 void Ut_Remote::testSaveToFile_emptyname()
@@ -64,14 +86,61 @@ void Ut_Remote::testSaveToFile_emptyname()
             QString("testname"));
 }
 
-void Ut_Remote::testUpdateInfo()
+void Ut_Remote::testUpdateInfo_normal()
 {
+    connect(subject, SIGNAL(infoUpdated()),
+            this, SLOT(wakeTest()));
+    subject->m_name = "testname";
+    QNetworkReply::data.close();
+    QNetworkReply::data.setData("1\n2\ntestmfg\n");
+    QNetworkReply::data.open(QIODevice::ReadOnly);
+    subject->updateInfo();
+
+    //wait for signal
+    QMutex mutex;
+    mutex.lock();
+    cond.wait(&mutex, 1000);
+    mutex.unlock();
+
+    QCOMPARE(QNetworkAccessManager::urls.count(), 1);
+    QCOMPARE(QNetworkAccessManager::urls[0], 
+            QString("http://mercury.wipsl.com/irwi/vote/get?name=testname"));
+    QCOMPARE(subject->rating(), 1);
+    QCOMPARE(subject->voteCount(), 2);
+    QCOMPARE(subject->mfg(), QString("testmfg"));
 }
 
-void Ut_Remote::testSendRating()
+void Ut_Remote::testUpdateInfo_emptyname()
 {
+    subject->m_name = "";
+    subject->updateInfo();
+    QCOMPARE(QNetworkAccessManager::urls.count(), 0);
 }
 
+void Ut_Remote::testSendRating_up()
+{
+    subject->m_name = "testname";
+    subject->sendRating(Rating::Up);
+    QCOMPARE(QNetworkAccessManager::urls.count(), 1);
+    QCOMPARE(QNetworkAccessManager::urls[0], 
+            QString("http://mercury.wipsl.com/irwi/vote/up?name=testname"));
+}
+
+void Ut_Remote::testSendRating_down()
+{
+    subject->m_name = "testname";
+    subject->sendRating(Rating::Down);
+    QCOMPARE(QNetworkAccessManager::urls.count(), 1);
+    QCOMPARE(QNetworkAccessManager::urls[0], 
+            QString("http://mercury.wipsl.com/irwi/vote/down?name=testname"));
+}
+
+void Ut_Remote::wakeTest()
+{
+    cond.wakeAll();
+}
+
+
 QTEST_MAIN(Ut_Remote)
 
 

diff --git a/ut/ut_remote/ut_remote.h b/ut/ut_remote/ut_remote.h
index d0373c4..9c6c765 100644 (file)
--- a/ut/ut_remote/ut_remote.h
+++ b/ut/ut_remote/ut_remote.h
@@ -2,6 +2,7 @@
 #define UT_REMOTE_H
 
 #include <QObject>
+#include <QWaitCondition>
 
 class Remote;
 
@@ -17,11 +18,17 @@ private slots:
 
     void testSaveToFile_normal();
     void testSaveToFile_emptyname();
-    void testUpdateInfo();
-    void testSendRating();
+    void testUpdateInfo_normal();
+    void testUpdateInfo_emptyname();
+    void testSendRating_up();
+    void testSendRating_down();
+
+public slots:
+    void wakeTest();
 
 private:
     Remote *subject;
+    QWaitCondition cond;
 };
 
 #endif // UT_REMOTE_H