From 96c4f68bb521f1bd04acdb68d4d3dadc43106b46 Mon Sep 17 00:00:00 2001 From: bruceperens Date: Sat, 18 Jan 2014 00:11:33 +0000 Subject: [PATCH] Added a base file test, fixed CMakeLists.txt flag handling, fixed a complaint from --pedantic. git-svn-id: https://svn.code.sf.net/p/freetel/code@1372 01035d8c-6547-0410-b346-abe4f91aad63 --- freedv-server/CMakeLists.txt | 3 +-- freedv-server/Doxyfile.in | 2 +- freedv-server/source/drivers.h | 2 +- freedv-server/source/test/base.cpp | 10 ++++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/freedv-server/CMakeLists.txt b/freedv-server/CMakeLists.txt index ee11e24d..b231b507 100644 --- a/freedv-server/CMakeLists.txt +++ b/freedv-server/CMakeLists.txt @@ -131,8 +131,7 @@ set(Test.headers ) load_parameters(cxx-flags) -set_source_files_properties(${Compile.sources} ${Optional.sources} ${Test.sources} PROPERTIES COMPILE_FLAGS "-std=c++11") -set_source_files_properties(${Compile.sources} ${Optional.sources} ${Test.sources} PROPERTIES COMPILE_FLAGS "-std=c++11") +set_source_files_properties(${Compile.sources} ${Optional.sources} ${Test.sources} PROPERTIES COMPILE_FLAGS ${Param.cxx-flags}) add_executable(freedv-server ${Compile.sources} source/big_main.cpp) diff --git a/freedv-server/Doxyfile.in b/freedv-server/Doxyfile.in index bcf6215a..5420e168 100644 --- a/freedv-server/Doxyfile.in +++ b/freedv-server/Doxyfile.in @@ -614,7 +614,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = "_darcs" "googletest" +EXCLUDE = "_darcs" "googletest" "source/test" # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/freedv-server/source/drivers.h b/freedv-server/source/drivers.h index f5676d1f..f922b395 100644 --- a/freedv-server/source/drivers.h +++ b/freedv-server/source/drivers.h @@ -452,7 +452,7 @@ namespace FreeDV { PTTInput * PTTConstant(const char * parameter); TextInput * TextConstant(const char * parameter); UserInterface * BlankPanel(const char * parameter, Interfaces *); - }; + } } #ifndef NO_INITIALIZERS diff --git a/freedv-server/source/test/base.cpp b/freedv-server/source/test/base.cpp index 01c9ab08..b880cce1 100644 --- a/freedv-server/source/test/base.cpp +++ b/freedv-server/source/test/base.cpp @@ -1,6 +1,7 @@ // Tests for the Base class. #include #include +#include using namespace FreeDV; @@ -24,5 +25,14 @@ protected: }; TEST_F(BaseTest, CaptiveIsFalse) { + // The base class version of captive() and the one inherited by AudioSink, + // must always return false. Only an interface that is owned by the + // UserInterface class can return true. ASSERT_FALSE(b->captive()); } + +TEST_F(BaseTest, PrintsItself) { + std::stringstream stream; + stream << *b; + ASSERT_STREQ("sink:", stream.str().c_str()); +} -- 2.25.1