Move tests around

3 years ago · 8d4db2edf5
136 changed files with 41 additions and 42 deletions
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@ -19,23 +19,7 @@
 # or you may write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

-include(KiCadQABuildUtils)
-
-if( KICAD_TEST_XML_OUTPUT )
-    # To do this, you will need xmlrunner
-    set( PY_TEST_ARGS --xml=${CMAKE_CURRENT_BINARY_DIR}/python.xunit-results )
-endif()
-
-# Test that runs the QA tests through scripting
-add_test( NAME qa_python
-    COMMAND ${PYTHON_EXECUTABLE} test.py ${PY_TEST_ARGS}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-
-set_property( TEST qa_python
-    PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/pcbnew${PYTHON_QA_PATH}"
-)
+include( KiCadQABuildUtils )

 # Shared QA helper libraries
 add_subdirectory( qa_utils )
@ -43,7 +27,7 @@ add_subdirectory( pcbnew_utils )
 add_subdirectory( schematic_utils )

 # Unit tests
-add_subdirectory( unittests )
+add_subdirectory( tests )

 # Utility/debugging/profiling programs
 add_subdirectory( tools )
--- a/qa/unittests/CMakeLists.txt
+++ b/qa/unittests/CMakeLists.txt
@ -29,3 +29,18 @@ add_subdirectory( pcbnew )
 if( KICAD_SPICE_QA )
    add_subdirectory( spice )
 endif()
+
+if( KICAD_TEST_XML_OUTPUT )
+    # To do this, you will need xmlrunner
+    set( PY_TEST_ARGS --xml=${CMAKE_CURRENT_BINARY_DIR}/python.xunit-results )
+endif()
+
+# Test that runs the QA tests through scripting
+add_test( NAME qa_python
+    COMMAND ${PYTHON_EXECUTABLE} test-pcbnewswig.py ${PY_TEST_ARGS}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set_property( TEST qa_python
+    PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/pcbnew${PYTHON_QA_PATH}"
+)
--- a/qa/unittests/common/CMakeLists.txt
+++ b/qa/unittests/common/CMakeLists.txt
--- a/qa/unittests/common/color4d_test_utils.h
+++ b/qa/unittests/common/color4d_test_utils.h
--- a/qa/unittests/common/console_log.h
+++ b/qa/unittests/common/console_log.h
--- a/qa/unittests/common/libeval/test_numeric_evaluator.cpp
+++ b/qa/unittests/common/libeval/test_numeric_evaluator.cpp
--- a/qa/unittests/common/plugins/altium/test_altium_parser.cpp
+++ b/qa/unittests/common/plugins/altium/test_altium_parser.cpp
--- a/qa/unittests/common/plugins/altium/test_altium_parser_utils.cpp
+++ b/qa/unittests/common/plugins/altium/test_altium_parser_utils.cpp
--- a/qa/unittests/common/plugins/cadstar/test_cadstar_archive_parser.cpp
+++ b/qa/unittests/common/plugins/cadstar/test_cadstar_archive_parser.cpp
--- a/qa/unittests/common/plugins/cadstar/test_cadstar_parts_parser.cpp
+++ b/qa/unittests/common/plugins/cadstar/test_cadstar_parts_parser.cpp
--- a/qa/unittests/common/test_array_axis.cpp
+++ b/qa/unittests/common/test_array_axis.cpp
--- a/qa/unittests/common/test_array_options.cpp
+++ b/qa/unittests/common/test_array_options.cpp
--- a/qa/unittests/common/test_bitmap_base.cpp
+++ b/qa/unittests/common/test_bitmap_base.cpp
--- a/qa/unittests/common/test_color4d.cpp
+++ b/qa/unittests/common/test_color4d.cpp
--- a/qa/unittests/common/test_coroutine.cpp
+++ b/qa/unittests/common/test_coroutine.cpp
--- a/qa/unittests/common/test_database.cpp
+++ b/qa/unittests/common/test_database.cpp
--- a/qa/unittests/common/test_eda_shape.cpp
+++ b/qa/unittests/common/test_eda_shape.cpp
--- a/qa/unittests/common/test_eda_text.cpp
+++ b/qa/unittests/common/test_eda_text.cpp
--- a/qa/unittests/common/test_format_units.cpp
+++ b/qa/unittests/common/test_format_units.cpp
--- a/qa/unittests/common/test_kicad_string.cpp
+++ b/qa/unittests/common/test_kicad_string.cpp
--- a/qa/unittests/common/test_kicad_stroke_font.cpp
+++ b/qa/unittests/common/test_kicad_stroke_font.cpp
--- a/qa/unittests/common/test_kiid.cpp
+++ b/qa/unittests/common/test_kiid.cpp
--- a/qa/unittests/common/test_lib_table.cpp
+++ b/qa/unittests/common/test_lib_table.cpp
--- a/qa/unittests/common/test_markup_parser.cpp
+++ b/qa/unittests/common/test_markup_parser.cpp
--- a/qa/unittests/common/test_module.cpp
+++ b/qa/unittests/common/test_module.cpp
--- a/qa/unittests/common/test_property.cpp
+++ b/qa/unittests/common/test_property.cpp
--- a/qa/unittests/common/test_refdes_utils.cpp
+++ b/qa/unittests/common/test_refdes_utils.cpp
--- a/qa/unittests/common/test_text_attributes.cpp
+++ b/qa/unittests/common/test_text_attributes.cpp
--- a/qa/unittests/common/test_title_block.cpp
+++ b/qa/unittests/common/test_title_block.cpp
--- a/qa/unittests/common/test_types.cpp
+++ b/qa/unittests/common/test_types.cpp
--- a/qa/unittests/common/test_utf8.cpp
+++ b/qa/unittests/common/test_utf8.cpp
--- a/qa/unittests/common/test_wildcards_and_files_ext.cpp
+++ b/qa/unittests/common/test_wildcards_and_files_ext.cpp
--- a/qa/unittests/common/test_wx_filename.cpp
+++ b/qa/unittests/common/test_wx_filename.cpp
--- a/qa/unittests/common/view/test_zoom_controller.cpp
+++ b/qa/unittests/common/view/test_zoom_controller.cpp
--- a/qa/unittests/common/wximage_test_utils.cpp
+++ b/qa/unittests/common/wximage_test_utils.cpp
--- a/qa/unittests/common/wximage_test_utils.h
+++ b/qa/unittests/common/wximage_test_utils.h
--- a/qa/unittests/eeschema/CMakeLists.txt
+++ b/qa/unittests/eeschema/CMakeLists.txt
@ -46,8 +46,8 @@ set( QA_EESCHEMA_SRCS
    test_sch_biu.cpp

    # Shared between programs, but dependent on the BIU
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_format_units.cpp
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_array_options.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_format_units.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_array_options.cpp

    sch_plugins/altium/test_altium_parser_sch.cpp

--- a/qa/unittests/eeschema/erc/test_erc_global_labels.cpp
+++ b/qa/unittests/eeschema/erc/test_erc_global_labels.cpp
--- a/qa/unittests/eeschema/erc/test_erc_hierarchical_schematics.cpp
+++ b/qa/unittests/eeschema/erc/test_erc_hierarchical_schematics.cpp
--- a/qa/unittests/eeschema/erc/test_erc_label_not_connected.cpp
+++ b/qa/unittests/eeschema/erc/test_erc_label_not_connected.cpp
--- a/qa/unittests/eeschema/erc/test_erc_no_connect.cpp
+++ b/qa/unittests/eeschema/erc/test_erc_no_connect.cpp
--- a/qa/unittests/eeschema/erc/test_erc_stacking_pins.cpp
+++ b/qa/unittests/eeschema/erc/test_erc_stacking_pins.cpp
--- a/qa/unittests/eeschema/lib_field_test_utils.h
+++ b/qa/unittests/eeschema/lib_field_test_utils.h
--- a/qa/unittests/eeschema/netdiff.py
+++ b/qa/unittests/eeschema/netdiff.py
--- a/qa/unittests/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp
+++ b/qa/unittests/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp
--- a/qa/unittests/eeschema/test_eagle_plugin.cpp
+++ b/qa/unittests/eeschema/test_eagle_plugin.cpp
--- a/qa/unittests/eeschema/test_ee_item.cpp
+++ b/qa/unittests/eeschema/test_ee_item.cpp
--- a/qa/unittests/eeschema/test_legacy_power_symbols.cpp
+++ b/qa/unittests/eeschema/test_legacy_power_symbols.cpp
--- a/qa/unittests/eeschema/test_lib_part.cpp
+++ b/qa/unittests/eeschema/test_lib_part.cpp
--- a/qa/unittests/eeschema/test_module.cpp
+++ b/qa/unittests/eeschema/test_module.cpp
--- a/qa/unittests/eeschema/test_netlist_exporter_kicad.cpp
+++ b/qa/unittests/eeschema/test_netlist_exporter_kicad.cpp
--- a/qa/unittests/eeschema/test_netlist_exporter_spice.cpp
+++ b/qa/unittests/eeschema/test_netlist_exporter_spice.cpp
--- a/qa/unittests/eeschema/test_netlist_exporter_spice.h
+++ b/qa/unittests/eeschema/test_netlist_exporter_spice.h
--- a/qa/unittests/eeschema/test_netlists.cpp
+++ b/qa/unittests/eeschema/test_netlists.cpp
--- a/qa/unittests/eeschema/test_pin_numbers.cpp
+++ b/qa/unittests/eeschema/test_pin_numbers.cpp
--- a/qa/unittests/eeschema/test_sch_biu.cpp
+++ b/qa/unittests/eeschema/test_sch_biu.cpp
--- a/qa/unittests/eeschema/test_sch_netclass.cpp
+++ b/qa/unittests/eeschema/test_sch_netclass.cpp
--- a/qa/unittests/eeschema/test_sch_pin.cpp
+++ b/qa/unittests/eeschema/test_sch_pin.cpp
--- a/qa/unittests/eeschema/test_sch_reference_list.cpp
+++ b/qa/unittests/eeschema/test_sch_reference_list.cpp
--- a/qa/unittests/eeschema/test_sch_rtree.cpp
+++ b/qa/unittests/eeschema/test_sch_rtree.cpp
--- a/qa/unittests/eeschema/test_sch_sheet.cpp
+++ b/qa/unittests/eeschema/test_sch_sheet.cpp
--- a/qa/unittests/eeschema/test_sch_sheet_list.cpp
+++ b/qa/unittests/eeschema/test_sch_sheet_list.cpp
--- a/qa/unittests/eeschema/test_sch_sheet_path.cpp
+++ b/qa/unittests/eeschema/test_sch_sheet_path.cpp
--- a/qa/unittests/eeschema/test_sch_symbol.cpp
+++ b/qa/unittests/eeschema/test_sch_symbol.cpp
--- a/qa/unittests/gerbview/CMakeLists.txt
+++ b/qa/unittests/gerbview/CMakeLists.txt
@ -25,7 +25,7 @@ set( QA_GERBVIEW_SRCS
    test_module.cpp

    # Shared between programs, but dependent on the BIU
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_format_units.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_format_units.cpp
 )

 if( WIN32 )
--- a/qa/unittests/gerbview/test_module.cpp
+++ b/qa/unittests/gerbview/test_module.cpp
--- a/qa/unittests/libs/CMakeLists.txt
+++ b/qa/unittests/libs/CMakeLists.txt
--- a/qa/unittests/libs/kimath/CMakeLists.txt
+++ b/qa/unittests/libs/kimath/CMakeLists.txt
--- a/qa/unittests/libs/kimath/geometry/fixtures_geometry.h
+++ b/qa/unittests/libs/kimath/geometry/fixtures_geometry.h
--- a/qa/unittests/libs/kimath/geometry/geom_test_utils.h
+++ b/qa/unittests/libs/kimath/geometry/geom_test_utils.h
--- a/qa/unittests/libs/kimath/geometry/test_circle.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_circle.cpp
--- a/qa/unittests/libs/kimath/geometry/test_eda_angle.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_eda_angle.cpp
--- a/qa/unittests/libs/kimath/geometry/test_ellipse_to_bezier.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_ellipse_to_bezier.cpp
--- a/qa/unittests/libs/kimath/geometry/test_fillet.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_fillet.cpp
--- a/qa/unittests/libs/kimath/geometry/test_segment.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_segment.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_arc.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_arc.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_compound_collision.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_compound_collision.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_line_chain.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_line_chain.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_poly_set.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_poly_set.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_arcs.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_poly_set_arcs.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_collision.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_poly_set_collision.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_distance.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_poly_set_distance.cpp
--- a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_iterator.cpp
+++ b/qa/unittests/libs/kimath/geometry/test_shape_poly_set_iterator.cpp
--- a/qa/unittests/libs/kimath/kimath_test_module.cpp
+++ b/qa/unittests/libs/kimath/kimath_test_module.cpp
--- a/qa/unittests/libs/kimath/math/test_box2.cpp
+++ b/qa/unittests/libs/kimath/math/test_box2.cpp
--- a/qa/unittests/libs/kimath/math/test_matrix3x3.cpp
+++ b/qa/unittests/libs/kimath/math/test_matrix3x3.cpp
--- a/qa/unittests/libs/kimath/math/test_util.cpp
+++ b/qa/unittests/libs/kimath/math/test_util.cpp
--- a/qa/unittests/libs/kimath/math/test_vector2.cpp
+++ b/qa/unittests/libs/kimath/math/test_vector2.cpp
--- a/qa/unittests/libs/kimath/math/test_vector3.cpp
+++ b/qa/unittests/libs/kimath/math/test_vector3.cpp
--- a/qa/unittests/libs/kimath/test_kimath.cpp
+++ b/qa/unittests/libs/kimath/test_kimath.cpp
--- a/qa/unittests/libs/sexpr/CMakeLists.txt
+++ b/qa/unittests/libs/sexpr/CMakeLists.txt
--- a/qa/unittests/libs/sexpr/sexpr_test_utils.h
+++ b/qa/unittests/libs/sexpr/sexpr_test_utils.h
--- a/qa/unittests/libs/sexpr/test_module.cpp
+++ b/qa/unittests/libs/sexpr/test_module.cpp
--- a/qa/unittests/libs/sexpr/test_sexpr.cpp
+++ b/qa/unittests/libs/sexpr/test_sexpr.cpp
--- a/qa/unittests/libs/sexpr/test_sexpr_parser.cpp
+++ b/qa/unittests/libs/sexpr/test_sexpr_parser.cpp
--- a/qa/unittests/pcbnew/CMakeLists.txt
+++ b/qa/unittests/pcbnew/CMakeLists.txt
@ -24,8 +24,8 @@ set( QA_PCBNEW_SRCS
    test_module.cpp

    # Shared between programs, but dependent on the BIU
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_format_units.cpp
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_array_options.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_format_units.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_array_options.cpp

    # testing utility routines
    drc/drc_test_utils.cpp
--- a/qa/unittests/pcbnew/drc/drc_test_utils.cpp
+++ b/qa/unittests/pcbnew/drc/drc_test_utils.cpp
--- a/qa/unittests/pcbnew/drc/drc_test_utils.h
+++ b/qa/unittests/pcbnew/drc/drc_test_utils.h
--- a/qa/unittests/pcbnew/drc/test_custom_rule_severities.cpp
+++ b/qa/unittests/pcbnew/drc/test_custom_rule_severities.cpp
--- a/qa/unittests/pcbnew/drc/test_drc_copper_conn.cpp
+++ b/qa/unittests/pcbnew/drc/test_drc_copper_conn.cpp