Updated unit tests of RemoteDBMgr

diff --git a/src/remotedbmgr.cpp b/src/remotedbmgr.cpp
index fdbb04e..89edfe7 100644 (file)
--- a/src/remotedbmgr.cpp
+++ b/src/remotedbmgr.cpp
@@ -11,6 +11,7 @@
 #include <QByteArray>
 
 RemoteDBMgr::RemoteDBMgr()
+    : processing(false)
 {
     connect(&netAM, SIGNAL(finished(QNetworkReply *)), 
             this, SLOT(dbDownloadFinished(QNetworkReply *)));

diff --git a/ut/stubs/qnetworkaccessmanager.h b/ut/stubs/qnetworkaccessmanager.h
index d6b1677..ff578b9 100644 (file)
--- a/ut/stubs/qnetworkaccessmanager.h
+++ b/ut/stubs/qnetworkaccessmanager.h
@@ -2,7 +2,6 @@
 #define QNETWORKACCESSMANAGER_H
 
 #include <QObject>
-#include <QNetworkRequest>
 #include <QStringList>
 
 class QNetworkReply;
@@ -12,7 +11,7 @@ class QNetworkAccessManager : public QObject
     Q_OBJECT
 public:
     QNetworkAccessManager(QObject *parent = 0); 
-    QNetworkReply *get(const QNetworkRequest&);
+    QNetworkReply *get(const class QNetworkRequest&);
     static QStringList urls;
 
 signals:
@@ -20,3 +19,4 @@ signals:
 };
 
 #endif //QNETWORKACCESSMANAGER_H
+

diff --git a/ut/stubs/qnetworkreply.cpp b/ut/stubs/qnetworkreply.cpp
index b5427da..e754c26 100644 (file)
--- a/ut/stubs/qnetworkreply.cpp
+++ b/ut/stubs/qnetworkreply.cpp
@@ -36,4 +36,3 @@ QByteArray QNetworkReply::readLine(qint64 maxlen)
     return data.readLine(maxlen);
 }
 
-

diff --git a/ut/ut_remotedbmgr/ut_remotedbmgr.cpp b/ut/ut_remotedbmgr/ut_remotedbmgr.cpp
index 8a4e98d..4be0615 100644 (file)
--- a/ut/ut_remotedbmgr/ut_remotedbmgr.cpp
+++ b/ut/ut_remotedbmgr/ut_remotedbmgr.cpp
@@ -1,19 +1,22 @@
-#include "qnetworkreply.h"
-#include "ut_remotedbmgr.h"
-
-#include <QtTest>
 #include <QNetworkAccessManager>
+#include <QtTest>
+
+#include "ut_remotedbmgr.h"
+#include "qnetworkreply.h"
 
 void Ut_RemoteDBMgr::initTestCase()
 {
+    subject = new RemoteDBMgr();
     dbOk = false;
-    connect(&subject, SIGNAL(dbReady(RemoteDB *)),
+    connect(subject, SIGNAL(dbReady(RemoteDB *)),
             this, SLOT(verifyDB(RemoteDB *)));
     createTestData();
+    createTestDocument();
 }
 
 void Ut_RemoteDBMgr::cleanupTestCase()
 {
+    delete subject;
 }
 
 void Ut_RemoteDBMgr::createTestData()
@@ -42,8 +45,6 @@ void Ut_RemoteDBMgr::createTestData()
     validDB.insert("A", ma);
     validDB.insert("B", mb);
     validDB.insert("C", mc);
-
-    createTestDocument();
 }
 
 void Ut_RemoteDBMgr::createTestDocument()
