Option override support for tests

tests/invlet_test.cpp

@@ -12,6 +12,7 @@
 #include "catch/catch.hpp"
 #include "game.h"
 #include "map.h"
+#include "options_helpers.h"
 #include "options.h"
 #include "player.h"
 #include "map_helpers.h"
@@ -724,25 +725,25 @@ static void merge_invlet_test( player &dummy, inventory_location from )
 
 #define invlet_test_autoletter_off( name, dummy, from, to ) \
     SECTION( std::string( name ) + " (auto letter off)" ) { \
-        get_options().get_option( "AUTO_INV_ASSIGN" ).setValue( "disabled" ); \
+        override_option opt( "AUTO_INV_ASSIGN", "disabled" ); \
         invlet_test( dummy, from, to ); \
     }
 
 #define stack_invlet_test_autoletter_off( name, dummy, from, to ) \
     SECTION( std::string( name ) + " (auto letter off)" ) { \
-        get_options().get_option( "AUTO_INV_ASSIGN" ).setValue( "disabled" ); \
+        override_option opt( "AUTO_INV_ASSIGN", "disabled" ); \
         stack_invlet_test( dummy, from, to ); \
     }
 
 #define swap_invlet_test_autoletter_off( name, dummy, loc ) \
     SECTION( std::string( name ) + " (auto letter off)" ) { \
-        get_options().get_option( "AUTO_INV_ASSIGN" ).setValue( "disabled" ); \
+        override_option opt( "AUTO_INV_ASSIGN", "disabled" ); \
         swap_invlet_test( dummy, loc ); \
     }
 
 #define merge_invlet_test_autoletter_off( name, dummy, from ) \
     SECTION( std::string( name ) + " (auto letter off)" ) { \
-        get_options().get_option( "AUTO_INV_ASSIGN" ).setValue( "disabled" ); \
+        override_option opt( "AUTO_INV_ASSIGN", "disabled" ); \
         merge_invlet_test( dummy, from ); \
     }
 

tests/iteminfo_test.cpp

@@ -9,6 +9,7 @@
 #include "item.h"
 #include "iteminfo_query.h"
 #include "itype.h"
+#include "options_helpers.h"
 #include "recipe_dictionary.h"
 
 static void iteminfo_test( const item &i, const iteminfo_query &q, const std::string &reference )
@@ -25,6 +26,7 @@ TEST_CASE( "item description and physical attributes", "[item][iteminfo]" )
                         iteminfo_parts::BASE_PRICE, iteminfo_parts::BASE_VOLUME,
                         iteminfo_parts::BASE_WEIGHT, iteminfo_parts::BASE_MATERIAL
                       } );
+    override_option opt( "USE_METRIC_WEIGHTS", "lbs" );
     iteminfo_test(
         item( "jug_plastic" ), q,
         "A standard plastic jug used for milk and household cleaning chemicals.\n"

tests/monster_test.cpp

@@ -14,6 +14,7 @@
 #include "map.h"
 #include "map_helpers.h"
 #include "monster.h"
+#include "options_helpers.h"
 #include "options.h"
 #include "player.h"
 #include "test_statistics.h"
@@ -296,7 +297,7 @@ static void monster_check()
 TEST_CASE( "write_slope_to_speed_map_trig", "[.]" )
 {
     clear_map_and_put_player_underground();
-    get_options().get_option( "CIRCLEDIST" ).setValue( "true" );
+    override_option opt( "CIRCLEDIST", "true" );
     trigdist = true;
     test_moves_to_squares( "mon_zombie_dog", true );
     test_moves_to_squares( "mon_pig", true );
@@ -305,7 +306,7 @@ TEST_CASE( "write_slope_to_speed_map_trig", "[.]" )
 TEST_CASE( "write_slope_to_speed_map_square", "[.]" )
 {
     clear_map_and_put_player_underground();
-    get_options().get_option( "CIRCLEDIST" ).setValue( "false" );
+    override_option opt( "CIRCLEDIST", "false" );
     trigdist = false;
     test_moves_to_squares( "mon_zombie_dog", true );
     test_moves_to_squares( "mon_pig", true );
@@ -316,15 +317,15 @@ TEST_CASE( "write_slope_to_speed_map_square", "[.]" )
 TEST_CASE( "monster_speed_square", "[speed]" )
 {
     clear_map_and_put_player_underground();
-    get_options().get_option( "CIRCLEDIST" ).setValue( "false" );
+    override_option opt( "CIRCLEDIST", "false" );
     trigdist = false;
     monster_check();
 }
 
 TEST_CASE( "monster_speed_trig", "[speed]" )
 {
     clear_map_and_put_player_underground();
-    get_options().get_option( "CIRCLEDIST" ).setValue( "true" );
+    override_option opt( "CIRCLEDIST", "true" );
     trigdist = true;
     monster_check();
 }

tests/options_helpers.cpp

@@ -0,0 +1,17 @@
+#include "options_helpers.h"
+
+#include "debug.h"
+#include "options.h"
+
+override_option::override_option( const std::string &option, const std::string &value ) :
+    option_( option )
+{
+    options_manager::cOpt &opt = get_options().get_option( option_ );
+    old_value_ = opt.getValue( true );
+    opt.setValue( value );
+}
+
+override_option::~override_option()
+{
+    get_options().get_option( option_ ).setValue( old_value_ );
+}

tests/options_helpers.h

@@ -0,0 +1,21 @@
+#pragma once
+#ifndef CATA_TEST_OPTIONS_HELPERS_H
+#define CATA_TEST_OPTIONS_HELPERS_H
+
+#include <string>
+
+// RAII class to temporarily override a particular option value
+// The previous value will be restored in the destructor
+class override_option
+{
+    public:
+        override_option( const std::string &option, const std::string &value );
+        override_option( const override_option & ) = delete;
+        override_option &operator=( const override_option & ) = delete;
+        ~override_option();
+    private:
+        std::string option_;
+        std::string old_value_;
+};
+
+#endif