From 3942c3bbb92738146d7710dfa1d0e4d96e4234d2 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 4 Dec 2014 14:58:16 -0800
Subject: [PATCH] More implementation of Mock

---
 src/qgcunittest/MockQGCUASParamManager.cc | 12 +++++++++---
 src/qgcunittest/MockQGCUASParamManager.h  | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/qgcunittest/MockQGCUASParamManager.cc b/src/qgcunittest/MockQGCUASParamManager.cc
index 1512c3310..c5e177c36 100644
--- a/src/qgcunittest/MockQGCUASParamManager.cc
+++ b/src/qgcunittest/MockQGCUASParamManager.cc
@@ -25,6 +25,8 @@
 #include <QTest>
 #include <QDebug>
 
+Q_LOGGING_CATEGORY(MockQGCUASParamManagerLog, "MockQGCUASParamManagerLog")
+
 MockQGCUASParamManager::MockQGCUASParamManager(void)
 {
     
@@ -36,13 +38,17 @@ bool MockQGCUASParamManager::getParameterValue(int component, const QString& par
     
     if (_mapParams.contains(parameter)) {
         value = _mapParams[parameter];
+        return true;
     }
+    
+    qCDebug(MockQGCUASParamManagerLog) << QString("getParameterValue: parameter not found %1").arg(parameter);
     return false;
 }
 
 void MockQGCUASParamManager::setParameter(int component, QString parameterName, QVariant value)
 {
-    Q_UNUSED(component);
-
-    _mapParamsSet[parameterName] = value;
+    qCDebug(MockQGCUASParamManagerLog) << QString("setParameter: component(%1) parameter(%2) value(%3)").arg(component).arg(parameterName).arg(value.toString());
+    
+    _mapParams[parameterName] = value;
+    emit parameterUpdated(_defaultComponentId, parameterName, value);
 }
diff --git a/src/qgcunittest/MockQGCUASParamManager.h b/src/qgcunittest/MockQGCUASParamManager.h
index 919470723..548eb391f 100644
--- a/src/qgcunittest/MockQGCUASParamManager.h
+++ b/src/qgcunittest/MockQGCUASParamManager.h
@@ -24,8 +24,12 @@
 #ifndef MOCKQGCUASPARAMMANAGER_H
 #define MOCKQGCUASPARAMMANAGER_H
 
+#include <QLoggingCategory>
+
 #include "QGCUASParamManagerInterface.h"
 
+Q_DECLARE_LOGGING_CATEGORY(MockQGCUASParamManagerLog)
+
 /// @file
 ///     @brief This is a mock implementation of QGCUASParamManager for writing Unit Tests.
 ///
@@ -39,11 +43,12 @@ class MockQGCUASParamManager : public QGCUASParamManagerInterface
 signals:
     // The following QGCSUASParamManagerInterface signals are supported
     void parameterListUpToDate();   // You can connect to this signal, but it will never be emitted
+    void parameterUpdated(int compId, QString paramName, QVariant value);
     
 public:
     // Implemented QGCSUASParamManager overrides
     virtual bool getParameterValue(int component, const QString& parameter, QVariant& value) const;
-    virtual int getDefaultComponentId(void) { return 0; }
+    virtual int getDefaultComponentId(void) { return _defaultComponentId; }
     virtual int countOnboardParams(void) { return _mapParams.count(); }
     
 public slots:
@@ -53,7 +58,7 @@ public slots:
         { Q_UNUSED(forceSend); setParameter(componentId, key, value); }
     virtual void sendPendingParameters(bool persistAfterSend = false, bool forceSend = false)
         { Q_UNUSED(persistAfterSend); Q_UNUSED(forceSend); }
-    virtual bool parametersReady(void) { return false; }
+    virtual bool parametersReady(void) { return true; }
     
 public:
     // MockQGCUASParamManager methods
@@ -66,9 +71,9 @@ public:
     void setMockParameters(ParamMap_t& map) { _mapParams = map; }
     
     /// Returns the parameters which were set by calls to setParameter calls
-    ParamMap_t getMockSetParameters(void) { return _mapParamsSet; }
+    ParamMap_t getMockSetParameters(void) { return _mapParams; }
     /// Clears the set of parameters set by setParameter calls
-    void clearMockSetParameters(void) { _mapParamsSet.clear(); }
+    void clearMockSetParameters(void) { _mapParams.clear(); }
     
 public:
     // Unimplemented QGCUASParamManagerInterface overrides
@@ -93,7 +98,8 @@ public slots:
     
 private:
     ParamMap_t          _mapParams;
-    ParamMap_t          _mapParamsSet;
+    
+    static const int    _defaultComponentId = 50;
 
     // Bogus variables used for return types of NYI methods
     QList<int>          _bogusQListInt;
-- 
2.22.0