From 24bca5a2156ae9c4a6a3072b1726425a7dcd5c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Sun, 9 Mar 2014 08:53:53 +0100 Subject: [PATCH] Clenup after Database test - Close the DB before trying to remove it - Removed a few line in TODO.txt --- TODO.txt | 5 ----- tests/Database_test.cpp | 27 ++++++++++++--------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/TODO.txt b/TODO.txt index 75ad622..b5bf68f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,10 +1,5 @@ Add a full googletest suite -Create a "SQLiteCppExample" repository using the wrapper as a Git submodule. - -Check C++11 explicit support - -Add a FAQ.txt Add a Tutorial: for SQLite newbies Create Github Wiki pages with the README.md and FAQ.txt: Installation, Examples, Tutorial, How to contribute diff --git a/tests/Database_test.cpp b/tests/Database_test.cpp index c291894..6d2e560 100644 --- a/tests/Database_test.cpp +++ b/tests/Database_test.cpp @@ -30,21 +30,18 @@ void assertion_failed(const char* apFile, const long apLine, const char* apFunc, // Constructor TEST(Database, ctor) { remove("test.db3"); - - EXPECT_THROW(SQLite::Database absent("test.db3"), SQLite::Exception); - SQLite::Database db("test.db3", SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE); - EXPECT_STREQ("test.db3", db.getFilename().c_str()); - EXPECT_FALSE(db.tableExists("test")); - EXPECT_FALSE(db.tableExists(std::string("test"))); - EXPECT_EQ(0, db.getLastInsertRowid()); - EXPECT_EQ(0, db.exec("CREATE TABLE test (id INTEGER PRIMARY KEY, value TEXT)")); - EXPECT_TRUE(db.tableExists("test")); - EXPECT_TRUE(db.tableExists(std::string("test"))); - EXPECT_EQ(0, db.getLastInsertRowid()); - + { + EXPECT_THROW(SQLite::Database absent("test.db3"), SQLite::Exception); + SQLite::Database db("test.db3", SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE); + EXPECT_STREQ("test.db3", db.getFilename().c_str()); + EXPECT_FALSE(db.tableExists("test")); + EXPECT_FALSE(db.tableExists(std::string("test"))); + EXPECT_EQ(0, db.getLastInsertRowid()); + EXPECT_EQ(0, db.exec("CREATE TABLE test (id INTEGER PRIMARY KEY, value TEXT)")); + EXPECT_TRUE(db.tableExists("test")); + EXPECT_TRUE(db.tableExists(std::string("test"))); + EXPECT_EQ(0, db.getLastInsertRowid()); + } // Close DB test.db3 remove("test.db3"); -// TODO test -// EXPECT_FALSE(db.hasEntity(entity1)); -// EXPECT_EQ((size_t)0, db.unregisterEntity(entity1)); }