diff --git a/BUILD.bazel b/BUILD.bazel index 69a429052..5886e9e68 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -74,6 +74,7 @@ cc_library( deps = [ "@tinyxml2", ], + visibility = ["//visibility:public"], ) cc_library( @@ -129,6 +130,7 @@ cc_library( "@gz-utils//:Environment", "@gz-utils//:ImplPtr", ], + visibility = ["//visibility:public"], ) cc_test( diff --git a/test/BUILD.bazel b/test/BUILD.bazel index 6325d8764..b7bd3e6d7 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -1,13 +1,8 @@ load("@rules_gazebo//gazebo:headers.bzl", "gz_configure_header") -load("@rules_license//rules:license.bzl", "license") package( default_applicable_licenses = ["//:license"], -) - -license( - name = "license", - package_name = "sdformat-test", + features = ["layering_check"], ) gz_configure_header( @@ -26,7 +21,956 @@ cc_library( visibility = ["//:__subpackages__"], ) -exports_files([ - "sdf", - "integration/model", -]) +exports_files( + [ + "sdf", + "integration/model", + ], + visibility = ["//:__subpackages__"], +) + +cc_test( + name = "INTEGRATION_actor_dom", + srcs = [ + "integration/actor_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_audio", + srcs = [ + "integration/audio.cc", + ], + data = [ + "integration/audio.sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_category_bitmask", + srcs = [ + "integration/category_bitmask.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_cfm_damping_implicit_spring_damper", + srcs = [ + "integration/cfm_damping_implicit_spring_damper.cc", + ], + data = [ + "integration/cfm_damping_implicit_spring_damper.sdf", + "integration/cfm_damping_implicit_spring_damper.urdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_collision_dom", + srcs = [ + "integration/collision_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_converter", + srcs = [ + "integration/converter.cc", + ], + data = [ + "integration/audio.sdf", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_default_elements", + srcs = [ + "integration/default_elements.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_deprecated_specs", + srcs = [ + "integration/deprecated_specs.cc", + ], + data = [ + "integration/deprecated_sdf_1-0.sdf", + "integration/deprecated_sdf_1-2.sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_disable_fixed_joint_reduction", + srcs = [ + "integration/disable_fixed_joint_reduction.cc", + ], + data = [ + "integration/fixed_joint_reduction.urdf", + "integration/fixed_joint_reduction_disabled.urdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +# TODO: Enable after adding build rule for tools/get_mem_info.py +# cc_test( +# name = "INTEGRATION_element_memory_leak", +# srcs = [ +# "integration/element_memory_leak.cc", +# ], +# data = [ +# ":sdf", +# ], +# deps = [ +# "//:sdformat", +# ":test_utils", +# "@googletest//:gtest_main", +# ], +# ) + +cc_test( + name = "INTEGRATION_element_tracing", + srcs = [ + "integration/element_tracing.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_error_output", + srcs = [ + "integration/error_output.cc", + ], + data = [ + ":integration/model", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_fixed_joint_reduction", + srcs = [ + "integration/fixed_joint_reduction.cc", + ], + data = glob( + [ + "integration/fixed_joint_reduction*.sdf", + "integration/fixed_joint_reduction*.urdf", + ], + ), + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_force_torque_sensor", + srcs = [ + "integration/force_torque_sensor.cc", + ], + data = [ + "integration/force_torque_sensor.urdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_frame", + srcs = [ + "integration/frame.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_geometry_dom", + srcs = [ + "integration/geometry_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_gui_dom", + srcs = [ + "integration/gui_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_include", + srcs = [ + "integration/include.cc", + ], + data = [ + "integration/include_description.sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_includes", + srcs = [ + "integration/includes.cc", + ], + data = glob( + [ + "integration/include*.sdf", + ], + ) + [ + "integration/merge_include_model.sdf", + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_interface_api", + srcs = [ + "integration/interface_api.cc", + "integration/toml_parser.hh", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_joint_axis_dom", + srcs = [ + "integration/joint_axis_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_joint_axis_frame", + srcs = [ + "integration/joint_axis_frame.cc", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_joint_dom", + srcs = [ + "integration/joint_dom.cc", + ], + data = [ + "integration/provide_feedback.urdf", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_light_dom", + srcs = [ + "integration/light_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_link_dom", + srcs = [ + "integration/link_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_link_light", + srcs = [ + "integration/link_light.cc", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_locale_fix", + srcs = [ + "integration/locale_fix.cc", + ], + data = [ + "integration/numeric.sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_locale_fix_cxx", + srcs = [ + "integration/locale_fix_cxx.cc", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_material", + srcs = [ + "integration/material.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_material_pbr", + srcs = [ + "integration/material_pbr.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_model_dom", + srcs = [ + "integration/model_dom.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_model_versions", + srcs = [ + "integration/model_versions.cc", + ], + data = [ + ":integration/model", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_nested_model", + srcs = [ + "integration/nested_model.cc", + ], + data = [ + "integration/nested_model_with_frames_expected.sdf", + "integration/partially_flattened.sdf", + "integration/two_level_nested_model_with_frames_expected.sdf", + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_nested_multiple_elements_error", + srcs = [ + "integration/nested_multiple_elements_error.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_param_passing", + srcs = [ + "integration/param_passing.cc", + ], + data = [ + "integration/include_custom_model.sdf", + "integration/include_custom_model_expected_output.sdf", + "integration/include_custom_nested_model_expected_output.sdf", + "integration/include_invalid_custom_model.sdf", + "integration/include_model.sdf", + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_parser_config", + srcs = [ + "integration/parser_config.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_parser_error_detection", + srcs = [ + "integration/parser_error_detection.cc", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_particle_emitter_dom", + srcs = [ + "integration/particle_emitter_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_plugin_attribute", + srcs = [ + "integration/plugin_attribute.cc", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_plugin_bool", + srcs = [ + "integration/plugin_bool.cc", + ], + deps = [ + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_plugin_include", + srcs = [ + "integration/plugin_include.cc", + ], + data = [ + ":integration/model", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_pose_1_9_sdf", + srcs = [ + "integration/pose_1_9_sdf.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + ":test_utils", + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_precision", + srcs = [ + "integration/precision.cc", + ], + deps = [ + "//:sdformat", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_print_config", + srcs = [ + "integration/print_config.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_projector_dom", + srcs = [ + "integration/projector_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_provide_feedback", + srcs = [ + "integration/provide_feedback.cc", + ], + data = [ + "integration/provide_feedback.urdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_resolve_uris", + srcs = [ + "integration/resolve_uris.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_root_dom", + srcs = [ + "integration/root_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_scene_dom", + srcs = [ + "integration/scene_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +# TODO: Enable once xmllint is available in toolchain +# cc_test( +# name = "INTEGRATION_schema_test", +# srcs = [ +# "integration/schema_test.cc", +# ], +# data = [ +# ":integration/model", +# ], +# deps = [ +# "//:sdformat", +# ":test_utils", +# "@googletest//:gtest_main", +# ], +# ) + +cc_test( + name = "INTEGRATION_sdf_basic", + srcs = [ + "integration/sdf_basic.cc", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_sdf_custom", + srcs = [ + "integration/sdf_custom.cc", + ], + data = [ + ":integration/model", + "integration/custom_elems_attrs.sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_sdf_dom_conversion", + srcs = [ + "integration/sdf_dom_conversion.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_sensor_dom", + srcs = [ + "integration/sensor_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_surface_dom", + srcs = [ + "integration/surface_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_unknown", + srcs = [ + "integration/unknown.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_urdf_gazebo_extensions", + srcs = [ + "integration/urdf_gazebo_extensions.cc", + ], + data = [ + "integration/fixed_joint_example.urdf", + "integration/fixed_joint_simple.urdf", + "integration/fixed_joint_static.urdf", + "integration/urdf_gazebo_extensions.urdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_urdf_joint_parameters", + srcs = [ + "integration/urdf_joint_parameters.cc", + ], + data = [ + "integration/urdf_joint_parameters.urdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_urdf_to_sdf", + srcs = [ + "integration/urdf_to_sdf.cc", + ], + data = [ + "integration/force_torque_sensor.urdf", + "integration/invalid_force_torque_sensor_lumped_and_reduced.urdf", + "integration/invalid_force_torque_sensor_massless_child_link.urdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_visual_dom", + srcs = [ + "integration/visual_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_whitespace", + srcs = [ + "integration/whitespace.cc", + ], + data = [ + ":integration/model", + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) + +cc_test( + name = "INTEGRATION_world_dom", + srcs = [ + "integration/world_dom.cc", + ], + data = [ + ":sdf", + ], + deps = [ + "//:sdformat", + ":test_utils", + "@googletest//:gtest_main", + ], +) diff --git a/test/integration/audio.cc b/test/integration/audio.cc index ed6c39191..4e6e3cb46 100644 --- a/test/integration/audio.cc +++ b/test/integration/audio.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/category_bitmask.cc b/test/integration/category_bitmask.cc index e983631b3..e3a2f8506 100644 --- a/test/integration/category_bitmask.cc +++ b/test/integration/category_bitmask.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" ///////////////////////////////////////////////// TEST(CategoryBitmask, WasSpecified) diff --git a/test/integration/cfm_damping_implicit_spring_damper.cc b/test/integration/cfm_damping_implicit_spring_damper.cc index 2d5f2e8dc..a9bedf18c 100644 --- a/test/integration/cfm_damping_implicit_spring_damper.cc +++ b/test/integration/cfm_damping_implicit_spring_damper.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/converter.cc b/test/integration/converter.cc index 1509de722..40fc6cc9a 100644 --- a/test/integration/converter.cc +++ b/test/integration/converter.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/disable_fixed_joint_reduction.cc b/test/integration/disable_fixed_joint_reduction.cc index d71390f36..8bd75866f 100644 --- a/test/integration/disable_fixed_joint_reduction.cc +++ b/test/integration/disable_fixed_joint_reduction.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/element_memory_leak.cc b/test/integration/element_memory_leak.cc index ecb9c03d9..4562f3c1b 100644 --- a/test/integration/element_memory_leak.cc +++ b/test/integration/element_memory_leak.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/fixed_joint_reduction.cc b/test/integration/fixed_joint_reduction.cc index 064484964..3bf03345d 100644 --- a/test/integration/fixed_joint_reduction.cc +++ b/test/integration/fixed_joint_reduction.cc @@ -20,7 +20,10 @@ #include -#include "sdf/sdf.hh" +#include "sdf/Model.hh" +#include "sdf/Joint.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" #include "test_config.hh" diff --git a/test/integration/force_torque_sensor.cc b/test/integration/force_torque_sensor.cc index 83c730349..f7cd36773 100644 --- a/test/integration/force_torque_sensor.cc +++ b/test/integration/force_torque_sensor.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/include.cc b/test/integration/include.cc index 7e48e84c2..79386e404 100644 --- a/test/integration/include.cc +++ b/test/integration/include.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/joint_axis_frame.cc b/test/integration/joint_axis_frame.cc index 31b54bdb6..fcc5c6515 100644 --- a/test/integration/joint_axis_frame.cc +++ b/test/integration/joint_axis_frame.cc @@ -20,7 +20,8 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" std::string get_sdf_string(const std::string &_version) { diff --git a/test/integration/link_light.cc b/test/integration/link_light.cc index fbffca098..7d0cba245 100644 --- a/test/integration/link_light.cc +++ b/test/integration/link_light.cc @@ -18,7 +18,7 @@ #include #include #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/locale_fix.cc b/test/integration/locale_fix.cc index 7957919e1..5e103a96e 100644 --- a/test/integration/locale_fix.cc +++ b/test/integration/locale_fix.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/locale_fix_cxx.cc b/test/integration/locale_fix_cxx.cc index 36d74d898..589497562 100644 --- a/test/integration/locale_fix_cxx.cc +++ b/test/integration/locale_fix_cxx.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/Param.hh" TEST(CheckFixForLocal, CheckFixForCxxLocal) { diff --git a/test/integration/material.cc b/test/integration/material.cc index df927af16..74bce1c10 100644 --- a/test/integration/material.cc +++ b/test/integration/material.cc @@ -20,7 +20,8 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" #include "test_config.hh" void ExpectInvalidWithMessage(sdf::Errors &_errors, std::string _compType) diff --git a/test/integration/material_pbr.cc b/test/integration/material_pbr.cc index b7ef86d23..f9b8677e7 100644 --- a/test/integration/material_pbr.cc +++ b/test/integration/material_pbr.cc @@ -17,8 +17,14 @@ #include #include -#include "sdf/sdf.hh" + +#include "sdf/Link.hh" +#include "sdf/Material.hh" +#include "sdf/Model.hh" #include "sdf/Pbr.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" +#include "sdf/Visual.hh" #include "test_config.hh" diff --git a/test/integration/model_versions.cc b/test/integration/model_versions.cc index 7bd2627eb..09bc0e7a1 100644 --- a/test/integration/model_versions.cc +++ b/test/integration/model_versions.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/nested_model.cc b/test/integration/nested_model.cc index 54859c95e..720551609 100644 --- a/test/integration/nested_model.cc +++ b/test/integration/nested_model.cc @@ -23,7 +23,16 @@ #include #include -#include "sdf/sdf.hh" +#include "sdf/Collision.hh" +#include "sdf/Frame.hh" +#include "sdf/Joint.hh" +#include "sdf/JointAxis.hh" +#include "sdf/Link.hh" +#include "sdf/Model.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" +#include "sdf/Visual.hh" +#include "sdf/World.hh" #include "test_config.hh" diff --git a/test/integration/parser_error_detection.cc b/test/integration/parser_error_detection.cc index 3d6fc752f..69fcd53f8 100644 --- a/test/integration/parser_error_detection.cc +++ b/test/integration/parser_error_detection.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" std::string get_sdf_string() { diff --git a/test/integration/plugin_attribute.cc b/test/integration/plugin_attribute.cc index 7f4f9f4cb..19ac6e484 100644 --- a/test/integration/plugin_attribute.cc +++ b/test/integration/plugin_attribute.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" std::string get_sdf_string() { diff --git a/test/integration/plugin_bool.cc b/test/integration/plugin_bool.cc index 55139b2a7..b7b735615 100644 --- a/test/integration/plugin_bool.cc +++ b/test/integration/plugin_bool.cc @@ -20,7 +20,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" std::string get_sdf_string() { diff --git a/test/integration/plugin_include.cc b/test/integration/plugin_include.cc index e7f5e1827..fef78f692 100644 --- a/test/integration/plugin_include.cc +++ b/test/integration/plugin_include.cc @@ -17,7 +17,7 @@ #include #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/precision.cc b/test/integration/precision.cc index b2503ecd3..65d3ca255 100644 --- a/test/integration/precision.cc +++ b/test/integration/precision.cc @@ -17,7 +17,7 @@ #include #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" std::string get_sdf_string() { diff --git a/test/integration/print_config.cc b/test/integration/print_config.cc index 922f7f5fa..c0882580f 100644 --- a/test/integration/print_config.cc +++ b/test/integration/print_config.cc @@ -22,7 +22,17 @@ #include #include -#include "sdf/sdf.hh" +#include "sdf/Camera.hh" +#include "sdf/Geometry.hh" +#include "sdf/Joint.hh" +#include "sdf/JointAxis.hh" +#include "sdf/Link.hh" +#include "sdf/Model.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" +#include "sdf/Sensor.hh" +#include "sdf/Visual.hh" +#include "sdf/World.hh" #include "test_config.hh" diff --git a/test/integration/provide_feedback.cc b/test/integration/provide_feedback.cc index 1811628f8..3f5e771c8 100644 --- a/test/integration/provide_feedback.cc +++ b/test/integration/provide_feedback.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/resolve_uris.cc b/test/integration/resolve_uris.cc index f7273e5e5..b268c0590 100644 --- a/test/integration/resolve_uris.cc +++ b/test/integration/resolve_uris.cc @@ -20,7 +20,15 @@ #include -#include "sdf/sdf.hh" +#include "sdf/Collision.hh" +#include "sdf/Geometry.hh" +#include "sdf/Heightmap.hh" +#include "sdf/Link.hh" +#include "sdf/Model.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" +#include "sdf/Visual.hh" +#include "sdf/World.hh" #include "test_config.hh" diff --git a/test/integration/schema_test.cc b/test/integration/schema_test.cc index 99a309fdb..7a8392d53 100644 --- a/test/integration/schema_test.cc +++ b/test/integration/schema_test.cc @@ -21,7 +21,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/sdf_basic.cc b/test/integration/sdf_basic.cc index 7ea458804..71009c0d5 100644 --- a/test/integration/sdf_basic.cc +++ b/test/integration/sdf_basic.cc @@ -16,7 +16,7 @@ */ #include -#include "sdf/sdf.hh" +#include "sdf/SDFImpl.hh" #include "test_config.hh" diff --git a/test/integration/sdf_custom.cc b/test/integration/sdf_custom.cc index ef04256b9..8434270d2 100644 --- a/test/integration/sdf_custom.cc +++ b/test/integration/sdf_custom.cc @@ -19,7 +19,11 @@ #include -#include "sdf/sdf.hh" +#include "sdf/Link.hh" +#include "sdf/Model.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" +#include "sdf/World.hh" #include "test_config.hh" diff --git a/test/integration/unknown.cc b/test/integration/unknown.cc index 33204521b..60dc4dcbc 100644 --- a/test/integration/unknown.cc +++ b/test/integration/unknown.cc @@ -19,8 +19,9 @@ #include -#include "sdf/sdf.hh" #include "sdf/Error.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" #include "test_config.hh" diff --git a/test/integration/urdf_gazebo_extensions.cc b/test/integration/urdf_gazebo_extensions.cc index a8c9f7f7c..56f3be4bb 100644 --- a/test/integration/urdf_gazebo_extensions.cc +++ b/test/integration/urdf_gazebo_extensions.cc @@ -19,7 +19,12 @@ #include -#include "sdf/sdf.hh" +#include "sdf/Frame.hh" +#include "sdf/Joint.hh" +#include "sdf/Link.hh" +#include "sdf/Model.hh" +#include "sdf/parser.hh" +#include "sdf/Root.hh" #include "test_config.hh" diff --git a/test/integration/urdf_joint_parameters.cc b/test/integration/urdf_joint_parameters.cc index 734d52c5f..9462b16e2 100644 --- a/test/integration/urdf_joint_parameters.cc +++ b/test/integration/urdf_joint_parameters.cc @@ -19,7 +19,7 @@ #include -#include "sdf/sdf.hh" +#include "sdf/parser.hh" #include "test_config.hh" diff --git a/test/integration/urdf_to_sdf.cc b/test/integration/urdf_to_sdf.cc index 0dcd42444..2afd40511 100644 --- a/test/integration/urdf_to_sdf.cc +++ b/test/integration/urdf_to_sdf.cc @@ -18,7 +18,10 @@ #include #include -#include "sdf/sdf.hh" +#include "sdf/Frame.hh" +#include "sdf/Joint.hh" +#include "sdf/Link.hh" +#include "sdf/Model.hh" #include "sdf/parser.hh" #include "sdf/ParserConfig.hh" #include "test_config.hh"