[lmi-commits] [6223] Eradicate references to expunged skins

[Greg Chicares]

Revision: 6223
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6223
Author:   chicares
Date:     2015-07-29 14:35:56 +0000 (Wed, 29 Jul 2015)
Log Message:
-----------
Eradicate references to expunged skins

Modified Paths:
--------------
    lmi/trunk/configurable_settings.cpp
    lmi/trunk/configurable_settings_test.cpp
    lmi/trunk/wx_test_config_settings.cpp

Modified: lmi/trunk/configurable_settings.cpp
===================================================================
--- lmi/trunk/configurable_settings.cpp 2015-07-29 14:34:38 UTC (rev 6222)
+++ lmi/trunk/configurable_settings.cpp 2015-07-29 14:35:56 UTC (rev 6223)
@@ -287,10 +287,7 @@
                   "xml_notebook.xrc"                   == value ? "skin.xrc"
                 : "xml_notebook_coli_boli.xrc"         == value ? 
"skin_coli_boli.xrc"
                 : "xml_notebook_group_carveout.xrc"    == value ? 
"skin_group_carveout.xrc"
-                : "xml_notebook_group_carveout2.xrc"   == value ? 
"skin_group_carveout2.xrc"
-                : "xml_notebook_private_placement.xrc" == value ? 
"skin_reg_d.xrc"
                 : "xml_notebook_single_premium.xrc"    == value ? 
"skin_single_premium.xrc"
-                : "xml_notebook_variable_annuity.xrc"  == value ? 
"skin_variable_annuity.xrc"
                 : throw std::runtime_error(value + ": unexpected skin 
filename.")
                 ;
             }

Modified: lmi/trunk/configurable_settings_test.cpp
===================================================================
--- lmi/trunk/configurable_settings_test.cpp    2015-07-29 14:34:38 UTC (rev 
6222)
+++ lmi/trunk/configurable_settings_test.cpp    2015-07-29 14:35:56 UTC (rev 
6223)
@@ -86,18 +86,18 @@
         << "<custom_input_filename>[renamed]</custom_input_filename>\n"
         << "<custom_output_filename>[renamed]</custom_output_filename>\n"
         << "<xml_schema_filename>[withdrawn]</xml_schema_filename>\n"
-        << 
"<skin_filename>xml_notebook_private_placement.xrc</skin_filename>\n"
+        << "<skin_filename>xml_notebook.xrc</skin_filename>\n"
         << "</configurable_settings>\n"
         ;
     ofs.close();
 
     configurable_settings& c = configurable_settings::instance();
     c.xml_serializable<configurable_settings>::load(filename);
-    BOOST_TEST_EQUAL("[renamed]"     , c.custom_input_0_filename());
-    BOOST_TEST_EQUAL("custom.inix"   , c.custom_input_1_filename());
-    BOOST_TEST_EQUAL("[renamed]"     , c.custom_output_0_filename());
-    BOOST_TEST_EQUAL("custom.out1"   , c.custom_output_1_filename());
-    BOOST_TEST_EQUAL("skin_reg_d.xrc", c.skin_filename());
+    BOOST_TEST_EQUAL("[renamed]"   , c.custom_input_0_filename());
+    BOOST_TEST_EQUAL("custom.inix" , c.custom_input_1_filename());
+    BOOST_TEST_EQUAL("[renamed]"   , c.custom_output_0_filename());
+    BOOST_TEST_EQUAL("custom.out1" , c.custom_output_1_filename());
+    BOOST_TEST_EQUAL("skin.xrc"    , c.skin_filename());
 }
 
 int test_main(int, char*[])

Modified: lmi/trunk/wx_test_config_settings.cpp
===================================================================
--- lmi/trunk/wx_test_config_settings.cpp       2015-07-29 14:34:38 UTC (rev 
6222)
+++ lmi/trunk/wx_test_config_settings.cpp       2015-07-29 14:35:56 UTC (rev 
6223)
@@ -55,19 +55,12 @@
           <skin_filename>skin_group_carveout.xrc</skin_filename>
           
<default_input_filename>c:/fop-0.20.5/group_carveout_default.ill</default_input_filename>
 
-          <skin_filename>skin_group_carveout2.xrc</skin_filename>
-          
<default_input_filename>c:/fop-0.20.5/group_carveout_default.ill</default_input_filename>
-
-          <skin_filename>skin_reg_d.xrc</skin_filename>
-          
<default_input_filename>c:/fop-0.20.5/private_placement_default.ill</default_input_filename>
-
           <skin_filename>skin_single_premium.xrc</skin_filename>
           
<default_input_filename>c:/fop-0.20.5/default.ill</default_input_filename>
           [Something like "single_premium_default.ill" might be expected,
           but "default.ill" really is wanted here for historical reasons.]
 
-          ['skin.xrc' and 'skin_variable_annuity.xrc' deliberately omitted
-          because those are not currently distributed.]
+          ['skin.xrc' deliberately omitted--not currently distributed.]
 
     The only change is that the xsl_fo_command is checked to contain the 
volume,
     i.e. is c:/fop-0.20.5/fop, and not just the path.
@@ -101,10 +94,8 @@
     std::string skin = settings.skin_filename();
     std::string default_input = settings.default_input_filename();
     LMI_ASSERT_WITH_MSG
-        (  "skin_coli_boli.xrc" == skin
+        (  "skin_coli_boli.xrc"      == skin
         || "skin_group_carveout.xrc" == skin
-        || "skin_group_carveout2.xrc" == skin
-        || "skin_reg_d.xrc" == skin
         || "skin_single_premium.xrc" == skin
         ,"unknown skin " << skin
         );
@@ -116,14 +107,6 @@
         {
         LMI_ASSERT_EQUAL(default_input, 
"c:/fop-0.20.5/group_carveout_default.ill");
         }
-    if ("skin_group_carveout2.xrc" == skin)
-        {
-        LMI_ASSERT_EQUAL(default_input, 
"c:/fop-0.20.5/group_carveout_default.ill");
-        }
-    if ("skin_reg_d.xrc" == skin)
-        {
-        LMI_ASSERT_EQUAL(default_input, 
"c:/fop-0.20.5/private_placement_default.ill");
-        }
     if ("skin_single_premium.xrc" == skin)
         {
         LMI_ASSERT_EQUAL(default_input, "c:/fop-0.20.5/default.ill");