[lmi-commits] [6074] Remove configuration file

[Greg Chicares]

Revision: 6074
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6074
Author:   chicares
Date:     2014-12-15 12:55:33 +0000 (Mon, 15 Dec 2014)
Log Message:
-----------
Remove configuration file

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/main_wx_test.cpp
    lmi/trunk/wx_test_case.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-12-15 12:50:10 UTC (rev 6073)
+++ lmi/trunk/ChangeLog 2014-12-15 12:55:33 UTC (rev 6074)
@@ -34893,3 +34893,10 @@
 Print only observed time, not relative error. See:
   http://lists.nongnu.org/archive/html/lmi/2014-12/msg00073.html
 
+20141215T1255Z <address@hidden> [516]
+
+  main_wx_test.cpp
+  wx_test_case.hpp
+Remove configuration file. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-12/msg00068.html
+

Modified: lmi/trunk/main_wx_test.cpp
===================================================================
--- lmi/trunk/main_wx_test.cpp  2014-12-15 12:50:10 UTC (rev 6073)
+++ lmi/trunk/main_wx_test.cpp  2014-12-15 12:55:33 UTC (rev 6074)
@@ -176,9 +176,6 @@
     // Used by LMI_WX_TEST_CASE() macro to register the individual test cases.
     void add_test(wx_base_test_case* test);
 
-    // Used by tests to retrieve their configuration parameters.
-    wxConfigBase const& get_config_for(char const* name);
-
     // Return the configured directory (current one by default) to use for the
     // test files.
     fs::path const& get_test_files_path() const { return test_files_path_; }
@@ -235,8 +232,6 @@
 
     std::vector<test_descriptor> tests_;
 
-    boost::scoped_ptr<wxFileConfig> config_;
-
     fs::path test_files_path_;
 
     bool run_all_;
@@ -533,19 +528,6 @@
     std::cerr << tests_.size() << " test cases.\n";
 }
 
-wxConfigBase const& application_test::get_config_for(char const* name)
-{
-    if(!config_)
-        {
-        wxFFileInputStream is("wx_test.conf", "r");
-        config_.reset(new wxFileConfig(is));
-        }
-
-    config_->SetPath(wxString("/") + name);
-
-    return *config_;
-}
-
 } // Unnamed namespace.
 
 wx_base_test_case::wx_base_test_case(char const* name)
@@ -554,11 +536,6 @@
     application_test::instance().add_test(this);
 }
 
-wxConfigBase const& wx_base_test_case::config() const
-{
-    return application_test::instance().get_config_for(get_name());
-}
-
 void wx_base_test_case::skip_if_not_supported(char const* file)
 {
     const wxString p(file);

Modified: lmi/trunk/wx_test_case.hpp
===================================================================
--- lmi/trunk/wx_test_case.hpp  2014-12-15 12:50:10 UTC (rev 6073)
+++ lmi/trunk/wx_test_case.hpp  2014-12-15 12:55:33 UTC (rev 6074)
@@ -30,8 +30,6 @@
 
 #include <boost/filesystem/path.hpp>
 
-class wxConfigBase;
-
 /// Base class for the test case objects.
 ///
 /// It is only supposed to be used by LMI_WX_TEST_CASE macro and not directly.
@@ -90,12 +88,6 @@
     /// The argument must be a literal, as we just store the pointer.
     explicit wx_base_test_case(char const* name);
 
-    /// Get the object containing test configuration.
-    ///
-    /// The returned object will have the group containing the options for this
-    /// test as its current path for convenience.
-    wxConfigBase const& config() const;
-
     char const* const m_name;
 };