@@ -88,7 +89,7 @@ void Ut_RemoteDBMgr::createModelElements(const QString &mfg,
 
 void Ut_RemoteDBMgr::testGetDBAsync()
 {
-    subject.getDBAsync();
+    subject->getDBAsync();
     dbMutex.lock();
     dbVerified.wait(&dbMutex, 5000);  
     QCOMPARE(dbOk, true);

diff --git a/ut/ut_remotedbmgr/ut_remotedbmgr.h b/ut/ut_remotedbmgr/ut_remotedbmgr.h
index 436e074..84ff6f1 100644 (file)
--- a/ut/ut_remotedbmgr/ut_remotedbmgr.h
+++ b/ut/ut_remotedbmgr/ut_remotedbmgr.h
@@ -1,7 +1,6 @@
 #ifndef _UT_REMOTEDBMGR_H_
 #define _UT_REMOTEDBMGR_H_
 
-#include "qnetworkreply.h"
 #include <QObject>
 #include <QWaitCondition>
 #include <QMutex>
@@ -30,9 +29,9 @@ private:
     void verifyRemotes(RemoteDB *db);
 
 private:
+    RemoteDBMgr *subject;
     QWaitCondition dbVerified;
     QMutex dbMutex;
-    RemoteDBMgr subject;
     RemoteDB validDB;
     bool dbOk;
     QDomDocument document;

diff --git a/ut/ut_remotedbmgr/ut_remotedbmgr.mak b/ut/ut_remotedbmgr/ut_remotedbmgr.mak
index 98b3c13..f960557 100644 (file)
--- a/ut/ut_remotedbmgr/ut_remotedbmgr.mak
+++ b/ut/ut_remotedbmgr/ut_remotedbmgr.mak
@@ -1,22 +1,12 @@
-#############################################################################
-# Makefile for building: test
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Tue Jun 29 13:48:11 2010
-# Project:  ut_remotedbmgr.pro
-# Template: app
-# Command: /usr/bin/qmake -unix -o Makefile ut_remotedbmgr.pro
-#############################################################################
-
-####### Compiler, tools and options
-
 CC            = gcc
 CXX           = g++
 DEFINES       = -DQT_NO_DEBUG -DQT_TESTLIB_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I../stubs -I../../src -Imocs -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtTest -I/usr/include/qt4
+INCPATH       = -I../stubs -I../../src -Imocs -I. -I/usr/share/qt4/mkspecs/linux-g++ -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtTest -I/usr/include/qt4
 LINK          = g++
 LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib -lQtTest -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread 
+LIBS          = $(SUBLIBS)  -L/usr/lib -lQtTest -lQtXml -lQtGui -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -43,22 +33,26 @@ OBJECTS_DIR   = objs/
 
 ####### Files
 
-SOURCES       = ../stubs/qnetworkreply.cpp \
+SOURCES       = ../stubs/qnetworkrequest.cpp \
+               ../stubs/qnetworkreply.cpp \
                ../stubs/qnetworkaccessmanager.cpp \
                ut_remotedbmgr.cpp \
                ../../src/remotedbmgr.cpp \
                ../../src/remote.cpp \
                ../../src/rating.cpp \
-               ../stubs/qsettings.cpp mocs/moc_ut_remotedbmgr.cpp \
+               ../stubs/qsettings.cpp mocs/moc_qnetworkaccessmanager.cpp \
+               mocs/moc_ut_remotedbmgr.cpp \
                mocs/moc_remotedbmgr.cpp \
                mocs/moc_remote.cpp
-OBJECTS       = objs/qnetworkreply.o \
+OBJECTS       = objs/qnetworkrequest.o \
+               objs/qnetworkreply.o \
                objs/qnetworkaccessmanager.o \
                objs/ut_remotedbmgr.o \
                objs/remotedbmgr.o \
                objs/remote.o \
                objs/rating.o \
                objs/qsettings.o \
+               objs/moc_qnetworkaccessmanager.o \
                objs/moc_ut_remotedbmgr.o \
                objs/moc_remotedbmgr.o \
                objs/moc_remote.o
@@ -137,7 +131,7 @@ Makefile: ut_remotedbmgr.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/s
                /usr/lib/libQtGui.prl \
                /usr/lib/libQtNetwork.prl \
                /usr/lib/libQtCore.prl
-       $(QMAKE) -unix -o Makefile ut_remotedbmgr.pro
+#      $(QMAKE) -unix -o Makefile ut_remotedbmgr.pro
 /usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/unix.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
@@ -167,7 +161,7 @@ qmake:  FORCE
 
 dist: 
        @$(CHK_DIR_EXISTS) objs/test1.0.0 || $(MKDIR) objs/test1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) objs/test1.0.0/ && $(COPY_FILE) --parents ../stubs/qnetworkreply.h ut_remotedbmgr.h ../../src/remotedbmgr.h ../../src/remotedb.h ../../src/remote.h ../../src/rating.h ../stubs/qsettings.h objs/test1.0.0/ && $(COPY_FILE) --parents ../stubs/qnetworkreply.cpp ../stubs/qnetworkaccessmanager.cpp ut_remotedbmgr.cpp ../../src/remotedbmgr.cpp ../../src/remote.cpp ../../src/rating.cpp ../stubs/qsettings.cpp objs/test1.0.0/ && (cd `dirname objs/test1.0.0` && $(TAR) test1.0.0.tar test1.0.0 && $(COMPRESS) test1.0.0.tar) && $(MOVE) `dirname objs/test1.0.0`/test1.0.0.tar.gz . && $(DEL_FILE) -r objs/test1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) objs/test1.0.0/ && $(COPY_FILE) --parents ../stubs/qnetworkrequest.h ../stubs/qnetworkreply.h ../stubs/qnetworkaccessmanager.h ut_remotedbmgr.h ../../src/remotedbmgr.h ../../src/remotedb.h ../../src/remote.h ../../src/rating.h ../stubs/qsettings.h objs/test1.0.0/ && $(COPY_FILE) --parents ../stubs/qnetworkrequest.cpp ../stubs/qnetworkreply.cpp ../stubs/qnetworkaccessmanager.cpp ut_remotedbmgr.cpp ../../src/remotedbmgr.cpp ../../src/remote.cpp ../../src/rating.cpp ../stubs/qsettings.cpp objs/test1.0.0/ && (cd `dirname objs/test1.0.0` && $(TAR) test1.0.0.tar test1.0.0 && $(COMPRESS) test1.0.0.tar) && $(MOVE) `dirname objs/test1.0.0`/test1.0.0.tar.gz . && $(DEL_FILE) -r objs/test1.0.0
 
 
 clean:compiler_clean 
