Refactor QA code

src/tests/CMakeLists.txt

@@ -203,8 +203,8 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 
 add_executable(control_thread_test
      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/control_thread/control_message_factory_test.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/control_thread/control_thread_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc
 )
 if(NOT ${ENABLE_PACKAGING})
      set_property(TARGET control_thread_test PROPERTY EXCLUDE_FROM_ALL TRUE)
@@ -230,7 +230,7 @@ set_property(TEST control_thread_test PROPERTY TIMEOUT 30)
 
 add_executable(flowgraph_test
      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/flowgraph/gnss_flowgraph_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc
 )
 if(NOT ${ENABLE_PACKAGING})
      set_property(TARGET flowgraph_test PROPERTY EXCLUDE_FROM_ALL TRUE)
@@ -256,10 +256,10 @@ set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
 
 add_executable(gnss_block_test
      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/file_signal_source_test.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/fir_filter_test.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/flowgraph/pass_through_test.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gnss_block_factory_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing/sources/file_signal_source_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing/filter/fir_filter_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing/adapter/pass_through_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
 )
 if(NOT ${ENABLE_PACKAGING})
      set_property(TARGET gnss_block_test PROPERTY EXCLUDE_FROM_ALL TRUE)
@@ -289,7 +289,7 @@ endif(NOT ${GTEST_DIR_LOCAL})
 
 add_executable(gnuradio_block_test
      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio_block/unpack_2bit_samples_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing/sources/unpack_2bit_samples_test.cc
 )
 if(NOT ${ENABLE_PACKAGING})
      set_property(TARGET gnuradio_block_test PROPERTY EXCLUDE_FROM_ALL TRUE)
@@ -341,8 +341,8 @@ endif(NOT ${GTEST_DIR_LOCAL})
 
 add_executable(trk_test
      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/galileo_e1_dll_pll_veml_tracking_test.cc
-     ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tracking_loop_filter_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
+     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing/tracking/tracking_loop_filter_test.cc
 )
 if(NOT ${ENABLE_PACKAGING})
      set_property(TARGET trk_test PROPERTY EXCLUDE_FROM_ALL TRUE)

src/tests/test_main.cc

@@ -69,57 +69,62 @@ using google::LogMessage;
 
 DECLARE_string(log_dir);
 
-#include "arithmetic/complex_carrier_test.cc"
-#include "arithmetic/conjugate_test.cc"
-#include "arithmetic/magnitude_squared_test.cc"
-#include "arithmetic/multiply_test.cc"
-#include "arithmetic/code_generation_test.cc"
-#include "arithmetic/tracking_loop_filter_test.cc"
-#include "arithmetic/fft_length_test.cc"
-#include "configuration/file_configuration_test.cc"
-#include "configuration/in_memory_configuration_test.cc"
-#include "control_thread/control_message_factory_test.cc"
-#include "control_thread/control_thread_test.cc"
-#include "flowgraph/pass_through_test.cc"
-#include "flowgraph/gnss_flowgraph_test.cc"
-#include "formats/string_converter_test.cc"
-#include "formats/rtcm_test.cc"
-#include "gnss_block/gnss_block_factory_test.cc"
-#include "gnss_block/rtcm_printer_test.cc"
-#include "gnss_block/file_signal_source_test.cc"
-#include "gnss_block/fir_filter_test.cc"
-#include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc"
-#include "gnss_block/gps_l2_m_pcps_acquisition_test.cc"
-#include "gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc"
-//#include "gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc"
-#include "arithmetic/cpu_multicorrelator_test.cc"
+#include "unit-tests/arithmetic/complex_carrier_test.cc"
+#include "unit-tests/arithmetic/conjugate_test.cc"
+#include "unit-tests/arithmetic/magnitude_squared_test.cc"
+#include "unit-tests/arithmetic/multiply_test.cc"
+#include "unit-tests/arithmetic/code_generation_test.cc"
+#include "unit-tests/arithmetic/fft_length_test.cc"
+
+#include "unit-tests/control-plane/file_configuration_test.cc"
+#include "unit-tests/control-plane/in_memory_configuration_test.cc"
+#include "unit-tests/control-plane/control_message_factory_test.cc"
+#include "unit-tests/control-plane/control_thread_test.cc"
+#include "unit-tests/control-plane/gnss_flowgraph_test.cc"
+#include "unit-tests/control-plane/string_converter_test.cc"
+#include "unit-tests/control-plane/gnss_block_factory_test.cc"
+
+#include "unit-tests/signal-processing/sources/file_signal_source_test.cc"
+#include "unit-tests/signal-processing/sources/gnss_sdr_valve_test.cc"
+
+#include "unit-tests/signal-processing/adapter/pass_through_test.cc"
+
+#include "unit-tests/signal-processing/filter/fir_filter_test.cc"
+
+#include "unit-tests/signal-processing/resampler/direct_resampler_conditioner_cc_test.cc"
+
+#include "unit-tests/signal-processing/acquisition/gps_l1_ca_pcps_acquisition_test.cc"
+#include "unit-tests/signal-processing/acquisition/gps_l2_m_pcps_acquisition_test.cc"
+#include "unit-tests/signal-processing/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc"
+#include "unit-tests/signal-processing/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc"
+#include "unit-tests/signal-processing/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc"
+//#include "unit-tests/signal-processing/acquisition/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc"
 #if OPENCL_BLOCKS_TEST
-#include "gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc"
+#include "unit-tests/signal-processing/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc"
 #endif
 
+#include "unit-tests/signal-processing/tracking/galileo_e1_dll_pll_veml_tracking_test.cc"
+#include "unit-tests/signal-processing/tracking/galileo_e5a_tracking_test.cc"
+#include "unit-tests/signal-processing/tracking/gps_l2_m_dll_pll_tracking_test.cc"
+#include "unit-tests/signal-processing/tracking/tracking_loop_filter_test.cc"
+#include "unit-tests/signal-processing/tracking/cpu_multicorrelator_test.cc"
 #if CUDA_BLOCKS_TEST
-	#include "arithmetic/gpu_multicorrelator_test.cc"
+	#include "unit-tests/signal-processing/tracking/gpu_multicorrelator_test.cc"
 #endif
 
-#include "gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc"
-#include "gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc"
-#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc"
-#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc"
-#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc"
-#include "gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc"
-#include "gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc"
-#include "gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc"
-#include "gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc"
-#include "gnss_block/galileo_e1_dll_pll_veml_tracking_test.cc"
-#include "gnuradio_block/gnss_sdr_valve_test.cc"
-#include "gnuradio_block/direct_resampler_conditioner_cc_test.cc"
-#include "gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc"
-#include "gnss_block/galileo_e5a_tracking_test.cc"
-#include "gnss_block/gps_l2_m_dll_pll_tracking_test.cc"
+#include "unit-tests/signal-processing/pvt/rtcm_test.cc"
+#include "unit-tests/signal-processing/pvt/rtcm_printer_test.cc"
 
 
 // For GPS NAVIGATION (L1)
-
 concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
 concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;