renamed integration tests with PX4 suffix.

mavlink · Feb 3, 2022 · 7723b15 · 7723b15
1 parent 0067dc6
commit 7723b15
Show file tree

Hide file tree

Showing 29 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -646,7 +646,7 @@ jobs:
         FIRMWARE_DIR: /home/user/ArduPilot
     strategy:
       matrix:
-        apm_version: [rover-4.1.2, copter-4.1.2]
+        apm_version: [copter-4.1.2]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2

diff --git a/src/integration_tests/action_goto.cpp b/src/integration_tests/action_goto.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionGoto)
+TEST_F(SitlTest, PX4ActionGoto)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/action_hold.cpp b/src/integration_tests/action_hold.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionHold)
+TEST_F(SitlTest, PX4ActionHold)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/action_hover_async.cpp b/src/integration_tests/action_hover_async.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionHoverAsync)
+TEST_F(SitlTest, PX4ActionHoverAsync)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp
@@ -9,17 +9,17 @@ using namespace mavsdk;
 
 static void takeoff_and_hover_at_altitude(float altitude_m);
 
-TEST_F(SitlTest, ActionHoverSyncDefault)
+TEST_F(SitlTest, PX4ActionHoverSyncDefault)
 {
     takeoff_and_hover_at_altitude(2.5);
 }
 
-TEST_F(SitlTest, ActionHoverSyncHigher)
+TEST_F(SitlTest, PX4ActionHoverSyncHigher)
 {
     takeoff_and_hover_at_altitude(5.0f);
 }
 
