Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix broken unit tests #112

Merged
merged 1 commit into from Aug 6, 2012
Merged

fix broken unit tests #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions libgrive/src/util/Config.cc
View file
Open in desktop
Expand Up @@ -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) ) ;
Expand Down
1 change: 0 additions & 1 deletion libgrive/src/util/Config.hh
View file
Open in desktop
Expand Up @@ -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 ;
Expand Down
36 changes: 22 additions & 14 deletions libgrive/test/util/ConfigTest.cc
View file
Open in desktop
Expand Up @@ -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()) ;
}

5 changes: 2 additions & 3 deletions libgrive/test/util/ConfigTest.hh
View file
Open in desktop
Expand Up @@ -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( );
Expand Down