From c3b6c2021014eb0b6dab10f11b14dc8c6d35e2e3 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 15 Feb 2017 14:09:53 -0800
Subject: [PATCH] Fix unit test to new mock link component id

---
 src/FactSystem/FactSystemTest.qml    | 2 +-
 src/FactSystem/FactSystemTestBase.cc | 4 ++--
 src/comm/MockLink.cc                 | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/FactSystem/FactSystemTest.qml b/src/FactSystem/FactSystemTest.qml
index a9155de82..8ac4d9ada 100644
--- a/src/FactSystem/FactSystemTest.qml
+++ b/src/FactSystem/FactSystemTest.qml
@@ -32,7 +32,7 @@ FactPanel {
     TextInput {
         text:       fact2.value
 
-        property Fact fact2: controller.getParameterFact(1, "RC_MAP_THROTTLE")
+        property Fact fact2: controller.getParameterFact(200, "RC_MAP_THROTTLE")
 
         onAccepted: fact2.value = text
     }
diff --git a/src/FactSystem/FactSystemTestBase.cc b/src/FactSystem/FactSystemTestBase.cc
index 58fbe6ea8..35f920229 100644
--- a/src/FactSystem/FactSystemTestBase.cc
+++ b/src/FactSystem/FactSystemTestBase.cc
@@ -58,8 +58,8 @@ void FactSystemTestBase::_parameter_default_component_id_test(void)
 
 void FactSystemTestBase::_parameter_specific_component_id_test(void)
 {
-    QVERIFY(_vehicle->parameterManager()->parameterExists(1, "RC_MAP_THROTTLE"));
-    Fact* fact = _vehicle->parameterManager()->getParameter(1, "RC_MAP_THROTTLE");
+    QVERIFY(_vehicle->parameterManager()->parameterExists(200, "RC_MAP_THROTTLE"));
+    Fact* fact = _vehicle->parameterManager()->getParameter(200, "RC_MAP_THROTTLE");
     QVERIFY(fact != NULL);
     QVariant factValue = fact->rawValue();
     QCOMPARE(factValue.isValid(), true);
diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index 24def6a8a..b3cd24ff6 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -215,7 +215,6 @@ void MockLink::_loadParams(void)
         QStringList paramData = line.split("\t");
         Q_ASSERT(paramData.count() == 5);
 
-        int componentId = paramData.at(1).toInt();
         QString paramName = paramData.at(2);
         QString valStr = paramData.at(3);
         uint paramType = paramData.at(4).toUInt();
@@ -251,7 +250,7 @@ void MockLink::_loadParams(void)
 
         qCDebug(MockLinkVerboseLog) << "Loading param" << paramName << paramValue;
 
-        _mapParamName2Value[componentId][paramName] = paramValue;
+        _mapParamName2Value[_vehicleComponentId][paramName] = paramValue;
         _mapParamName2MavParamType[paramName] = static_cast<MAV_PARAM_TYPE>(paramType);
     }
 }
-- 
2.22.0