-TEST_F(SitlTest, ActionHoverSyncLower)
+TEST_F(SitlTest, PX4ActionHoverSyncLower)
 {
     // TODO: less than 1.0 is currently failing due to a Firmware bug.
     // https://github.com/PX4/Firmware/issues/12471

diff --git a/src/integration_tests/action_takeoff_and_kill.cpp b/src/integration_tests/action_takeoff_and_kill.cpp
@@ -6,7 +6,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionTakeoffAndKill)
+TEST_F(SitlTest, PX4ActionTakeoffAndKill)
 {
     Mavsdk mavsdk;
     ASSERT_EQ(mavsdk.add_udp_connection(), ConnectionResult::Success);

diff --git a/src/integration_tests/action_transition_multicopter_fixedwing.cpp b/src/integration_tests/action_transition_multicopter_fixedwing.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionTransitionSync_standard_vtol)
+TEST_F(SitlTest, PX4ActionTransitionSync_standard_vtol)
 {
     // Init & connect
     Mavsdk mavsdk;

diff --git a/src/integration_tests/follow_me.cpp b/src/integration_tests/follow_me.cpp
@@ -19,7 +19,7 @@ void send_location_updates(
 
 const size_t N_LOCATIONS = 100ul;
 
-TEST_F(SitlTest, FollowMeOneLocation)
+TEST_F(SitlTest, PX4FollowMeOneLocation)
 {
     Mavsdk mavsdk;
 
@@ -98,7 +98,7 @@ TEST_F(SitlTest, FollowMeOneLocation)
     telemetry->subscribe_flight_mode(nullptr);
 }
 
-TEST_F(SitlTest, FollowMeMultiLocationWithConfig)
+TEST_F(SitlTest, PX4FollowMeMultiLocationWithConfig)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/geofence_inclusion.cpp b/src/integration_tests/geofence_inclusion.cpp
@@ -9,7 +9,7 @@ using namespace mavsdk;
 
 static Geofence::Point add_point(double latitude_deg, double longitude_deg);
 
-TEST_F(SitlTest, GeofenceInclusion)
+TEST_F(SitlTest, PX4GeofenceInclusion)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/info.cpp b/src/integration_tests/info.cpp
@@ -5,7 +5,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, Info)
+TEST_F(SitlTest, PX4Info)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/logging.cpp b/src/integration_tests/logging.cpp
@@ -5,7 +5,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, Logging)
+TEST_F(SitlTest, PX4Logging)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mavlink_passthrough.cpp b/src/integration_tests/mavlink_passthrough.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, MavlinkPassthrough)
+TEST_F(SitlTest, PX4MavlinkPassthrough)
 {
     Mavsdk mavsdk;
     ASSERT_EQ(mavsdk.add_udp_connection(), ConnectionResult::Success);

diff --git a/src/integration_tests/mission.cpp b/src/integration_tests/mission.cpp
@@ -36,7 +36,7 @@ static constexpr int NUM_MISSION_ITEMS = 6;
 
 static std::atomic<bool> pause_already_done{false};
 
-TEST_F(SitlTest, MissionAddWaypointsAndFly)
+TEST_F(SitlTest, PX4MissionAddWaypointsAndFly)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mission_cancellation.cpp b/src/integration_tests/mission_cancellation.cpp
@@ -22,7 +22,7 @@ static Mission::MissionItem add_waypoint(
     float gimbal_yaw_deg,
     bool take_photo);
 
-TEST_F(SitlTest, MissionUploadCancellation)
+TEST_F(SitlTest, PX4MissionUploadCancellation)
 {
     Mavsdk mavsdk;
 
@@ -78,7 +78,7 @@ TEST_F(SitlTest, MissionUploadCancellation)
     std::this_thread::sleep_for(std::chrono::seconds(5));
 }
 
-TEST_F(SitlTest, MissionDownloadCancellation)
+TEST_F(SitlTest, PX4MissionDownloadCancellation)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mission_change_speed.cpp b/src/integration_tests/mission_change_speed.cpp
@@ -20,7 +20,7 @@ float current_speed(std::shared_ptr<Telemetry> telemetry);
 const static float speeds[4] = {10.0f, 3.0f, 8.0f, 5.0f};
 
 // Test to check speed set for mission items.
-TEST_F(SitlTest, MissionChangeSpeed)
+TEST_F(SitlTest, PX4MissionChangeSpeed)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mission_raw_import_and_fly.cpp b/src/integration_tests/mission_raw_import_and_fly.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, MissionRawImportAndFly)
+TEST_F(SitlTest, PX4MissionRawImportAndFly)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mission_raw_mission_changed.cpp b/src/integration_tests/mission_raw_mission_changed.cpp
@@ -14,7 +14,7 @@ static constexpr unsigned NUM_SOME_ITEMS = sizeof(SOME_LATITUDES) / sizeof(SOME_
 
 static void validate_items(const std::vector<MissionRaw::MissionItem>& items);
 
-TEST_F(SitlTest, MissionRawMissionChanged)
+TEST_F(SitlTest, PX4MissionRawMissionChanged)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mission_rtl.cpp b/src/integration_tests/mission_rtl.cpp
@@ -17,17 +17,17 @@ using namespace mavsdk;
 
 void do_mission_with_rtl(float mission_altitude_m, float return_altitude_m);
 
-TEST_F(SitlTest, MissionWithRTLHigh)
+TEST_F(SitlTest, PX4MissionWithRTLHigh)
 {
     do_mission_with_rtl(20, 30);
 }
 
-TEST_F(SitlTest, MissionWithRTLLow)
+TEST_F(SitlTest, PX4MissionWithRTLLow)
 {
     do_mission_with_rtl(5, 10);
 }
 
-TEST_F(SitlTest, MissionWithRTLHigherAnyway)
+TEST_F(SitlTest, PX4MissionWithRTLHigherAnyway)
 {
     do_mission_with_rtl(10, 5);
 }

diff --git a/src/integration_tests/mission_set_current.cpp b/src/integration_tests/mission_set_current.cpp
@@ -16,7 +16,7 @@ Mission::MissionItem
 add_waypoint(double latitude_deg, double longitude_deg, float relative_altitude_m);
 
 // Test to check speed set for mission items.
-TEST_F(SitlTest, MissionSetCurrent)
+TEST_F(SitlTest, PX4MissionSetCurrent)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/mission_transfer_lossy.cpp b/src/integration_tests/mission_transfer_lossy.cpp
@@ -15,7 +15,7 @@ static bool should_keep_message(const mavlink_message_t& message);
 
 static std::atomic<size_t> _lossy_counter{0};
 
-TEST_F(SitlTest, MissionTransferLossy)
+TEST_F(SitlTest, PX4MissionTransferLossy)
 {
     Mavsdk mavsdk;
     ASSERT_EQ(mavsdk.add_udp_connection(), ConnectionResult::Success);

diff --git a/src/integration_tests/offboard_acceleration.cpp b/src/integration_tests/offboard_acceleration.cpp
@@ -9,7 +9,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, OffboardAccelerationNED)
+TEST_F(SitlTest, PX4OffboardAccelerationNED)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/offboard_position.cpp b/src/integration_tests/offboard_position.cpp
@@ -10,7 +10,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, OffboardPositionNED)
+TEST_F(SitlTest, PX4OffboardPositionNED)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/offboard_velocity.cpp b/src/integration_tests/offboard_velocity.cpp
@@ -10,7 +10,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, OffboardVelocityNED)
+TEST_F(SitlTest, PX4OffboardVelocityNED)
 {
     Mavsdk mavsdk;
 
@@ -132,7 +132,7 @@ TEST_F(SitlTest, OffboardVelocityNED)
     }
 }
 
