Plug in welder for vehicle tests

tenmillimaster · Dec 6, 2023 · 299e45a · 299e45a
1 parent 07678ac
commit 299e45a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp
@@ -446,8 +446,6 @@ static void prep_craft( const recipe_id &rid, const std::vector<item> &tools,
     const tripoint battery_pos = test_origin + tripoint_north;
     std::optional<item> battery_item( "test_storage_battery" );
     place_appliance( battery_pos, vpart_ap_test_storage_battery, battery_item );
-    optional_vpart_position battery_part = get_map().veh_at( battery_pos );
-    REQUIRE( battery_part.has_value() );
 
     give_tools( tools, plug_in_tools );
     const inventory &crafting_inv = player_character.crafting_inventory();

diff --git a/tests/vehicle_interact_test.cpp b/tests/vehicle_interact_test.cpp
@@ -17,14 +17,17 @@
 #include "ret_val.h"
 #include "type_id.h"
 #include "units.h"
+#include "veh_appliance.h"
 #include "veh_type.h"
 #include "vehicle.h"
 
 static const skill_id skill_mechanics( "mechanics" );
 
+static const vpart_id vpart_ap_test_storage_battery( "ap_test_storage_battery" );
+
 static const vproto_id vehicle_prototype_car( "car" );
 
-static void test_repair( const std::vector<item> &tools, bool expect_craftable )
+static void test_repair( const std::vector<item> &tools, bool plug_in_tools, bool expect_craftable )
 {
     clear_avatar();
     clear_map();
@@ -34,8 +37,23 @@ static void test_repair( const std::vector<item> &tools, bool expect_craftable )
     player_character.setpos( test_origin );
     const item debug_backpack( "debug_backpack" );
     player_character.wear_item( debug_backpack );
+
+    const tripoint battery_pos = test_origin + tripoint_north_west;
+    std::optional<item> battery_item( "test_storage_battery" );
+    place_appliance( battery_pos, vpart_ap_test_storage_battery, battery_item );
+
     for( const item &gear : tools ) {
-        player_character.i_add( gear );
+        item_location added_tool = player_character.i_add( gear );
+        if( plug_in_tools && added_tool->can_link_up() ) {
+            added_tool->link = cata::make_value<item::link_data>();
+            added_tool->link->t_state = link_state::vehicle_port;
+            added_tool->link->t_abs_pos = get_map().getglobal( player_character.pos() + tripoint_north_west );
+            added_tool->link->last_processed = calendar::turn;
+            added_tool->link->t_veh_safe = get_map().veh_at( player_character.pos() +
+                                           tripoint_north_west )->vehicle().get_safe_reference();
+            added_tool->set_link_traits();
+            REQUIRE( added_tool->link->t_veh_safe );
+        }
     }
     player_character.set_skill_level( skill_mechanics, 10 );
 
@@ -87,7 +105,7 @@ TEST_CASE( "repair_vehicle_part", "[vehicle]" )
         tools.emplace_back( "hammer" );
         tools.insert( tools.end(), 20, item( "steel_chunk" ) );
         tools.insert( tools.end(), 200, item( "welding_wire_steel" ) );
-        test_repair( tools, true );
+        test_repair( tools, true, true );
     }
     SECTION( "UPS_modded_welder" ) {
         std::vector<item> tools;
@@ -105,7 +123,7 @@ TEST_CASE( "repair_vehicle_part", "[vehicle]" )
         tools.emplace_back( "hammer" );
         tools.insert( tools.end(), 5, item( "steel_chunk" ) );
         tools.insert( tools.end(), 50, item( "welding_wire_steel" ) );
-        test_repair( tools, true );
+        test_repair( tools, false, true );
     }
     SECTION( "welder_missing_goggles" ) {
         std::vector<item> tools;
@@ -119,7 +137,7 @@ TEST_CASE( "repair_vehicle_part", "[vehicle]" )
         tools.emplace_back( "hammer" );
         tools.insert( tools.end(), 5, item( "steel_chunk" ) );
         tools.insert( tools.end(), 50, item( "welding_wire_steel" ) );
-        test_repair( tools, false );
+        test_repair( tools, true, false );
     }
     SECTION( "welder_missing_charge" ) {
         std::vector<item> tools;
@@ -134,7 +152,7 @@ TEST_CASE( "repair_vehicle_part", "[vehicle]" )
         tools.emplace_back( "hammer" );
         tools.insert( tools.end(), 5, item( "steel_chunk" ) );
         tools.insert( tools.end(), 50, item( "welding_wire_steel" ) );
-        test_repair( tools, false );
+        test_repair( tools, false, false );
     }
     SECTION( "UPS_modded_welder_missing_charges" ) {
         std::vector<item> tools;
@@ -151,7 +169,7 @@ TEST_CASE( "repair_vehicle_part", "[vehicle]" )
         tools.emplace_back( "goggles_welding" );
         tools.insert( tools.end(), 5, item( "steel_chunk" ) );
         tools.insert( tools.end(), 50, item( "welding_wire_steel" ) );
-        test_repair( tools, false );
+        test_repair( tools, false, false );
     }
     SECTION( "welder_missing_consumables" ) {
         std::vector<item> tools;
@@ -163,6 +181,6 @@ TEST_CASE( "repair_vehicle_part", "[vehicle]" )
         tools.push_back( welder );
 
         tools.emplace_back( "goggles_welding" );
-        test_repair( tools, false );
+        test_repair( tools, true, false );
     }
 }