cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-04 17:56:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit test warnings under Linux GCC/Clang

Browse Source
This commit is contained in:
Sébastien Rombauts 2014-03-28 18:27:53 +01:00
parent 60b6593998
commit b9a3aeb62f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -175,6 +175,10 @@ endif(SQLITECPP_BUILD_EXAMPLES)
option(SQLITECPP_BUILD_TESTS "Build and run tests." ON) option(SQLITECPP_BUILD_TESTS "Build and run tests." ON)
if (SQLITECPP_BUILD_TESTS) if (SQLITECPP_BUILD_TESTS)
# add the subdirectory containing the CMakeLists.txt for the gtest library # add the subdirectory containing the CMakeLists.txt for the gtest library
if (NOT MSVC)
add_definitions(-Wno-variadic-macros -Wno-long-long -Wno-conversion -Wno-switch-enum)
endif (NOT MSVC)
add_subdirectory(googletest) add_subdirectory(googletest)
include_directories("${PROJECT_SOURCE_DIR}/googletest/include") include_directories("${PROJECT_SOURCE_DIR}/googletest/include")

16
tests/Statement_test.cpp
View File

@ -32,8 +32,8 @@ TEST(Statement, invalid) {
SQLite::Statement query(db, "SELECT * FROM test"); SQLite::Statement query(db, "SELECT * FROM test");
EXPECT_STREQ("SELECT * FROM test", query.getQuery().c_str()); EXPECT_STREQ("SELECT * FROM test", query.getQuery().c_str());
EXPECT_EQ(2, query.getColumnCount ()); EXPECT_EQ(2, query.getColumnCount ());
EXPECT_EQ(false, query.isOk()); EXPECT_FALSE(query.isOk());
EXPECT_EQ(false, query.isDone()); EXPECT_FALSE(query.isDone());
EXPECT_THROW(query.isColumnNull(-1), SQLite::Exception); EXPECT_THROW(query.isColumnNull(-1), SQLite::Exception);
EXPECT_THROW(query.isColumnNull(0), SQLite::Exception); EXPECT_THROW(query.isColumnNull(0), SQLite::Exception);
EXPECT_THROW(query.isColumnNull(1), SQLite::Exception); EXPECT_THROW(query.isColumnNull(1), SQLite::Exception);
@ -44,15 +44,15 @@ TEST(Statement, invalid) {
EXPECT_THROW(query.getColumn(2), SQLite::Exception); EXPECT_THROW(query.getColumn(2), SQLite::Exception);
query.reset(); query.reset();
EXPECT_EQ(false, query.isOk()); EXPECT_FALSE(query.isOk());
EXPECT_EQ(false, query.isDone()); EXPECT_FALSE(query.isDone());
query.exec(); query.exec();
EXPECT_EQ(false, query.isOk()); EXPECT_FALSE(query.isOk());
EXPECT_EQ(true, query.isDone()); EXPECT_TRUE( query.isDone());
query.reset(); query.reset();
EXPECT_EQ(false, query.isOk()); EXPECT_FALSE(query.isOk());
EXPECT_EQ(false, query.isDone()); EXPECT_FALSE(query.isDone());
query.reset(); query.reset();
EXPECT_THROW(query.bind(-1, 123), SQLite::Exception); EXPECT_THROW(query.bind(-1, 123), SQLite::Exception);