lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 295e6c2 4/4: Restore 'configurable_settings.x


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 295e6c2 4/4: Restore 'configurable_settings.xml' after GUI test
Date: Mon, 30 Jul 2018 10:36:23 -0400 (EDT)

branch: master
commit 295e6c25a74004fb9c503232bc53d51ec5504665
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Restore 'configurable_settings.xml' after GUI test
    
    Saved and restored the data changed by the GUI test.
---
 wx_test_calculation_summary.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index d0f9822..094eeed 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -294,15 +294,17 @@ void check_calculation_summary_columns
 
 LMI_WX_TEST_CASE(calculation_summary)
 {
+    configurable_settings& c = configurable_settings::instance();
+    std::string const saved_builtin = 
c["use_builtin_calculation_summary"].str();
+    std::string const saved_columns = c["calculation_summary_columns"    
].str();
+
     if(is_distribution_test())
         {
         // Not only is this the expected value in the GUI, but we also want to 
be
         // sure that effective_calculation_summary_columns() returns the 
default
         // columns in the code below -- and this is only the case when we are 
using
         // the built-in calculation summary.
-        LMI_ASSERT
-            
(configurable_settings::instance().use_builtin_calculation_summary()
-            );
+        LMI_ASSERT(c.use_builtin_calculation_summary());
 
         struct verify_builtin_calculation_summary : 
expect_preferences_dialog_base
         {
@@ -428,5 +430,9 @@ LMI_WX_TEST_CASE(calculation_summary)
         ,custom_columns_info
         );
 
+    c["use_builtin_calculation_summary"] = saved_builtin;
+    c["calculation_summary_columns"    ] = saved_columns;
+    c.save();
+
     ill.close();
 }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]