vitalif
/
grive2
mirror of https://github.com/vitalif/grive2
1
0
Fork 0
Code Issues Releases Wiki Activity

"fixed" UT

pull/40/head
Nestal Wan 2012-06-10 15:37:56 +08:00
parent 5f61be489b
commit a863939b05
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libgrive/CMakeLists.txt
View File

@ -69,8 +69,8 @@ add_definitions(
-DSRC_DIR="${libgrive_SOURCE_DIR}/src" -DSRC_DIR="${libgrive_SOURCE_DIR}/src"
) )
add_library( grive SHARED ${LIBGRIVE_SRC} ${OPT_SRC} ) #add_library( grive SHARED ${LIBGRIVE_SRC} ${OPT_SRC} )
add_library( grive-static STATIC ${LIBGRIVE_SRC} ${OPT_SRC} ) add_library( grive STATIC ${LIBGRIVE_SRC} ${OPT_SRC} )
target_link_libraries( grive target_link_libraries( grive
${CURL_LIBRARIES} ${CURL_LIBRARIES}
@ -83,19 +83,19 @@ target_link_libraries( grive
${OPT_LIBS} ${OPT_LIBS}
) )
set_target_properties(grive PROPERTIES #set_target_properties(grive PROPERTIES
SOVERSION 0 VERSION ${GRIVE_VERSION} # SOVERSION 0 VERSION ${GRIVE_VERSION}
) #)
set_target_properties(grive grive-static PROPERTIES OUTPUT_NAME grive) #set_target_properties(grive grive-static PROPERTIES OUTPUT_NAME grive)
if ( LIB_INSTALL_DIR ) if ( LIB_INSTALL_DIR )
else() else()
set ( LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib ) set ( LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib )
endif() endif()
install(TARGETS grive LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) #install(TARGETS grive LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
install(TARGETS grive-static ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) install(TARGETS grive ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
install(FILES ${DRIVE_HEADERS} DESTINATION include/grive/drive) install(FILES ${DRIVE_HEADERS} DESTINATION include/grive/drive)
install(FILES ${PROTOCOL_HEADERS} DESTINATION include/grive/protocol) install(FILES ${PROTOCOL_HEADERS} DESTINATION include/grive/protocol)
install(FILES ${UTIL_HEADERS} DESTINATION include/grive/util) install(FILES ${UTIL_HEADERS} DESTINATION include/grive/util)

7
libgrive/test/drive/ResourceTest.cc
View File

@ -36,10 +36,11 @@ ResourceTest::ResourceTest( )
void ResourceTest::TestNormal( ) void ResourceTest::TestNormal( )
{ {
Json json ; Resource root ;
json.Add( "name", Json( "abc.txt" ) ) ; Resource subject( "abc.txt", "file" ) ;
root.AddChild( &subject ) ;
// Resource subject( json, 0 ) ; GRUT_ASSERT_EQUAL( subject.Path(), fs::path( "./abc.txt" ) ) ;
} }
} // end of namespace grut } // end of namespace grut

9
libgrive/test/drive/StateTest.cc
View File

@ -37,15 +37,6 @@ StateTest::StateTest( )
void StateTest::TestSync( ) void StateTest::TestSync( )
{ {
State s( TEST_DATA "/test_dir1.state", Json() ) ;
Resource *r = s.Find( "./folder1/abc.txt" ) ;
CPPUNIT_ASSERT( r != 0 ) ;
GRUT_ASSERT_EQUAL( r->Name(), "abc.txt" ) ;
Trace( "state %1% = %2%", r->Name(), r->StateStr() ) ;
// load directory
s.FromLocal( TEST_DATA "/test_dir1" ) ;
} }
} // end of namespace grut } // end of namespace grut