mirror of https://github.com/vitalif/grive2
Fix libgrive/test build after removing doclist api (fixes #102)
parent
dd77c99872
commit
11a3d788d0
|
@ -21,7 +21,6 @@
|
||||||
|
|
||||||
#include "util/log/DefaultLog.hh"
|
#include "util/log/DefaultLog.hh"
|
||||||
|
|
||||||
#include "drive/EntryTest.hh"
|
|
||||||
#include "base/ResourceTest.hh"
|
#include "base/ResourceTest.hh"
|
||||||
#include "base/ResourceTreeTest.hh"
|
#include "base/ResourceTreeTest.hh"
|
||||||
#include "base/StateTest.hh"
|
#include "base/StateTest.hh"
|
||||||
|
@ -29,7 +28,7 @@
|
||||||
#include "util/FunctionTest.hh"
|
#include "util/FunctionTest.hh"
|
||||||
#include "util/ConfigTest.hh"
|
#include "util/ConfigTest.hh"
|
||||||
#include "util/SignalHandlerTest.hh"
|
#include "util/SignalHandlerTest.hh"
|
||||||
#include "xml/NodeTest.hh"
|
//#include "xml/NodeTest.hh"
|
||||||
|
|
||||||
int main( int argc, char **argv )
|
int main( int argc, char **argv )
|
||||||
{
|
{
|
||||||
|
@ -38,7 +37,6 @@ int main( int argc, char **argv )
|
||||||
gr::LogBase::Inst( new gr::log::DefaultLog ) ;
|
gr::LogBase::Inst( new gr::log::DefaultLog ) ;
|
||||||
|
|
||||||
CppUnit::TextUi::TestRunner runner;
|
CppUnit::TextUi::TestRunner runner;
|
||||||
runner.addTest( Entry1Test::suite( ) ) ;
|
|
||||||
runner.addTest( StateTest::suite( ) ) ;
|
runner.addTest( StateTest::suite( ) ) ;
|
||||||
runner.addTest( ResourceTest::suite( ) ) ;
|
runner.addTest( ResourceTest::suite( ) ) ;
|
||||||
runner.addTest( ResourceTreeTest::suite( ) ) ;
|
runner.addTest( ResourceTreeTest::suite( ) ) ;
|
||||||
|
@ -46,7 +44,7 @@ int main( int argc, char **argv )
|
||||||
runner.addTest( FunctionTest::suite( ) ) ;
|
runner.addTest( FunctionTest::suite( ) ) ;
|
||||||
runner.addTest( ConfigTest::suite( ) ) ;
|
runner.addTest( ConfigTest::suite( ) ) ;
|
||||||
runner.addTest( SignalHandlerTest::suite( ) ) ;
|
runner.addTest( SignalHandlerTest::suite( ) ) ;
|
||||||
runner.addTest( NodeTest::suite( ) ) ;
|
//runner.addTest( NodeTest::suite( ) ) ;
|
||||||
runner.run();
|
runner.run();
|
||||||
|
|
||||||
return 0 ;
|
return 0 ;
|
||||||
|
|
|
@ -23,8 +23,7 @@
|
||||||
|
|
||||||
#include "base/Resource.hh"
|
#include "base/Resource.hh"
|
||||||
|
|
||||||
#include "drive/Entry1.hh"
|
#include "drive2/Entry2.hh"
|
||||||
#include "xml/Node.hh"
|
|
||||||
#include "json/Val.hh"
|
#include "json/Val.hh"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -32,7 +31,7 @@
|
||||||
namespace grut {
|
namespace grut {
|
||||||
|
|
||||||
using namespace gr ;
|
using namespace gr ;
|
||||||
using namespace gr::v1 ;
|
using namespace gr::v2 ;
|
||||||
|
|
||||||
ResourceTest::ResourceTest( )
|
ResourceTest::ResourceTest( )
|
||||||
{
|
{
|
||||||
|
@ -61,11 +60,11 @@ void ResourceTest::TestNormal( )
|
||||||
GRUT_ASSERT_EQUAL( subject.MD5(), "c0742c0a32b2c909b6f176d17a6992d0" ) ;
|
GRUT_ASSERT_EQUAL( subject.MD5(), "c0742c0a32b2c909b6f176d17a6992d0" ) ;
|
||||||
GRUT_ASSERT_EQUAL( subject.StateStr(), "local_new" ) ;
|
GRUT_ASSERT_EQUAL( subject.StateStr(), "local_new" ) ;
|
||||||
|
|
||||||
xml::Node entry = xml::Node::Element( "entry" ) ;
|
Val entry;
|
||||||
entry.AddElement( "updated" ).AddText( "2012-05-09T16:13:22.401Z" ) ;
|
entry.Set( "modifiedDate", Val( std::string( "2012-05-09T16:13:22.401Z" ) ) );
|
||||||
entry.AddElement( "docs:md5Checksum" ).AddText( "DIFFERENT" ) ;
|
entry.Set( "md5Checksum", Val( std::string( "DIFFERENT" ) ) );
|
||||||
|
|
||||||
Entry1 remote( entry ) ;
|
Entry2 remote( entry ) ;
|
||||||
GRUT_ASSERT_EQUAL( "different", remote.MD5() ) ;
|
GRUT_ASSERT_EQUAL( "different", remote.MD5() ) ;
|
||||||
subject.FromRemote( remote ) ;
|
subject.FromRemote( remote ) ;
|
||||||
GRUT_ASSERT_EQUAL( "local_changed", subject.StateStr() ) ;
|
GRUT_ASSERT_EQUAL( "local_changed", subject.StateStr() ) ;
|
||||||
|
|
Loading…
Reference in New Issue