From 5da32905ea4be39cd85b60ed44e32d8492346150 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 27 Jun 2015 23:18:03 +0300 Subject: [PATCH] Move old tests to fix build errors, fixes #14 --- libgrive/CMakeLists.txt | 1 + libgrive/test/UnitTest.cc | 8 ++++---- libgrive/test/{drive => base}/ResourceTest.cc | 6 +++--- libgrive/test/{drive => base}/ResourceTest.hh | 0 libgrive/test/{drive => base}/ResourceTreeTest.cc | 5 ++--- libgrive/test/{drive => base}/ResourceTreeTest.hh | 0 libgrive/test/{drive => base}/StateTest.cc | 3 +-- libgrive/test/{drive => base}/StateTest.hh | 0 libgrive/test/drive/EntryTest.cc | 10 +++++----- libgrive/test/drive/EntryTest.hh | 6 +++--- 10 files changed, 19 insertions(+), 20 deletions(-) rename libgrive/test/{drive => base}/ResourceTest.cc (95%) rename libgrive/test/{drive => base}/ResourceTest.hh (100%) rename libgrive/test/{drive => base}/ResourceTreeTest.cc (91%) rename libgrive/test/{drive => base}/ResourceTreeTest.hh (100%) rename libgrive/test/{drive => base}/StateTest.cc (95%) rename libgrive/test/{drive => base}/StateTest.hh (100%) diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt index 7fadd8dc..cbbde554 100644 --- a/libgrive/CMakeLists.txt +++ b/libgrive/CMakeLists.txt @@ -117,6 +117,7 @@ IF ( CPPUNIT_FOUND ) # list of test source files here file(GLOB TEST_SRC + test/base/*.cc test/drive/*.cc test/util/*.cc test/xml/*.cc diff --git a/libgrive/test/UnitTest.cc b/libgrive/test/UnitTest.cc index 19dcf503..c229ae60 100644 --- a/libgrive/test/UnitTest.cc +++ b/libgrive/test/UnitTest.cc @@ -22,9 +22,9 @@ #include "util/log/DefaultLog.hh" #include "drive/EntryTest.hh" -#include "drive/ResourceTest.hh" -#include "drive/ResourceTreeTest.hh" -#include "drive/StateTest.hh" +#include "base/ResourceTest.hh" +#include "base/ResourceTreeTest.hh" +#include "base/StateTest.hh" #include "util/DateTimeTest.hh" #include "util/FunctionTest.hh" #include "util/ConfigTest.hh" @@ -38,7 +38,7 @@ int main( int argc, char **argv ) gr::LogBase::Inst( std::auto_ptr(new gr::log::DefaultLog) ) ; CppUnit::TextUi::TestRunner runner; - runner.addTest( EntryTest::suite( ) ) ; + runner.addTest( Entry1Test::suite( ) ) ; runner.addTest( StateTest::suite( ) ) ; runner.addTest( ResourceTest::suite( ) ) ; runner.addTest( ResourceTreeTest::suite( ) ) ; diff --git a/libgrive/test/drive/ResourceTest.cc b/libgrive/test/base/ResourceTest.cc similarity index 95% rename from libgrive/test/drive/ResourceTest.cc rename to libgrive/test/base/ResourceTest.cc index 5f69c427..f6819034 100644 --- a/libgrive/test/drive/ResourceTest.cc +++ b/libgrive/test/base/ResourceTest.cc @@ -21,9 +21,9 @@ #include "Assert.hh" -#include "drive/Resource.hh" +#include "base/Resource.hh" -#include "drive/Entry.hh" +#include "drive/Entry1.hh" #include "xml/Node.hh" #include @@ -60,7 +60,7 @@ void ResourceTest::TestNormal( ) xml::Node entry = xml::Node::Element( "entry" ) ; entry.AddElement( "updated" ).AddText( "2012-05-09T16:13:22.401Z" ) ; - Entry remote( entry ) ; + Entry1 remote( entry ) ; subject.FromRemote( remote, DateTime() ) ; GRUT_ASSERT_EQUAL( "local_changed", subject.StateStr() ) ; } diff --git a/libgrive/test/drive/ResourceTest.hh b/libgrive/test/base/ResourceTest.hh similarity index 100% rename from libgrive/test/drive/ResourceTest.hh rename to libgrive/test/base/ResourceTest.hh diff --git a/libgrive/test/drive/ResourceTreeTest.cc b/libgrive/test/base/ResourceTreeTest.cc similarity index 91% rename from libgrive/test/drive/ResourceTreeTest.cc rename to libgrive/test/base/ResourceTreeTest.cc index 22285ade..c15df46a 100644 --- a/libgrive/test/drive/ResourceTreeTest.cc +++ b/libgrive/test/base/ResourceTreeTest.cc @@ -21,15 +21,14 @@ #include "Assert.hh" -#include "drive/ResourceTree.hh" -#include "drive/Resource.hh" +#include "base/ResourceTree.hh" +#include "base/Resource.hh" #include namespace grut { using namespace gr ; -using namespace gr::v1 ; ResourceTreeTest::ResourceTreeTest( ) { diff --git a/libgrive/test/drive/ResourceTreeTest.hh b/libgrive/test/base/ResourceTreeTest.hh similarity index 100% rename from libgrive/test/drive/ResourceTreeTest.hh rename to libgrive/test/base/ResourceTreeTest.hh diff --git a/libgrive/test/drive/StateTest.cc b/libgrive/test/base/StateTest.cc similarity index 95% rename from libgrive/test/drive/StateTest.cc rename to libgrive/test/base/StateTest.cc index 167dab27..6e7aff57 100644 --- a/libgrive/test/drive/StateTest.cc +++ b/libgrive/test/base/StateTest.cc @@ -21,7 +21,7 @@ #include "Assert.hh" -#include "drive/State.hh" +#include "base/State.hh" #include "json/Val.hh" #include "util/log/Log.hh" @@ -30,7 +30,6 @@ namespace grut { using namespace gr ; -using namespace gr::v1 ; StateTest::StateTest( ) { diff --git a/libgrive/test/drive/StateTest.hh b/libgrive/test/base/StateTest.hh similarity index 100% rename from libgrive/test/drive/StateTest.hh rename to libgrive/test/base/StateTest.hh diff --git a/libgrive/test/drive/EntryTest.cc b/libgrive/test/drive/EntryTest.cc index 48dfa5c7..a78516db 100644 --- a/libgrive/test/drive/EntryTest.cc +++ b/libgrive/test/drive/EntryTest.cc @@ -21,7 +21,7 @@ #include "Assert.hh" -#include "drive/Entry.hh" +#include "drive/Entry1.hh" #include "xml/Node.hh" #include "xml/NodeSet.hh" #include "xml/TreeBuilder.hh" @@ -33,17 +33,17 @@ namespace grut { using namespace gr ; using namespace gr::v1 ; -EntryTest::EntryTest( ) +Entry1Test::Entry1Test( ) { } -void EntryTest::TestXml( ) +void Entry1Test::TestXml( ) { xml::Node root = xml::TreeBuilder::ParseFile( TEST_DATA "entry.xml" ) ; CPPUNIT_ASSERT( !root["entry"].empty() ) ; - Entry subject( root["entry"].front() ) ; + Entry1 subject( root["entry"].front() ) ; GRUT_ASSERT_EQUAL( "snes", subject.Title() ) ; GRUT_ASSERT_EQUAL( "\"WxYPGE8CDyt7ImBk\"", subject.ETag() ) ; GRUT_ASSERT_EQUAL( "https://docs.google.com/feeds/default/private/full/folder%3A0B5KhdsbryVeGMl83OEV1ZVc3cUE", @@ -53,7 +53,7 @@ void EntryTest::TestXml( ) GRUT_ASSERT_EQUAL( "https://docs.google.com/feeds/default/private/full/folder%3A0B5KhdsbryVeGNEZjdUxzZHl3Sjg", subject.ParentHrefs().front() ) ; - GRUT_ASSERT_EQUAL( "folder", subject.Kind() ) ; + GRUT_ASSERT_EQUAL( true, subject.IsDir() ) ; } } // end of namespace grut diff --git a/libgrive/test/drive/EntryTest.hh b/libgrive/test/drive/EntryTest.hh index 8d4f7f47..f7bc8f51 100644 --- a/libgrive/test/drive/EntryTest.hh +++ b/libgrive/test/drive/EntryTest.hh @@ -24,13 +24,13 @@ namespace grut { -class EntryTest : public CppUnit::TestFixture +class Entry1Test : public CppUnit::TestFixture { public : - EntryTest( ) ; + Entry1Test( ) ; // declare suit function - CPPUNIT_TEST_SUITE( EntryTest ) ; + CPPUNIT_TEST_SUITE( Entry1Test ) ; CPPUNIT_TEST( TestXml ) ; CPPUNIT_TEST_SUITE_END();