-TEST_F(SitlTest, OffboardVelocityBody)
+TEST_F(SitlTest, PX4OffboardVelocityBody)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/param.cpp b/src/integration_tests/param.cpp
@@ -5,7 +5,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ParamSad)
+TEST_F(SitlTest, PX4ParamSad)
 {
     Mavsdk mavsdk;
 
@@ -43,7 +43,7 @@ TEST_F(SitlTest, ParamSad)
     }
 }
 
-TEST_F(SitlTest, ParamHappy)
+TEST_F(SitlTest, PX4ParamHappy)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/system_connection_async.cpp b/src/integration_tests/system_connection_async.cpp
@@ -12,7 +12,7 @@ static bool _discovered_system = false;
 static bool _timeouted_system = false;
 static uint8_t _sysid = 0;
 
-TEST_F(SitlTest, SystemConnectionAsync)
+TEST_F(SitlTest, PX4SystemConnectionAsync)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/telemetry_async.cpp b/src/integration_tests/telemetry_async.cpp
@@ -56,7 +56,7 @@ static bool _received_position_velocity_ned = false;
 static bool _received_actuator_control_target = false;
 static bool _received_actuator_output_status = false;
 
-TEST_F(SitlTest, TelemetryAsync)
+TEST_F(SitlTest, PX4TelemetryAsync)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/telemetry_health.cpp b/src/integration_tests/telemetry_health.cpp
@@ -8,7 +8,7 @@ using namespace mavsdk;
 void print_health(Telemetry::Health health);
 void print_rc_status(Telemetry::RcStatus rc_status);
 
-TEST_F(SitlTest, TelemetryHealth)
+TEST_F(SitlTest, PX4TelemetryHealth)
 {
     Mavsdk mavsdk;
 

diff --git a/src/integration_tests/telemetry_sync.cpp b/src/integration_tests/telemetry_sync.cpp
@@ -5,7 +5,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, TelemetrySync)
+TEST_F(SitlTest, PX4TelemetrySync)
 {
     Mavsdk mavsdk;
 

diff --git a/tools/run-sitl-tests.sh b/tools/run-sitl-tests.sh
@@ -29,5 +29,5 @@ if [ "${PX4_VERSION}" ]; then
     PX4_SIM_SPEED_FACTOR=10 AUTOSTART_SITL=1 PX4_FIRMWARE_DIR=$PX4_FIRMWARE_DIR HEADLESS=1 build/debug/src/integration_tests/integration_tests_runner --gtest_filter="SitlTest.*"
 else
     echo "Ardupilot Autopilot Version Specified: " ${APM_VERSION}
-    SIM_SPEEDUP=10 AUTOSTART_SITL=1 APM_FIRMWARE_DIR=$APM_FIRMWARE_DIR HEADLESS=1 build/debug/src/integration_tests/integration_tests_runner --gtest_filter="SitlTest.*"
+    SIM_SPEEDUP=10 AUTOSTART_SITL=1 APM_FIRMWARE_DIR=$APM_FIRMWARE_DIR HEADLESS=1 build/debug/src/integration_tests/integration_tests_runner --gtest_filter="SitlTest.*-SitlTest.PX4*"
 fi