Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #112 from justinharding/issue_86_partial_sync

fix broken unit tests
  • Loading branch information...
commit 113b1107d8172ade8a6141735e8883bd3d64fe50 2 parents 804fe92 + 29f1739
@nestal nestal authored
View
6 libgrive/src/util/Config.cc
@@ -34,12 +34,6 @@ const std::string default_filename = ".grive";
const char *env_name = "GR_CONFIG";
const std::string default_root_folder = ".";
-Config::Config( const fs::path& root_path ) :
- m_path( GetPath( root_path ) )
-{
- m_file = Read() ;
-}
-
Config::Config( const po::variables_map& vm )
{
m_cmd.Add( "log-xml", Json(vm.count("log-xml") > 0) ) ;
View
1  libgrive/src/util/Config.hh
@@ -39,7 +39,6 @@ public :
struct Error : virtual Exception {} ;
typedef boost::error_info<struct FileTag, std::string> File ;
- Config( const fs::path& root_path ) ;
Config( const boost::program_options::variables_map& vm ) ;
const fs::path Filename() const ;
View
36 libgrive/test/util/ConfigTest.cc
@@ -25,33 +25,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "protocol/Json.hh"
#include "util/log/Log.hh"
+#include <boost/program_options.hpp>
#include <iostream>
using namespace grut;
using namespace gr ;
+namespace po = boost::program_options;
ConfigTest::ConfigTest( )
{
}
-void ConfigTest::TestInitialiseWithEmptyString( )
+void ConfigTest::TestInitialiseWithNoPath( )
{
- Config config("");
- GRUT_ASSERT_EQUAL( "/home/.grive", config.Filename().string()) ;
-}
+ po::variables_map vm;
+ po::notify(vm);
-void ConfigTest::TestInitialiseWithString( )
-{
- Config config("/home/.grive");
- GRUT_ASSERT_EQUAL( "/home/.grive", config.Filename().string()) ;
+ Config config(vm);
+ GRUT_ASSERT_EQUAL( "./.grive", config.Filename().string()) ;
}
-void ConfigTest::TestInitialiseWithFileSystemPath( )
+void ConfigTest::TestInitialiseWithPath( )
{
- fs::path path("/home");
- fs::path file(".grive");
- Config config(path / file);
- GRUT_ASSERT_EQUAL( "/home/.grive", config.Filename().string());
-}
+ char const *argv[] = { "Program", "-p", "/home/grive" };
+ int argc = 3;
+ po::options_description desc( "Grive options" );
+ desc.add_options()
+ ( "path,p", po::value<std::string>(), "Path to sync")
+ ;
+
+ po::variables_map vm;
+ po::store(po::parse_command_line( argc, argv, desc), vm );
+ po::notify(vm);
+
+ Config config(vm);
+ GRUT_ASSERT_EQUAL( "/home/grive/.grive", config.Filename().string()) ;
+}
View
5 libgrive/test/util/ConfigTest.hh
@@ -30,12 +30,11 @@ class ConfigTest : public CppUnit::TestFixture
public :
ConfigTest( ) ;
- // declare suit function
CPPUNIT_TEST_SUITE( ConfigTest ) ;
- CPPUNIT_TEST_EXCEPTION( TestInitialiseWithEmptyString, gr::Config::Error ) ;
+ CPPUNIT_TEST( TestInitialiseWithEmptyString ) ;
CPPUNIT_TEST( TestInitialiseWithString ) ;
CPPUNIT_TEST( TestInitialiseWithFileSystemPath ) ;
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
private :
void TestInitialiseWithEmptyString( );
Please sign in to comment.
Something went wrong with that request. Please try again.