@@ -186,9 +180,12 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: mocs/moc_ut_remotedbmgr.cpp mocs/moc_remotedbmgr.cpp mocs/moc_remote.cpp
+compiler_moc_header_make_all: mocs/moc_qnetworkaccessmanager.cpp mocs/moc_ut_remotedbmgr.cpp mocs/moc_remotedbmgr.cpp mocs/moc_remote.cpp
 compiler_moc_header_clean:
-       -$(DEL_FILE) mocs/moc_ut_remotedbmgr.cpp mocs/moc_remotedbmgr.cpp mocs/moc_remote.cpp
+       -$(DEL_FILE) mocs/moc_qnetworkaccessmanager.cpp mocs/moc_ut_remotedbmgr.cpp mocs/moc_remotedbmgr.cpp mocs/moc_remote.cpp
+mocs/moc_qnetworkaccessmanager.cpp: ../stubs/qnetworkaccessmanager.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) ../stubs/qnetworkaccessmanager.h -o mocs/moc_qnetworkaccessmanager.cpp
+
 mocs/moc_ut_remotedbmgr.cpp: ut_remotedbmgr.h
        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) ut_remotedbmgr.h -o mocs/moc_ut_remotedbmgr.cpp
 
@@ -221,6 +218,9 @@ compiler_clean: compiler_moc_header_clean
 
 ####### Compile
 
+objs/qnetworkrequest.o: ../stubs/qnetworkrequest.cpp ../stubs/qnetworkrequest.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o objs/qnetworkrequest.o ../stubs/qnetworkrequest.cpp
+
 objs/qnetworkreply.o: ../stubs/qnetworkreply.cpp ../stubs/qnetworkreply.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o objs/qnetworkreply.o ../stubs/qnetworkreply.cpp
 
@@ -247,6 +247,9 @@ objs/rating.o: ../../src/rating.cpp ../../src/rating.h
 objs/qsettings.o: ../stubs/qsettings.cpp ../stubs/qsettings.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o objs/qsettings.o ../stubs/qsettings.cpp
 
+objs/moc_qnetworkaccessmanager.o: mocs/moc_qnetworkaccessmanager.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o objs/moc_qnetworkaccessmanager.o mocs/moc_qnetworkaccessmanager.cpp
+
 objs/moc_ut_remotedbmgr.o: mocs/moc_ut_remotedbmgr.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o objs/moc_ut_remotedbmgr.o mocs/moc_ut_remotedbmgr.cpp
 

diff --git a/ut/ut_remotedbmgr/ut_remotedbmgr.pro b/ut/ut_remotedbmgr/ut_remotedbmgr.pro
index 1d0b3a2..8e78a5f 100644 (file)
--- a/ut/ut_remotedbmgr/ut_remotedbmgr.pro
+++ b/ut/ut_remotedbmgr/ut_remotedbmgr.pro
@@ -5,7 +5,9 @@
 QT += xml 
 QT += network
 
+HEADERS += qnetworkrequest.h
 HEADERS += qnetworkreply.h
+HEADERS += qnetworkaccessmanager.h
 HEADERS += ut_remotedbmgr.h
 HEADERS += remotedbmgr.h
 HEADERS += remotedb.h
@@ -13,6 +15,7 @@ HEADERS += remote.h
 HEADERS += rating.h
 HEADERS += qsettings.h
 
+SOURCES += qnetworkrequest.cpp
 SOURCES += qnetworkreply.cpp
 SOURCES += qnetworkaccessmanager.cpp
 SOURCES += ut_remotedbmgr.cpp