From bfbacf8b444b34ab1d0831b316162f50d790a299 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Sat, 28 Jan 2017 07:37:15 +0000
Subject: [PATCH] Fixup test code

---
 src/test/Makefile                        | 16 ++++++++--------
 src/test/unit/telemetry_crsf_unittest.cc | 14 +++++++-------
 src/test/unit/telemetry_hott_unittest.cc | 20 ++++++++++----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/test/Makefile b/src/test/Makefile
index 9f1e83940..26b95987c 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -256,24 +256,24 @@ $(OBJECT_DIR)/altitude_hold_unittest : \
 	$(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
 
-$(OBJECT_DIR)/flight/gps_conversion.o : \
-	$(USER_DIR)/flight/gps_conversion.c \
-	$(USER_DIR)/flight/gps_conversion.h \
+$(OBJECT_DIR)/common/gps_conversion.o : \
+	$(USER_DIR)/common/gps_conversion.c \
+	$(USER_DIR)/common/gps_conversion.h \
 	$(GTEST_HEADERS)
 
 	@mkdir -p $(dir $@)
-	$(CC) $(C_FLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/flight/gps_conversion.c -o $@
+	$(CC) $(C_FLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/common/gps_conversion.c -o $@
 
 $(OBJECT_DIR)/gps_conversion_unittest.o : \
 	$(TEST_DIR)/gps_conversion_unittest.cc \
-	$(USER_DIR)/flight/gps_conversion.h \
+	$(USER_DIR)/common/gps_conversion.h \
 	$(GTEST_HEADERS)
 
 	@mkdir -p $(dir $@)
 	$(CXX) $(CXX_FLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/gps_conversion_unittest.cc -o $@
 
 $(OBJECT_DIR)/gps_conversion_unittest : \
-	$(OBJECT_DIR)/flight/gps_conversion.o \
+	$(OBJECT_DIR)/common/gps_conversion.o \
 	$(OBJECT_DIR)/gps_conversion_unittest.o \
 	$(OBJECT_DIR)/gtest_main.a
 
@@ -359,7 +359,7 @@ $(OBJECT_DIR)/telemetry_hott_unittest.o : \
 $(OBJECT_DIR)/telemetry_hott_unittest : \
 	$(OBJECT_DIR)/telemetry/hott.o \
 	$(OBJECT_DIR)/telemetry_hott_unittest.o \
-	$(OBJECT_DIR)/flight/gps_conversion.o \
+	$(OBJECT_DIR)/common/gps_conversion.o \
 	$(OBJECT_DIR)/gtest_main.a
 
 	$(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
@@ -537,7 +537,7 @@ $(OBJECT_DIR)/telemetry_crsf_unittest : \
 	$(OBJECT_DIR)/telemetry_crsf_unittest.o \
 	$(OBJECT_DIR)/common/maths.o \
 	$(OBJECT_DIR)/common/streambuf.o \
-	$(OBJECT_DIR)/flight/gps_conversion.o \
+	$(OBJECT_DIR)/common/gps_conversion.o \
 	$(OBJECT_DIR)/fc/runtime_config.o \
 	$(OBJECT_DIR)/gtest_main.a
 
diff --git a/src/test/unit/telemetry_crsf_unittest.cc b/src/test/unit/telemetry_crsf_unittest.cc
index bb1a526d7..cfe99b794 100644
--- a/src/test/unit/telemetry_crsf_unittest.cc
+++ b/src/test/unit/telemetry_crsf_unittest.cc
@@ -28,30 +28,30 @@ extern "C" {
 
     #include "common/axis.h"
     #include "common/filter.h"
+    #include "common/gps_conversion.h"
     #include "common/maths.h"
 
     #include "config/parameter_group.h"
     #include "config/parameter_group_ids.h"
 
-    #include "drivers/system.h"
     #include "drivers/serial.h"
+    #include "drivers/system.h"
 
     #include "fc/runtime_config.h"
 
+    #include "flight/pid.h"
+    #include "flight/imu.h"
+
     #include "io/gps.h"
     #include "io/serial.h"
 
     #include "rx/crsf.h"
 
-    #include "sensors/sensors.h"
     #include "sensors/battery.h"
+    #include "sensors/sensors.h"
 
-    #include "telemetry/telemetry.h"
     #include "telemetry/crsf.h"
-
-    #include "flight/pid.h"
-    #include "flight/imu.h"
-    #include "flight/gps_conversion.h"
+    #include "telemetry/telemetry.h"
 
     bool airMode;
     uint16_t vbat;
diff --git a/src/test/unit/telemetry_hott_unittest.cc b/src/test/unit/telemetry_hott_unittest.cc
index ff984b097..bc0d60ad0 100644
--- a/src/test/unit/telemetry_hott_unittest.cc
+++ b/src/test/unit/telemetry_hott_unittest.cc
@@ -27,24 +27,24 @@ extern "C" {
     #include "build/debug.h"
 
     #include "common/axis.h"
+    #include "common/gps_conversion.h"
 
-    #include "drivers/system.h"
     #include "drivers/serial.h"
+    #include "drivers/system.h"
 
-    #include "sensors/sensors.h"
-    #include "sensors/battery.h"
-    #include "sensors/barometer.h"
+    #include "fc/runtime_config.h"
+
+    #include "flight/pid.h"
 
-    #include "io/serial.h"
     #include "io/gps.h"
+    #include "io/serial.h"
+
+    #include "sensors/barometer.h"
+    #include "sensors/battery.h"
+    #include "sensors/sensors.h"
 
     #include "telemetry/telemetry.h"
     #include "telemetry/hott.h"
-
-    #include "flight/pid.h"
-    #include "flight/gps_conversion.h"
-
-    #include "fc/runtime_config.h"
 }
 
 #include "unittest_macros.h"