From 8d4db2edf5dd29d694a8907416ac641f6272f219 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 24 Apr 2023 18:40:57 -0400 Subject: [PATCH] Move tests around --- qa/CMakeLists.txt | 20 ++-------------- qa/{unittests => tests}/CMakeLists.txt | 15 ++++++++++++ qa/{unittests => tests}/common/CMakeLists.txt | 0 .../common/color4d_test_utils.h | 0 qa/{unittests => tests}/common/console_log.h | 0 .../common/libeval/test_numeric_evaluator.cpp | 0 .../plugins/altium/test_altium_parser.cpp | 0 .../altium/test_altium_parser_utils.cpp | 0 .../cadstar/test_cadstar_archive_parser.cpp | 0 .../cadstar/test_cadstar_parts_parser.cpp | 0 .../common/test_array_axis.cpp | 0 .../common/test_array_options.cpp | 0 .../common/test_bitmap_base.cpp | 0 .../common/test_color4d.cpp | 0 .../common/test_coroutine.cpp | 0 .../common/test_database.cpp | 0 .../common/test_eda_shape.cpp | 0 .../common/test_eda_text.cpp | 0 .../common/test_format_units.cpp | 0 .../common/test_kicad_string.cpp | 0 .../common/test_kicad_stroke_font.cpp | 0 qa/{unittests => tests}/common/test_kiid.cpp | 0 .../common/test_lib_table.cpp | 0 .../common/test_markup_parser.cpp | 0 .../common/test_module.cpp | 0 .../common/test_property.cpp | 0 .../common/test_refdes_utils.cpp | 0 .../common/test_text_attributes.cpp | 0 .../common/test_title_block.cpp | 0 qa/{unittests => tests}/common/test_types.cpp | 0 qa/{unittests => tests}/common/test_utf8.cpp | 0 .../common/test_wildcards_and_files_ext.cpp | 0 .../common/test_wx_filename.cpp | 0 .../common/view/test_zoom_controller.cpp | 0 .../common/wximage_test_utils.cpp | 0 .../common/wximage_test_utils.h | 0 .../eeschema/CMakeLists.txt | 4 ++-- .../eeschema/erc/test_erc_global_labels.cpp | 0 .../erc/test_erc_hierarchical_schematics.cpp | 0 .../erc/test_erc_label_not_connected.cpp | 0 .../eeschema/erc/test_erc_no_connect.cpp | 0 .../eeschema/erc/test_erc_stacking_pins.cpp | 0 .../eeschema/lib_field_test_utils.h | 0 qa/{unittests => tests}/eeschema/netdiff.py | 0 .../altium/test_altium_parser_sch.cpp | 0 .../eeschema/test_eagle_plugin.cpp | 0 .../eeschema/test_ee_item.cpp | 0 .../eeschema/test_legacy_power_symbols.cpp | 0 .../eeschema/test_lib_part.cpp | 0 .../eeschema/test_module.cpp | 0 .../eeschema/test_netlist_exporter_kicad.cpp | 0 .../eeschema/test_netlist_exporter_spice.cpp | 0 .../eeschema/test_netlist_exporter_spice.h | 0 .../eeschema/test_netlists.cpp | 0 .../eeschema/test_pin_numbers.cpp | 0 .../eeschema/test_sch_biu.cpp | 0 .../eeschema/test_sch_netclass.cpp | 0 .../eeschema/test_sch_pin.cpp | 0 .../eeschema/test_sch_reference_list.cpp | 0 .../eeschema/test_sch_rtree.cpp | 0 .../eeschema/test_sch_sheet.cpp | 0 .../eeschema/test_sch_sheet_list.cpp | 0 .../eeschema/test_sch_sheet_path.cpp | 0 .../eeschema/test_sch_symbol.cpp | 0 .../gerbview/CMakeLists.txt | 2 +- .../gerbview/test_module.cpp | 0 qa/{unittests => tests}/libs/CMakeLists.txt | 0 .../libs/kimath/CMakeLists.txt | 0 .../libs/kimath/geometry/fixtures_geometry.h | 0 .../libs/kimath/geometry/geom_test_utils.h | 0 .../libs/kimath/geometry/test_circle.cpp | 0 .../libs/kimath/geometry/test_eda_angle.cpp | 0 .../geometry/test_ellipse_to_bezier.cpp | 0 .../libs/kimath/geometry/test_fillet.cpp | 0 .../libs/kimath/geometry/test_segment.cpp | 0 .../libs/kimath/geometry/test_shape_arc.cpp | 0 .../test_shape_compound_collision.cpp | 0 .../kimath/geometry/test_shape_line_chain.cpp | 0 .../kimath/geometry/test_shape_poly_set.cpp | 0 .../geometry/test_shape_poly_set_arcs.cpp | 0 .../test_shape_poly_set_collision.cpp | 0 .../geometry/test_shape_poly_set_distance.cpp | 0 .../geometry/test_shape_poly_set_iterator.cpp | 0 .../libs/kimath/kimath_test_module.cpp | 0 .../libs/kimath/math/test_box2.cpp | 0 .../libs/kimath/math/test_matrix3x3.cpp | 0 .../libs/kimath/math/test_util.cpp | 0 .../libs/kimath/math/test_vector2.cpp | 0 .../libs/kimath/math/test_vector3.cpp | 0 .../libs/kimath/test_kimath.cpp | 0 .../libs/sexpr/CMakeLists.txt | 0 .../libs/sexpr/sexpr_test_utils.h | 0 .../libs/sexpr/test_module.cpp | 0 .../libs/sexpr/test_sexpr.cpp | 0 .../libs/sexpr/test_sexpr_parser.cpp | 0 qa/{unittests => tests}/pcbnew/CMakeLists.txt | 4 ++-- .../pcbnew/drc/drc_test_utils.cpp | 0 .../pcbnew/drc/drc_test_utils.h | 0 .../drc/test_custom_rule_severities.cpp | 0 .../pcbnew/drc/test_drc_copper_conn.cpp | 0 .../pcbnew/drc/test_drc_courtyard_invalid.cpp | 0 .../pcbnew/drc/test_drc_courtyard_overlap.cpp | 0 .../pcbnew/drc/test_drc_regressions.cpp | 0 .../pcbnew/drc/test_solder_mask_bridging.cpp | 0 .../pcbnew/group_saveload.cpp | 0 .../altium/test_altium_pcblib_import.cpp | 0 .../altium/test_altium_rule_transformer.cpp | 0 .../plugins/eagle/test_eagle_lbr_import.cpp | 0 .../pcbnew/test_array_pad_name_provider.cpp | 0 .../pcbnew/test_board_item.cpp | 0 .../pcbnew/test_graphics_import_mgr.cpp | 0 .../pcbnew/test_libeval_compiler.cpp | 0 qa/{unittests => tests}/pcbnew/test_lset.cpp | 0 .../pcbnew/test_module.cpp | 0 .../pcbnew/test_pad_numbering.cpp | 0 .../pcbnew/test_pns_basics.cpp | 0 .../pcbnew/test_save_load.cpp | 0 .../pcbnew/test_tracks_cleaner.cpp | 0 .../pcbnew/test_zone_filler.cpp | 0 .../pcbnewswig}/test_000_qa_works.py | 0 .../pcbnewswig}/test_001_pcb_load.py | 2 +- .../pcbnewswig}/test_002_board_class.py | 4 ++-- .../pcbnewswig}/test_003_pads.py | 2 +- .../pcbnewswig}/test_004_tracks.py | 2 +- .../pcbnewswig}/test_005_connectivity_data.py | 2 +- qa/{unittests => tests}/spice/CMakeLists.txt | 0 .../spice/test_library_spice.cpp | 0 qa/{unittests => tests}/spice/test_module.cpp | 0 .../spice/test_netlist_exporter_spice.cpp | 0 .../spice/test_netlist_exporter_spice.h | 0 .../spice/test_ngspice_helpers.cpp | 0 .../spice/test_sim_model_inference.cpp | 0 .../spice/test_sim_model_ngspice.cpp | 0 .../spice/test_sim_regressions.cpp | 0 qa/{test.py => tests/test-pcbnewswig.py} | 2 +- qa/tools/pns/pns_log_file.cpp | 24 +++++++++---------- 136 files changed, 41 insertions(+), 42 deletions(-) rename qa/{unittests => tests}/CMakeLists.txt (72%) rename qa/{unittests => tests}/common/CMakeLists.txt (100%) rename qa/{unittests => tests}/common/color4d_test_utils.h (100%) rename qa/{unittests => tests}/common/console_log.h (100%) rename qa/{unittests => tests}/common/libeval/test_numeric_evaluator.cpp (100%) rename qa/{unittests => tests}/common/plugins/altium/test_altium_parser.cpp (100%) rename qa/{unittests => tests}/common/plugins/altium/test_altium_parser_utils.cpp (100%) rename qa/{unittests => tests}/common/plugins/cadstar/test_cadstar_archive_parser.cpp (100%) rename qa/{unittests => tests}/common/plugins/cadstar/test_cadstar_parts_parser.cpp (100%) rename qa/{unittests => tests}/common/test_array_axis.cpp (100%) rename qa/{unittests => tests}/common/test_array_options.cpp (100%) rename qa/{unittests => tests}/common/test_bitmap_base.cpp (100%) rename qa/{unittests => tests}/common/test_color4d.cpp (100%) rename qa/{unittests => tests}/common/test_coroutine.cpp (100%) rename qa/{unittests => tests}/common/test_database.cpp (100%) rename qa/{unittests => tests}/common/test_eda_shape.cpp (100%) rename qa/{unittests => tests}/common/test_eda_text.cpp (100%) rename qa/{unittests => tests}/common/test_format_units.cpp (100%) rename qa/{unittests => tests}/common/test_kicad_string.cpp (100%) rename qa/{unittests => tests}/common/test_kicad_stroke_font.cpp (100%) rename qa/{unittests => tests}/common/test_kiid.cpp (100%) rename qa/{unittests => tests}/common/test_lib_table.cpp (100%) rename qa/{unittests => tests}/common/test_markup_parser.cpp (100%) rename qa/{unittests => tests}/common/test_module.cpp (100%) rename qa/{unittests => tests}/common/test_property.cpp (100%) rename qa/{unittests => tests}/common/test_refdes_utils.cpp (100%) rename qa/{unittests => tests}/common/test_text_attributes.cpp (100%) rename qa/{unittests => tests}/common/test_title_block.cpp (100%) rename qa/{unittests => tests}/common/test_types.cpp (100%) rename qa/{unittests => tests}/common/test_utf8.cpp (100%) rename qa/{unittests => tests}/common/test_wildcards_and_files_ext.cpp (100%) rename qa/{unittests => tests}/common/test_wx_filename.cpp (100%) rename qa/{unittests => tests}/common/view/test_zoom_controller.cpp (100%) rename qa/{unittests => tests}/common/wximage_test_utils.cpp (100%) rename qa/{unittests => tests}/common/wximage_test_utils.h (100%) rename qa/{unittests => tests}/eeschema/CMakeLists.txt (96%) rename qa/{unittests => tests}/eeschema/erc/test_erc_global_labels.cpp (100%) rename qa/{unittests => tests}/eeschema/erc/test_erc_hierarchical_schematics.cpp (100%) rename qa/{unittests => tests}/eeschema/erc/test_erc_label_not_connected.cpp (100%) rename qa/{unittests => tests}/eeschema/erc/test_erc_no_connect.cpp (100%) rename qa/{unittests => tests}/eeschema/erc/test_erc_stacking_pins.cpp (100%) rename qa/{unittests => tests}/eeschema/lib_field_test_utils.h (100%) rename qa/{unittests => tests}/eeschema/netdiff.py (100%) mode change 100755 => 100644 rename qa/{unittests => tests}/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp (100%) rename qa/{unittests => tests}/eeschema/test_eagle_plugin.cpp (100%) rename qa/{unittests => tests}/eeschema/test_ee_item.cpp (100%) rename qa/{unittests => tests}/eeschema/test_legacy_power_symbols.cpp (100%) rename qa/{unittests => tests}/eeschema/test_lib_part.cpp (100%) rename qa/{unittests => tests}/eeschema/test_module.cpp (100%) rename qa/{unittests => tests}/eeschema/test_netlist_exporter_kicad.cpp (100%) rename qa/{unittests => tests}/eeschema/test_netlist_exporter_spice.cpp (100%) rename qa/{unittests => tests}/eeschema/test_netlist_exporter_spice.h (100%) rename qa/{unittests => tests}/eeschema/test_netlists.cpp (100%) rename qa/{unittests => tests}/eeschema/test_pin_numbers.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_biu.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_netclass.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_pin.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_reference_list.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_rtree.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_sheet.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_sheet_list.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_sheet_path.cpp (100%) rename qa/{unittests => tests}/eeschema/test_sch_symbol.cpp (100%) rename qa/{unittests => tests}/gerbview/CMakeLists.txt (97%) rename qa/{unittests => tests}/gerbview/test_module.cpp (100%) rename qa/{unittests => tests}/libs/CMakeLists.txt (100%) rename qa/{unittests => tests}/libs/kimath/CMakeLists.txt (100%) rename qa/{unittests => tests}/libs/kimath/geometry/fixtures_geometry.h (100%) rename qa/{unittests => tests}/libs/kimath/geometry/geom_test_utils.h (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_circle.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_eda_angle.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_ellipse_to_bezier.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_fillet.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_segment.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_arc.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_compound_collision.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_line_chain.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_poly_set.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_poly_set_arcs.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_poly_set_collision.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_poly_set_distance.cpp (100%) rename qa/{unittests => tests}/libs/kimath/geometry/test_shape_poly_set_iterator.cpp (100%) rename qa/{unittests => tests}/libs/kimath/kimath_test_module.cpp (100%) rename qa/{unittests => tests}/libs/kimath/math/test_box2.cpp (100%) rename qa/{unittests => tests}/libs/kimath/math/test_matrix3x3.cpp (100%) rename qa/{unittests => tests}/libs/kimath/math/test_util.cpp (100%) rename qa/{unittests => tests}/libs/kimath/math/test_vector2.cpp (100%) rename qa/{unittests => tests}/libs/kimath/math/test_vector3.cpp (100%) rename qa/{unittests => tests}/libs/kimath/test_kimath.cpp (100%) rename qa/{unittests => tests}/libs/sexpr/CMakeLists.txt (100%) rename qa/{unittests => tests}/libs/sexpr/sexpr_test_utils.h (100%) rename qa/{unittests => tests}/libs/sexpr/test_module.cpp (100%) rename qa/{unittests => tests}/libs/sexpr/test_sexpr.cpp (100%) rename qa/{unittests => tests}/libs/sexpr/test_sexpr_parser.cpp (100%) rename qa/{unittests => tests}/pcbnew/CMakeLists.txt (96%) rename qa/{unittests => tests}/pcbnew/drc/drc_test_utils.cpp (100%) rename qa/{unittests => tests}/pcbnew/drc/drc_test_utils.h (100%) rename qa/{unittests => tests}/pcbnew/drc/test_custom_rule_severities.cpp (100%) rename qa/{unittests => tests}/pcbnew/drc/test_drc_copper_conn.cpp (100%) rename qa/{unittests => tests}/pcbnew/drc/test_drc_courtyard_invalid.cpp (100%) rename qa/{unittests => tests}/pcbnew/drc/test_drc_courtyard_overlap.cpp (100%) rename qa/{unittests => tests}/pcbnew/drc/test_drc_regressions.cpp (100%) rename qa/{unittests => tests}/pcbnew/drc/test_solder_mask_bridging.cpp (100%) rename qa/{unittests => tests}/pcbnew/group_saveload.cpp (100%) rename qa/{unittests => tests}/pcbnew/plugins/altium/test_altium_pcblib_import.cpp (100%) rename qa/{unittests => tests}/pcbnew/plugins/altium/test_altium_rule_transformer.cpp (100%) rename qa/{unittests => tests}/pcbnew/plugins/eagle/test_eagle_lbr_import.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_array_pad_name_provider.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_board_item.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_graphics_import_mgr.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_libeval_compiler.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_lset.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_module.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_pad_numbering.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_pns_basics.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_save_load.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_tracks_cleaner.cpp (100%) rename qa/{unittests => tests}/pcbnew/test_zone_filler.cpp (100%) rename qa/{testcases => tests/pcbnewswig}/test_000_qa_works.py (100%) rename qa/{testcases => tests/pcbnewswig}/test_001_pcb_load.py (97%) rename qa/{testcases => tests/pcbnewswig}/test_002_board_class.py (96%) rename qa/{testcases => tests/pcbnewswig}/test_003_pads.py (93%) rename qa/{testcases => tests/pcbnewswig}/test_004_tracks.py (95%) rename qa/{testcases => tests/pcbnewswig}/test_005_connectivity_data.py (95%) rename qa/{unittests => tests}/spice/CMakeLists.txt (100%) rename qa/{unittests => tests}/spice/test_library_spice.cpp (100%) rename qa/{unittests => tests}/spice/test_module.cpp (100%) rename qa/{unittests => tests}/spice/test_netlist_exporter_spice.cpp (100%) rename qa/{unittests => tests}/spice/test_netlist_exporter_spice.h (100%) rename qa/{unittests => tests}/spice/test_ngspice_helpers.cpp (100%) rename qa/{unittests => tests}/spice/test_sim_model_inference.cpp (100%) rename qa/{unittests => tests}/spice/test_sim_model_ngspice.cpp (100%) rename qa/{unittests => tests}/spice/test_sim_regressions.cpp (100%) rename qa/{test.py => tests/test-pcbnewswig.py} (93%) diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt index 55f53eee68..c28ce5b842 100644 --- 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 ) diff --git a/qa/unittests/CMakeLists.txt b/qa/tests/CMakeLists.txt similarity index 72% rename from qa/unittests/CMakeLists.txt rename to qa/tests/CMakeLists.txt index 4c4064e970..688c1199f8 100644 --- a/qa/unittests/CMakeLists.txt +++ b/qa/tests/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}" +) \ No newline at end of file diff --git a/qa/unittests/common/CMakeLists.txt b/qa/tests/common/CMakeLists.txt similarity index 100% rename from qa/unittests/common/CMakeLists.txt rename to qa/tests/common/CMakeLists.txt diff --git a/qa/unittests/common/color4d_test_utils.h b/qa/tests/common/color4d_test_utils.h similarity index 100% rename from qa/unittests/common/color4d_test_utils.h rename to qa/tests/common/color4d_test_utils.h diff --git a/qa/unittests/common/console_log.h b/qa/tests/common/console_log.h similarity index 100% rename from qa/unittests/common/console_log.h rename to qa/tests/common/console_log.h diff --git a/qa/unittests/common/libeval/test_numeric_evaluator.cpp b/qa/tests/common/libeval/test_numeric_evaluator.cpp similarity index 100% rename from qa/unittests/common/libeval/test_numeric_evaluator.cpp rename to qa/tests/common/libeval/test_numeric_evaluator.cpp diff --git a/qa/unittests/common/plugins/altium/test_altium_parser.cpp b/qa/tests/common/plugins/altium/test_altium_parser.cpp similarity index 100% rename from qa/unittests/common/plugins/altium/test_altium_parser.cpp rename to qa/tests/common/plugins/altium/test_altium_parser.cpp diff --git a/qa/unittests/common/plugins/altium/test_altium_parser_utils.cpp b/qa/tests/common/plugins/altium/test_altium_parser_utils.cpp similarity index 100% rename from qa/unittests/common/plugins/altium/test_altium_parser_utils.cpp rename to qa/tests/common/plugins/altium/test_altium_parser_utils.cpp diff --git a/qa/unittests/common/plugins/cadstar/test_cadstar_archive_parser.cpp b/qa/tests/common/plugins/cadstar/test_cadstar_archive_parser.cpp similarity index 100% rename from qa/unittests/common/plugins/cadstar/test_cadstar_archive_parser.cpp rename to qa/tests/common/plugins/cadstar/test_cadstar_archive_parser.cpp diff --git a/qa/unittests/common/plugins/cadstar/test_cadstar_parts_parser.cpp b/qa/tests/common/plugins/cadstar/test_cadstar_parts_parser.cpp similarity index 100% rename from qa/unittests/common/plugins/cadstar/test_cadstar_parts_parser.cpp rename to qa/tests/common/plugins/cadstar/test_cadstar_parts_parser.cpp diff --git a/qa/unittests/common/test_array_axis.cpp b/qa/tests/common/test_array_axis.cpp similarity index 100% rename from qa/unittests/common/test_array_axis.cpp rename to qa/tests/common/test_array_axis.cpp diff --git a/qa/unittests/common/test_array_options.cpp b/qa/tests/common/test_array_options.cpp similarity index 100% rename from qa/unittests/common/test_array_options.cpp rename to qa/tests/common/test_array_options.cpp diff --git a/qa/unittests/common/test_bitmap_base.cpp b/qa/tests/common/test_bitmap_base.cpp similarity index 100% rename from qa/unittests/common/test_bitmap_base.cpp rename to qa/tests/common/test_bitmap_base.cpp diff --git a/qa/unittests/common/test_color4d.cpp b/qa/tests/common/test_color4d.cpp similarity index 100% rename from qa/unittests/common/test_color4d.cpp rename to qa/tests/common/test_color4d.cpp diff --git a/qa/unittests/common/test_coroutine.cpp b/qa/tests/common/test_coroutine.cpp similarity index 100% rename from qa/unittests/common/test_coroutine.cpp rename to qa/tests/common/test_coroutine.cpp diff --git a/qa/unittests/common/test_database.cpp b/qa/tests/common/test_database.cpp similarity index 100% rename from qa/unittests/common/test_database.cpp rename to qa/tests/common/test_database.cpp diff --git a/qa/unittests/common/test_eda_shape.cpp b/qa/tests/common/test_eda_shape.cpp similarity index 100% rename from qa/unittests/common/test_eda_shape.cpp rename to qa/tests/common/test_eda_shape.cpp diff --git a/qa/unittests/common/test_eda_text.cpp b/qa/tests/common/test_eda_text.cpp similarity index 100% rename from qa/unittests/common/test_eda_text.cpp rename to qa/tests/common/test_eda_text.cpp diff --git a/qa/unittests/common/test_format_units.cpp b/qa/tests/common/test_format_units.cpp similarity index 100% rename from qa/unittests/common/test_format_units.cpp rename to qa/tests/common/test_format_units.cpp diff --git a/qa/unittests/common/test_kicad_string.cpp b/qa/tests/common/test_kicad_string.cpp similarity index 100% rename from qa/unittests/common/test_kicad_string.cpp rename to qa/tests/common/test_kicad_string.cpp diff --git a/qa/unittests/common/test_kicad_stroke_font.cpp b/qa/tests/common/test_kicad_stroke_font.cpp similarity index 100% rename from qa/unittests/common/test_kicad_stroke_font.cpp rename to qa/tests/common/test_kicad_stroke_font.cpp diff --git a/qa/unittests/common/test_kiid.cpp b/qa/tests/common/test_kiid.cpp similarity index 100% rename from qa/unittests/common/test_kiid.cpp rename to qa/tests/common/test_kiid.cpp diff --git a/qa/unittests/common/test_lib_table.cpp b/qa/tests/common/test_lib_table.cpp similarity index 100% rename from qa/unittests/common/test_lib_table.cpp rename to qa/tests/common/test_lib_table.cpp diff --git a/qa/unittests/common/test_markup_parser.cpp b/qa/tests/common/test_markup_parser.cpp similarity index 100% rename from qa/unittests/common/test_markup_parser.cpp rename to qa/tests/common/test_markup_parser.cpp diff --git a/qa/unittests/common/test_module.cpp b/qa/tests/common/test_module.cpp similarity index 100% rename from qa/unittests/common/test_module.cpp rename to qa/tests/common/test_module.cpp diff --git a/qa/unittests/common/test_property.cpp b/qa/tests/common/test_property.cpp similarity index 100% rename from qa/unittests/common/test_property.cpp rename to qa/tests/common/test_property.cpp diff --git a/qa/unittests/common/test_refdes_utils.cpp b/qa/tests/common/test_refdes_utils.cpp similarity index 100% rename from qa/unittests/common/test_refdes_utils.cpp rename to qa/tests/common/test_refdes_utils.cpp diff --git a/qa/unittests/common/test_text_attributes.cpp b/qa/tests/common/test_text_attributes.cpp similarity index 100% rename from qa/unittests/common/test_text_attributes.cpp rename to qa/tests/common/test_text_attributes.cpp diff --git a/qa/unittests/common/test_title_block.cpp b/qa/tests/common/test_title_block.cpp similarity index 100% rename from qa/unittests/common/test_title_block.cpp rename to qa/tests/common/test_title_block.cpp diff --git a/qa/unittests/common/test_types.cpp b/qa/tests/common/test_types.cpp similarity index 100% rename from qa/unittests/common/test_types.cpp rename to qa/tests/common/test_types.cpp diff --git a/qa/unittests/common/test_utf8.cpp b/qa/tests/common/test_utf8.cpp similarity index 100% rename from qa/unittests/common/test_utf8.cpp rename to qa/tests/common/test_utf8.cpp diff --git a/qa/unittests/common/test_wildcards_and_files_ext.cpp b/qa/tests/common/test_wildcards_and_files_ext.cpp similarity index 100% rename from qa/unittests/common/test_wildcards_and_files_ext.cpp rename to qa/tests/common/test_wildcards_and_files_ext.cpp diff --git a/qa/unittests/common/test_wx_filename.cpp b/qa/tests/common/test_wx_filename.cpp similarity index 100% rename from qa/unittests/common/test_wx_filename.cpp rename to qa/tests/common/test_wx_filename.cpp diff --git a/qa/unittests/common/view/test_zoom_controller.cpp b/qa/tests/common/view/test_zoom_controller.cpp similarity index 100% rename from qa/unittests/common/view/test_zoom_controller.cpp rename to qa/tests/common/view/test_zoom_controller.cpp diff --git a/qa/unittests/common/wximage_test_utils.cpp b/qa/tests/common/wximage_test_utils.cpp similarity index 100% rename from qa/unittests/common/wximage_test_utils.cpp rename to qa/tests/common/wximage_test_utils.cpp diff --git a/qa/unittests/common/wximage_test_utils.h b/qa/tests/common/wximage_test_utils.h similarity index 100% rename from qa/unittests/common/wximage_test_utils.h rename to qa/tests/common/wximage_test_utils.h diff --git a/qa/unittests/eeschema/CMakeLists.txt b/qa/tests/eeschema/CMakeLists.txt similarity index 96% rename from qa/unittests/eeschema/CMakeLists.txt rename to qa/tests/eeschema/CMakeLists.txt index fff5cf7d6c..b91a93f41b 100644 --- a/qa/unittests/eeschema/CMakeLists.txt +++ b/qa/tests/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 diff --git a/qa/unittests/eeschema/erc/test_erc_global_labels.cpp b/qa/tests/eeschema/erc/test_erc_global_labels.cpp similarity index 100% rename from qa/unittests/eeschema/erc/test_erc_global_labels.cpp rename to qa/tests/eeschema/erc/test_erc_global_labels.cpp diff --git a/qa/unittests/eeschema/erc/test_erc_hierarchical_schematics.cpp b/qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp similarity index 100% rename from qa/unittests/eeschema/erc/test_erc_hierarchical_schematics.cpp rename to qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp diff --git a/qa/unittests/eeschema/erc/test_erc_label_not_connected.cpp b/qa/tests/eeschema/erc/test_erc_label_not_connected.cpp similarity index 100% rename from qa/unittests/eeschema/erc/test_erc_label_not_connected.cpp rename to qa/tests/eeschema/erc/test_erc_label_not_connected.cpp diff --git a/qa/unittests/eeschema/erc/test_erc_no_connect.cpp b/qa/tests/eeschema/erc/test_erc_no_connect.cpp similarity index 100% rename from qa/unittests/eeschema/erc/test_erc_no_connect.cpp rename to qa/tests/eeschema/erc/test_erc_no_connect.cpp diff --git a/qa/unittests/eeschema/erc/test_erc_stacking_pins.cpp b/qa/tests/eeschema/erc/test_erc_stacking_pins.cpp similarity index 100% rename from qa/unittests/eeschema/erc/test_erc_stacking_pins.cpp rename to qa/tests/eeschema/erc/test_erc_stacking_pins.cpp diff --git a/qa/unittests/eeschema/lib_field_test_utils.h b/qa/tests/eeschema/lib_field_test_utils.h similarity index 100% rename from qa/unittests/eeschema/lib_field_test_utils.h rename to qa/tests/eeschema/lib_field_test_utils.h diff --git a/qa/unittests/eeschema/netdiff.py b/qa/tests/eeschema/netdiff.py old mode 100755 new mode 100644 similarity index 100% rename from qa/unittests/eeschema/netdiff.py rename to qa/tests/eeschema/netdiff.py diff --git a/qa/unittests/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp b/qa/tests/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp similarity index 100% rename from qa/unittests/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp rename to qa/tests/eeschema/sch_plugins/altium/test_altium_parser_sch.cpp diff --git a/qa/unittests/eeschema/test_eagle_plugin.cpp b/qa/tests/eeschema/test_eagle_plugin.cpp similarity index 100% rename from qa/unittests/eeschema/test_eagle_plugin.cpp rename to qa/tests/eeschema/test_eagle_plugin.cpp diff --git a/qa/unittests/eeschema/test_ee_item.cpp b/qa/tests/eeschema/test_ee_item.cpp similarity index 100% rename from qa/unittests/eeschema/test_ee_item.cpp rename to qa/tests/eeschema/test_ee_item.cpp diff --git a/qa/unittests/eeschema/test_legacy_power_symbols.cpp b/qa/tests/eeschema/test_legacy_power_symbols.cpp similarity index 100% rename from qa/unittests/eeschema/test_legacy_power_symbols.cpp rename to qa/tests/eeschema/test_legacy_power_symbols.cpp diff --git a/qa/unittests/eeschema/test_lib_part.cpp b/qa/tests/eeschema/test_lib_part.cpp similarity index 100% rename from qa/unittests/eeschema/test_lib_part.cpp rename to qa/tests/eeschema/test_lib_part.cpp diff --git a/qa/unittests/eeschema/test_module.cpp b/qa/tests/eeschema/test_module.cpp similarity index 100% rename from qa/unittests/eeschema/test_module.cpp rename to qa/tests/eeschema/test_module.cpp diff --git a/qa/unittests/eeschema/test_netlist_exporter_kicad.cpp b/qa/tests/eeschema/test_netlist_exporter_kicad.cpp similarity index 100% rename from qa/unittests/eeschema/test_netlist_exporter_kicad.cpp rename to qa/tests/eeschema/test_netlist_exporter_kicad.cpp diff --git a/qa/unittests/eeschema/test_netlist_exporter_spice.cpp b/qa/tests/eeschema/test_netlist_exporter_spice.cpp similarity index 100% rename from qa/unittests/eeschema/test_netlist_exporter_spice.cpp rename to qa/tests/eeschema/test_netlist_exporter_spice.cpp diff --git a/qa/unittests/eeschema/test_netlist_exporter_spice.h b/qa/tests/eeschema/test_netlist_exporter_spice.h similarity index 100% rename from qa/unittests/eeschema/test_netlist_exporter_spice.h rename to qa/tests/eeschema/test_netlist_exporter_spice.h diff --git a/qa/unittests/eeschema/test_netlists.cpp b/qa/tests/eeschema/test_netlists.cpp similarity index 100% rename from qa/unittests/eeschema/test_netlists.cpp rename to qa/tests/eeschema/test_netlists.cpp diff --git a/qa/unittests/eeschema/test_pin_numbers.cpp b/qa/tests/eeschema/test_pin_numbers.cpp similarity index 100% rename from qa/unittests/eeschema/test_pin_numbers.cpp rename to qa/tests/eeschema/test_pin_numbers.cpp diff --git a/qa/unittests/eeschema/test_sch_biu.cpp b/qa/tests/eeschema/test_sch_biu.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_biu.cpp rename to qa/tests/eeschema/test_sch_biu.cpp diff --git a/qa/unittests/eeschema/test_sch_netclass.cpp b/qa/tests/eeschema/test_sch_netclass.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_netclass.cpp rename to qa/tests/eeschema/test_sch_netclass.cpp diff --git a/qa/unittests/eeschema/test_sch_pin.cpp b/qa/tests/eeschema/test_sch_pin.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_pin.cpp rename to qa/tests/eeschema/test_sch_pin.cpp diff --git a/qa/unittests/eeschema/test_sch_reference_list.cpp b/qa/tests/eeschema/test_sch_reference_list.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_reference_list.cpp rename to qa/tests/eeschema/test_sch_reference_list.cpp diff --git a/qa/unittests/eeschema/test_sch_rtree.cpp b/qa/tests/eeschema/test_sch_rtree.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_rtree.cpp rename to qa/tests/eeschema/test_sch_rtree.cpp diff --git a/qa/unittests/eeschema/test_sch_sheet.cpp b/qa/tests/eeschema/test_sch_sheet.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_sheet.cpp rename to qa/tests/eeschema/test_sch_sheet.cpp diff --git a/qa/unittests/eeschema/test_sch_sheet_list.cpp b/qa/tests/eeschema/test_sch_sheet_list.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_sheet_list.cpp rename to qa/tests/eeschema/test_sch_sheet_list.cpp diff --git a/qa/unittests/eeschema/test_sch_sheet_path.cpp b/qa/tests/eeschema/test_sch_sheet_path.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_sheet_path.cpp rename to qa/tests/eeschema/test_sch_sheet_path.cpp diff --git a/qa/unittests/eeschema/test_sch_symbol.cpp b/qa/tests/eeschema/test_sch_symbol.cpp similarity index 100% rename from qa/unittests/eeschema/test_sch_symbol.cpp rename to qa/tests/eeschema/test_sch_symbol.cpp diff --git a/qa/unittests/gerbview/CMakeLists.txt b/qa/tests/gerbview/CMakeLists.txt similarity index 97% rename from qa/unittests/gerbview/CMakeLists.txt rename to qa/tests/gerbview/CMakeLists.txt index 9313d78e69..635c891137 100644 --- a/qa/unittests/gerbview/CMakeLists.txt +++ b/qa/tests/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 ) diff --git a/qa/unittests/gerbview/test_module.cpp b/qa/tests/gerbview/test_module.cpp similarity index 100% rename from qa/unittests/gerbview/test_module.cpp rename to qa/tests/gerbview/test_module.cpp diff --git a/qa/unittests/libs/CMakeLists.txt b/qa/tests/libs/CMakeLists.txt similarity index 100% rename from qa/unittests/libs/CMakeLists.txt rename to qa/tests/libs/CMakeLists.txt diff --git a/qa/unittests/libs/kimath/CMakeLists.txt b/qa/tests/libs/kimath/CMakeLists.txt similarity index 100% rename from qa/unittests/libs/kimath/CMakeLists.txt rename to qa/tests/libs/kimath/CMakeLists.txt diff --git a/qa/unittests/libs/kimath/geometry/fixtures_geometry.h b/qa/tests/libs/kimath/geometry/fixtures_geometry.h similarity index 100% rename from qa/unittests/libs/kimath/geometry/fixtures_geometry.h rename to qa/tests/libs/kimath/geometry/fixtures_geometry.h diff --git a/qa/unittests/libs/kimath/geometry/geom_test_utils.h b/qa/tests/libs/kimath/geometry/geom_test_utils.h similarity index 100% rename from qa/unittests/libs/kimath/geometry/geom_test_utils.h rename to qa/tests/libs/kimath/geometry/geom_test_utils.h diff --git a/qa/unittests/libs/kimath/geometry/test_circle.cpp b/qa/tests/libs/kimath/geometry/test_circle.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_circle.cpp rename to qa/tests/libs/kimath/geometry/test_circle.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_eda_angle.cpp b/qa/tests/libs/kimath/geometry/test_eda_angle.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_eda_angle.cpp rename to qa/tests/libs/kimath/geometry/test_eda_angle.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_ellipse_to_bezier.cpp b/qa/tests/libs/kimath/geometry/test_ellipse_to_bezier.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_ellipse_to_bezier.cpp rename to qa/tests/libs/kimath/geometry/test_ellipse_to_bezier.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_fillet.cpp b/qa/tests/libs/kimath/geometry/test_fillet.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_fillet.cpp rename to qa/tests/libs/kimath/geometry/test_fillet.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_segment.cpp b/qa/tests/libs/kimath/geometry/test_segment.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_segment.cpp rename to qa/tests/libs/kimath/geometry/test_segment.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_arc.cpp b/qa/tests/libs/kimath/geometry/test_shape_arc.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_arc.cpp rename to qa/tests/libs/kimath/geometry/test_shape_arc.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_compound_collision.cpp b/qa/tests/libs/kimath/geometry/test_shape_compound_collision.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_compound_collision.cpp rename to qa/tests/libs/kimath/geometry/test_shape_compound_collision.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_line_chain.cpp b/qa/tests/libs/kimath/geometry/test_shape_line_chain.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_line_chain.cpp rename to qa/tests/libs/kimath/geometry/test_shape_line_chain.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_poly_set.cpp b/qa/tests/libs/kimath/geometry/test_shape_poly_set.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_poly_set.cpp rename to qa/tests/libs/kimath/geometry/test_shape_poly_set.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_arcs.cpp b/qa/tests/libs/kimath/geometry/test_shape_poly_set_arcs.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_poly_set_arcs.cpp rename to qa/tests/libs/kimath/geometry/test_shape_poly_set_arcs.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_collision.cpp b/qa/tests/libs/kimath/geometry/test_shape_poly_set_collision.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_poly_set_collision.cpp rename to qa/tests/libs/kimath/geometry/test_shape_poly_set_collision.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_distance.cpp b/qa/tests/libs/kimath/geometry/test_shape_poly_set_distance.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_poly_set_distance.cpp rename to qa/tests/libs/kimath/geometry/test_shape_poly_set_distance.cpp diff --git a/qa/unittests/libs/kimath/geometry/test_shape_poly_set_iterator.cpp b/qa/tests/libs/kimath/geometry/test_shape_poly_set_iterator.cpp similarity index 100% rename from qa/unittests/libs/kimath/geometry/test_shape_poly_set_iterator.cpp rename to qa/tests/libs/kimath/geometry/test_shape_poly_set_iterator.cpp diff --git a/qa/unittests/libs/kimath/kimath_test_module.cpp b/qa/tests/libs/kimath/kimath_test_module.cpp similarity index 100% rename from qa/unittests/libs/kimath/kimath_test_module.cpp rename to qa/tests/libs/kimath/kimath_test_module.cpp diff --git a/qa/unittests/libs/kimath/math/test_box2.cpp b/qa/tests/libs/kimath/math/test_box2.cpp similarity index 100% rename from qa/unittests/libs/kimath/math/test_box2.cpp rename to qa/tests/libs/kimath/math/test_box2.cpp diff --git a/qa/unittests/libs/kimath/math/test_matrix3x3.cpp b/qa/tests/libs/kimath/math/test_matrix3x3.cpp similarity index 100% rename from qa/unittests/libs/kimath/math/test_matrix3x3.cpp rename to qa/tests/libs/kimath/math/test_matrix3x3.cpp diff --git a/qa/unittests/libs/kimath/math/test_util.cpp b/qa/tests/libs/kimath/math/test_util.cpp similarity index 100% rename from qa/unittests/libs/kimath/math/test_util.cpp rename to qa/tests/libs/kimath/math/test_util.cpp diff --git a/qa/unittests/libs/kimath/math/test_vector2.cpp b/qa/tests/libs/kimath/math/test_vector2.cpp similarity index 100% rename from qa/unittests/libs/kimath/math/test_vector2.cpp rename to qa/tests/libs/kimath/math/test_vector2.cpp diff --git a/qa/unittests/libs/kimath/math/test_vector3.cpp b/qa/tests/libs/kimath/math/test_vector3.cpp similarity index 100% rename from qa/unittests/libs/kimath/math/test_vector3.cpp rename to qa/tests/libs/kimath/math/test_vector3.cpp diff --git a/qa/unittests/libs/kimath/test_kimath.cpp b/qa/tests/libs/kimath/test_kimath.cpp similarity index 100% rename from qa/unittests/libs/kimath/test_kimath.cpp rename to qa/tests/libs/kimath/test_kimath.cpp diff --git a/qa/unittests/libs/sexpr/CMakeLists.txt b/qa/tests/libs/sexpr/CMakeLists.txt similarity index 100% rename from qa/unittests/libs/sexpr/CMakeLists.txt rename to qa/tests/libs/sexpr/CMakeLists.txt diff --git a/qa/unittests/libs/sexpr/sexpr_test_utils.h b/qa/tests/libs/sexpr/sexpr_test_utils.h similarity index 100% rename from qa/unittests/libs/sexpr/sexpr_test_utils.h rename to qa/tests/libs/sexpr/sexpr_test_utils.h diff --git a/qa/unittests/libs/sexpr/test_module.cpp b/qa/tests/libs/sexpr/test_module.cpp similarity index 100% rename from qa/unittests/libs/sexpr/test_module.cpp rename to qa/tests/libs/sexpr/test_module.cpp diff --git a/qa/unittests/libs/sexpr/test_sexpr.cpp b/qa/tests/libs/sexpr/test_sexpr.cpp similarity index 100% rename from qa/unittests/libs/sexpr/test_sexpr.cpp rename to qa/tests/libs/sexpr/test_sexpr.cpp diff --git a/qa/unittests/libs/sexpr/test_sexpr_parser.cpp b/qa/tests/libs/sexpr/test_sexpr_parser.cpp similarity index 100% rename from qa/unittests/libs/sexpr/test_sexpr_parser.cpp rename to qa/tests/libs/sexpr/test_sexpr_parser.cpp diff --git a/qa/unittests/pcbnew/CMakeLists.txt b/qa/tests/pcbnew/CMakeLists.txt similarity index 96% rename from qa/unittests/pcbnew/CMakeLists.txt rename to qa/tests/pcbnew/CMakeLists.txt index c18d32b88a..1600e151a4 100644 --- a/qa/unittests/pcbnew/CMakeLists.txt +++ b/qa/tests/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 diff --git a/qa/unittests/pcbnew/drc/drc_test_utils.cpp b/qa/tests/pcbnew/drc/drc_test_utils.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/drc_test_utils.cpp rename to qa/tests/pcbnew/drc/drc_test_utils.cpp diff --git a/qa/unittests/pcbnew/drc/drc_test_utils.h b/qa/tests/pcbnew/drc/drc_test_utils.h similarity index 100% rename from qa/unittests/pcbnew/drc/drc_test_utils.h rename to qa/tests/pcbnew/drc/drc_test_utils.h diff --git a/qa/unittests/pcbnew/drc/test_custom_rule_severities.cpp b/qa/tests/pcbnew/drc/test_custom_rule_severities.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/test_custom_rule_severities.cpp rename to qa/tests/pcbnew/drc/test_custom_rule_severities.cpp diff --git a/qa/unittests/pcbnew/drc/test_drc_copper_conn.cpp b/qa/tests/pcbnew/drc/test_drc_copper_conn.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/test_drc_copper_conn.cpp rename to qa/tests/pcbnew/drc/test_drc_copper_conn.cpp diff --git a/qa/unittests/pcbnew/drc/test_drc_courtyard_invalid.cpp b/qa/tests/pcbnew/drc/test_drc_courtyard_invalid.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/test_drc_courtyard_invalid.cpp rename to qa/tests/pcbnew/drc/test_drc_courtyard_invalid.cpp diff --git a/qa/unittests/pcbnew/drc/test_drc_courtyard_overlap.cpp b/qa/tests/pcbnew/drc/test_drc_courtyard_overlap.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/test_drc_courtyard_overlap.cpp rename to qa/tests/pcbnew/drc/test_drc_courtyard_overlap.cpp diff --git a/qa/unittests/pcbnew/drc/test_drc_regressions.cpp b/qa/tests/pcbnew/drc/test_drc_regressions.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/test_drc_regressions.cpp rename to qa/tests/pcbnew/drc/test_drc_regressions.cpp diff --git a/qa/unittests/pcbnew/drc/test_solder_mask_bridging.cpp b/qa/tests/pcbnew/drc/test_solder_mask_bridging.cpp similarity index 100% rename from qa/unittests/pcbnew/drc/test_solder_mask_bridging.cpp rename to qa/tests/pcbnew/drc/test_solder_mask_bridging.cpp diff --git a/qa/unittests/pcbnew/group_saveload.cpp b/qa/tests/pcbnew/group_saveload.cpp similarity index 100% rename from qa/unittests/pcbnew/group_saveload.cpp rename to qa/tests/pcbnew/group_saveload.cpp diff --git a/qa/unittests/pcbnew/plugins/altium/test_altium_pcblib_import.cpp b/qa/tests/pcbnew/plugins/altium/test_altium_pcblib_import.cpp similarity index 100% rename from qa/unittests/pcbnew/plugins/altium/test_altium_pcblib_import.cpp rename to qa/tests/pcbnew/plugins/altium/test_altium_pcblib_import.cpp diff --git a/qa/unittests/pcbnew/plugins/altium/test_altium_rule_transformer.cpp b/qa/tests/pcbnew/plugins/altium/test_altium_rule_transformer.cpp similarity index 100% rename from qa/unittests/pcbnew/plugins/altium/test_altium_rule_transformer.cpp rename to qa/tests/pcbnew/plugins/altium/test_altium_rule_transformer.cpp diff --git a/qa/unittests/pcbnew/plugins/eagle/test_eagle_lbr_import.cpp b/qa/tests/pcbnew/plugins/eagle/test_eagle_lbr_import.cpp similarity index 100% rename from qa/unittests/pcbnew/plugins/eagle/test_eagle_lbr_import.cpp rename to qa/tests/pcbnew/plugins/eagle/test_eagle_lbr_import.cpp diff --git a/qa/unittests/pcbnew/test_array_pad_name_provider.cpp b/qa/tests/pcbnew/test_array_pad_name_provider.cpp similarity index 100% rename from qa/unittests/pcbnew/test_array_pad_name_provider.cpp rename to qa/tests/pcbnew/test_array_pad_name_provider.cpp diff --git a/qa/unittests/pcbnew/test_board_item.cpp b/qa/tests/pcbnew/test_board_item.cpp similarity index 100% rename from qa/unittests/pcbnew/test_board_item.cpp rename to qa/tests/pcbnew/test_board_item.cpp diff --git a/qa/unittests/pcbnew/test_graphics_import_mgr.cpp b/qa/tests/pcbnew/test_graphics_import_mgr.cpp similarity index 100% rename from qa/unittests/pcbnew/test_graphics_import_mgr.cpp rename to qa/tests/pcbnew/test_graphics_import_mgr.cpp diff --git a/qa/unittests/pcbnew/test_libeval_compiler.cpp b/qa/tests/pcbnew/test_libeval_compiler.cpp similarity index 100% rename from qa/unittests/pcbnew/test_libeval_compiler.cpp rename to qa/tests/pcbnew/test_libeval_compiler.cpp diff --git a/qa/unittests/pcbnew/test_lset.cpp b/qa/tests/pcbnew/test_lset.cpp similarity index 100% rename from qa/unittests/pcbnew/test_lset.cpp rename to qa/tests/pcbnew/test_lset.cpp diff --git a/qa/unittests/pcbnew/test_module.cpp b/qa/tests/pcbnew/test_module.cpp similarity index 100% rename from qa/unittests/pcbnew/test_module.cpp rename to qa/tests/pcbnew/test_module.cpp diff --git a/qa/unittests/pcbnew/test_pad_numbering.cpp b/qa/tests/pcbnew/test_pad_numbering.cpp similarity index 100% rename from qa/unittests/pcbnew/test_pad_numbering.cpp rename to qa/tests/pcbnew/test_pad_numbering.cpp diff --git a/qa/unittests/pcbnew/test_pns_basics.cpp b/qa/tests/pcbnew/test_pns_basics.cpp similarity index 100% rename from qa/unittests/pcbnew/test_pns_basics.cpp rename to qa/tests/pcbnew/test_pns_basics.cpp diff --git a/qa/unittests/pcbnew/test_save_load.cpp b/qa/tests/pcbnew/test_save_load.cpp similarity index 100% rename from qa/unittests/pcbnew/test_save_load.cpp rename to qa/tests/pcbnew/test_save_load.cpp diff --git a/qa/unittests/pcbnew/test_tracks_cleaner.cpp b/qa/tests/pcbnew/test_tracks_cleaner.cpp similarity index 100% rename from qa/unittests/pcbnew/test_tracks_cleaner.cpp rename to qa/tests/pcbnew/test_tracks_cleaner.cpp diff --git a/qa/unittests/pcbnew/test_zone_filler.cpp b/qa/tests/pcbnew/test_zone_filler.cpp similarity index 100% rename from qa/unittests/pcbnew/test_zone_filler.cpp rename to qa/tests/pcbnew/test_zone_filler.cpp diff --git a/qa/testcases/test_000_qa_works.py b/qa/tests/pcbnewswig/test_000_qa_works.py similarity index 100% rename from qa/testcases/test_000_qa_works.py rename to qa/tests/pcbnewswig/test_000_qa_works.py diff --git a/qa/testcases/test_001_pcb_load.py b/qa/tests/pcbnewswig/test_001_pcb_load.py similarity index 97% rename from qa/testcases/test_001_pcb_load.py rename to qa/tests/pcbnewswig/test_001_pcb_load.py index d327da5913..8d5facd49d 100644 --- a/qa/testcases/test_001_pcb_load.py +++ b/qa/tests/pcbnewswig/test_001_pcb_load.py @@ -6,7 +6,7 @@ import pdb class TestPCBLoad(unittest.TestCase): def setUp(self): - self.pcb = pcbnew.LoadBoard("data/pcbnew/complex_hierarchy.kicad_pcb") + self.pcb = pcbnew.LoadBoard("../../data/pcbnew/complex_hierarchy.kicad_pcb") def test_pcb_load(self): self.assertNotEqual(self.pcb,None) diff --git a/qa/testcases/test_002_board_class.py b/qa/tests/pcbnewswig/test_002_board_class.py similarity index 96% rename from qa/testcases/test_002_board_class.py rename to qa/tests/pcbnewswig/test_002_board_class.py index 0b4336cc81..8b554eefb9 100644 --- a/qa/testcases/test_002_board_class.py +++ b/qa/tests/pcbnewswig/test_002_board_class.py @@ -17,7 +17,7 @@ NEW_NAME = 'My_Fancy_Layer_Name' class TestBoardClass(unittest.TestCase): def setUp(self): - self.pcb = LoadBoard("data/pcbnew/complex_hierarchy.kicad_pcb") + self.pcb = LoadBoard("../../data/pcbnew/complex_hierarchy.kicad_pcb") self.TITLE="Test Board" self.COMMENT1="For load/save test" self.FILENAME=tempfile.mktemp()+".kicad_pcb" @@ -122,7 +122,7 @@ class TestBoardClass(unittest.TestCase): self.assertEqual(pcb.GetLayerID(B_CU), b_cu_id) def test_footprint_properties(self): - pcb = LoadBoard("data/pcbnew/custom_fields.kicad_pcb") + pcb = LoadBoard("../../data/pcbnew/custom_fields.kicad_pcb") footprint = pcb.FindFootprintByReference('J1') expected_properties = { 'Sheet file': 'custom_fields.kicad_sch', diff --git a/qa/testcases/test_003_pads.py b/qa/tests/pcbnewswig/test_003_pads.py similarity index 93% rename from qa/testcases/test_003_pads.py rename to qa/tests/pcbnewswig/test_003_pads.py index 5d51ad50cd..40e2510ff4 100644 --- a/qa/testcases/test_003_pads.py +++ b/qa/tests/pcbnewswig/test_003_pads.py @@ -4,7 +4,7 @@ import pcbnew class TestPads(unittest.TestCase): def setUp(self): - self.pcb = pcbnew.LoadBoard("data/pcbnew/custom_pads.kicad_pcb") + self.pcb = pcbnew.LoadBoard("../../data/pcbnew/custom_pads.kicad_pcb") def test_custom_pads_outline(self): custom_pad1 = self.pcb.FindFootprintByReference("SB1").Pads()[0] diff --git a/qa/testcases/test_004_tracks.py b/qa/tests/pcbnewswig/test_004_tracks.py similarity index 95% rename from qa/testcases/test_004_tracks.py rename to qa/tests/pcbnewswig/test_004_tracks.py index 8b9c53b6d2..71c0b27246 100644 --- a/qa/testcases/test_004_tracks.py +++ b/qa/tests/pcbnewswig/test_004_tracks.py @@ -4,7 +4,7 @@ import pcbnew class TestTracks(unittest.TestCase): def setUp(self): - self.pcb = pcbnew.LoadBoard("data/pcbnew/tracks_arcs_vias.kicad_pcb") + self.pcb = pcbnew.LoadBoard("../../data/pcbnew/tracks_arcs_vias.kicad_pcb") def test_tracks(self): tracks = [t for t in self.pcb.Tracks() if t.GetClass() == 'PCB_TRACK'] diff --git a/qa/testcases/test_005_connectivity_data.py b/qa/tests/pcbnewswig/test_005_connectivity_data.py similarity index 95% rename from qa/testcases/test_005_connectivity_data.py rename to qa/tests/pcbnewswig/test_005_connectivity_data.py index 640a3aaff5..1b5ba46b67 100644 --- a/qa/testcases/test_005_connectivity_data.py +++ b/qa/tests/pcbnewswig/test_005_connectivity_data.py @@ -10,7 +10,7 @@ class TestConnectivity(unittest.TestCase): def setUp(self): """Setup shared attributes.""" - self.pcb = pcbnew.LoadBoard("data/pcbnew/complex_hierarchy.kicad_pcb") + self.pcb = pcbnew.LoadBoard("../../data/pcbnew/complex_hierarchy.kicad_pcb") self.connectivity = self.pcb.GetConnectivity() self.nets = self.pcb.GetNetsByName() diff --git a/qa/unittests/spice/CMakeLists.txt b/qa/tests/spice/CMakeLists.txt similarity index 100% rename from qa/unittests/spice/CMakeLists.txt rename to qa/tests/spice/CMakeLists.txt diff --git a/qa/unittests/spice/test_library_spice.cpp b/qa/tests/spice/test_library_spice.cpp similarity index 100% rename from qa/unittests/spice/test_library_spice.cpp rename to qa/tests/spice/test_library_spice.cpp diff --git a/qa/unittests/spice/test_module.cpp b/qa/tests/spice/test_module.cpp similarity index 100% rename from qa/unittests/spice/test_module.cpp rename to qa/tests/spice/test_module.cpp diff --git a/qa/unittests/spice/test_netlist_exporter_spice.cpp b/qa/tests/spice/test_netlist_exporter_spice.cpp similarity index 100% rename from qa/unittests/spice/test_netlist_exporter_spice.cpp rename to qa/tests/spice/test_netlist_exporter_spice.cpp diff --git a/qa/unittests/spice/test_netlist_exporter_spice.h b/qa/tests/spice/test_netlist_exporter_spice.h similarity index 100% rename from qa/unittests/spice/test_netlist_exporter_spice.h rename to qa/tests/spice/test_netlist_exporter_spice.h diff --git a/qa/unittests/spice/test_ngspice_helpers.cpp b/qa/tests/spice/test_ngspice_helpers.cpp similarity index 100% rename from qa/unittests/spice/test_ngspice_helpers.cpp rename to qa/tests/spice/test_ngspice_helpers.cpp diff --git a/qa/unittests/spice/test_sim_model_inference.cpp b/qa/tests/spice/test_sim_model_inference.cpp similarity index 100% rename from qa/unittests/spice/test_sim_model_inference.cpp rename to qa/tests/spice/test_sim_model_inference.cpp diff --git a/qa/unittests/spice/test_sim_model_ngspice.cpp b/qa/tests/spice/test_sim_model_ngspice.cpp similarity index 100% rename from qa/unittests/spice/test_sim_model_ngspice.cpp rename to qa/tests/spice/test_sim_model_ngspice.cpp diff --git a/qa/unittests/spice/test_sim_regressions.cpp b/qa/tests/spice/test_sim_regressions.cpp similarity index 100% rename from qa/unittests/spice/test_sim_regressions.cpp rename to qa/tests/spice/test_sim_regressions.cpp diff --git a/qa/test.py b/qa/tests/test-pcbnewswig.py similarity index 93% rename from qa/test.py rename to qa/tests/test-pcbnewswig.py index 62d748320c..572417b8d7 100644 --- a/qa/test.py +++ b/qa/tests/test-pcbnewswig.py @@ -34,7 +34,7 @@ if __name__ == '__main__': # wxWidgets alerts when running the test code locale.setlocale(locale.LC_ALL, 'C') - testsuite = unittest.TestLoader().discover('testcases', pattern="*.py") + testsuite = unittest.TestLoader().discover('tests/pcbnewswig', pattern="*.py") if args.xml: # Dump XML results to the right directory diff --git a/qa/tools/pns/pns_log_file.cpp b/qa/tools/pns/pns_log_file.cpp index 34e48f1356..bf55e6075a 100644 --- a/qa/tools/pns/pns_log_file.cpp +++ b/qa/tools/pns/pns_log_file.cpp @@ -34,7 +34,7 @@ #include #include -#include <../../unittests/common/console_log.h> +#include <../../tests/common/console_log.h> BOARD_CONNECTED_ITEM* PNS_LOG_FILE::ItemById( const PNS_LOG_FILE::EVENT_ENTRY& evt ) { @@ -60,7 +60,7 @@ static const wxString readLine( FILE* f ) } -PNS_LOG_FILE::PNS_LOG_FILE() : +PNS_LOG_FILE::PNS_LOG_FILE() : m_mode( PNS::ROUTER_MODE::PNS_MODE_ROUTE_SINGLE ) { m_routerSettings.reset( new PNS::ROUTING_SETTINGS( nullptr, "" ) ); @@ -85,7 +85,7 @@ static std::shared_ptr parseShape( SHAPE_TYPE expectedType, wxStringToken } else if ( type == SHAPE_TYPE::SH_CIRCLE ) { - + std::shared_ptr sh( new SHAPE_CIRCLE ); VECTOR2I a; a.x = wxAtoi( aTokens.GetNextToken() ); @@ -128,12 +128,12 @@ static PNS::SEGMENT* parsePnsSegmentFromString( PNS::SEGMENT* aSeg, wxStringToke if ( cmd == "shape" ) { auto sh = parseShape( SH_SEGMENT, aTokens ); - + if(!sh) return nullptr; - + seg->SetShape( *static_cast(sh.get()) ); - + } } } @@ -153,10 +153,10 @@ static PNS::VIA* parsePnsViaFromString( PNS::VIA* aSeg, wxStringTokenizer& aToke if ( cmd == "shape" ) { auto sh = parseShape( SH_CIRCLE, aTokens ); - + if(!sh) return nullptr; - + auto *sc = static_cast( sh.get() ); via->SetPos( sc->GetCenter() ); @@ -195,7 +195,7 @@ bool comparePnsItems( const PNS::ITEM*a , const PNS::ITEM* b ) { if( a->Kind() != b->Kind() ) return false; - + if( a->Net() != b->Net() ) return false; @@ -228,7 +228,7 @@ bool comparePnsItems( const PNS::ITEM*a , const PNS::ITEM* b ) if( sa->Width() != sb->Width() ) return false; } - + return true; } @@ -329,7 +329,7 @@ bool PNS_LOG_FILE::Load( const wxFileName& logFileName, REPORTER* aRpt ) fclose( f ); aRpt->Report( wxString::Format( wxT("Loading router settings from '%s'"), fname_settings.GetFullPath() ) ); - + bool ok = m_routerSettings->LoadFromRawFile( fname_settings.GetFullPath() ); if( !ok ) @@ -338,7 +338,7 @@ bool PNS_LOG_FILE::Load( const wxFileName& logFileName, REPORTER* aRpt ) } aRpt->Report( wxString::Format( wxT("Loading project settings from '%s'"), fname_settings.GetFullPath() ) ); - + m_settingsMgr.reset( new SETTINGS_MANAGER ( true ) ); m_settingsMgr->LoadProject( fname_project.GetFullPath() );