initialize_for_test changes (thanks eric)

src/lib/config/config.cpp

@@ -58,7 +58,7 @@ namespace interop {
 // Functions used for interop to other languages
 /////////////////////////////////////////////////
 
-   
+
 std::string getbuffer_serialized_buffer;
 extern "C" BTS_EXPORT const char* get_buffer(const char* key_name, int& out_length)
 {
@@ -69,7 +69,7 @@ extern "C" BTS_EXPORT const char* get_buffer(const char* key_name, int& out_leng
 
    getbuffer_serialized_buffer.clear();
    message.SerializePartialToString(&getbuffer_serialized_buffer);
-   
+
    out_length = getbuffer_serialized_buffer.size();
    return getbuffer_serialized_buffer.c_str();
 }
@@ -89,10 +89,14 @@ namespace internal {
 // Functions used in testing
 //////////////////////////////////////////
 
-extern "C" BTS_EXPORT void initialize_for_test(const std::string& values, bool print_errors)
+extern "C" BTS_EXPORT void initialize_for_test(const char* values, bool print_errors)
 {
    config_state.reset();
-   config_state.load_string(values, print_errors);
+   config_state.load_string(std::string(values), print_errors);
+}
+void initialize_for_test(const std::string& value, bool print_errors) {
+   config_state.reset();
+   config_state.load_string(value, print_errors);
 }
 
 extern "C" BTS_EXPORT void reset()

src/lib/config/config.h

@@ -22,7 +22,7 @@ namespace config {
    // Load and initialize config.
    // This will be automatically called on the first key request but since loading config
    // can result in network requests this function is available for applications that want to
-   // manage pauses in execution. 
+   // manage pauses in execution.
    // Ex: initialize() on a background thread so that config::get<T>() is fast on a UI thread
    extern "C" BTS_EXPORT void initialize();
 
@@ -56,7 +56,8 @@ namespace config {
    {
       // Initialize configuration state from a string instead of from the filesystem. defaults.conf will still be loaded.
       // Calling this a second time clears all values from previous initialization
-      extern "C" BTS_EXPORT void initialize_for_test(const std::string& configuration, bool print_errors=true);
+      extern "C" BTS_EXPORT void initialize_for_test(const char* configuration, bool print_errors=true);
+      void initialize_for_test(const std::string& configuration, bool print_errors=true);
 
       // Releases all resources and returns config to factory defaults
       extern "C" BTS_EXPORT void reset();