From 409036b6ed3f0676ec42c97097559da9a3ca9aec Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sat, 14 Jul 2018 11:12:36 +0200
Subject: [PATCH] Possible fix to gtest

---
 radio/src/tests/mixer.cpp | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 8ed170aaf..41ed52b45 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -75,6 +75,7 @@ TEST_F(TrimsTest, throttleTrim)
   setTrimValue(0, THR_STICK, TRIM_MIN);
   evalMixes(1);
   EXPECT_EQ(channelOutputs[2], -1024);
+
   // now the same tests with extended Trims
   g_model.extendedTrims = 1;
   // stick max + trim max
@@ -344,22 +345,6 @@ TEST_F(TrimsTest, InstantTrimNegativeCurve)
   EXPECT_EQ(128, getTrimValue(0, AIL_STICK));
 }
 
-TEST_F(TrimsTest, throttleTrimEle) {
-  SYSTEM_RESET();
-  MODEL_RESET();
-  MIXER_RESET();
-  modelDefault(0);
-  g_eeGeneral.templateSetup = 17;
-  applyDefaultTemplate();
-  g_model.thrTrim = 1;
-// checks ELE sticks are not affected by throttleTrim
-// stick max + trim min
-  anaInValues[ELE_STICK] = +1024;
-  setTrimValue(0, ELE_STICK, TRIM_MIN);
-  evalMixes(1);
-  EXPECT_EQ(channelOutputs[2], 1024 - 250);
-}
-
 TEST(Curves, LinearIntpol)
 {
   SYSTEM_RESET();
@@ -568,6 +553,28 @@ TEST_F(MixerTest, SlowOnMultiply)
   CHECK_NO_MOVEMENT(0, CHANNEL_MAX, 250);
 }
 
+TEST_F(TrimsTest, throttleTrimEle) {
+  SYSTEM_RESET();
+  MODEL_RESET();
+  MIXER_RESET();
+  modelDefault(0);
+  g_eeGeneral.templateSetup = 17;
+  applyDefaultTemplate();
+  g_model.thrTrim = 1;
+// checks ELE sticks are not affected by throttleTrim
+// stick max + trim min
+  anaInValues[ELE_STICK] = +1024;
+  setTrimValue(0, ELE_STICK, TRIM_MIN);
+  evalMixes(1);
+  EXPECT_EQ(channelOutputs[2], 1024 - 250);
+  SYSTEM_RESET();
+  MODEL_RESET();
+  MIXER_RESET();
+  modelDefault(0);
+  g_eeGeneral.templateSetup = 0;
+  applyDefaultTemplate();
+}
+
 #if defined(HELI)
 TEST(Heli, BasicTest)
 {