feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sqlite: Cleanup Sqlite

Browse Source 
We don't need the threading anymore, so we removed it. The indexer
will be run in its thread anyway, so an extra thread makes the code
only more complicated. And we added namespaces.

Change-Id: Ibcba306324763285cf653c28bb08122345e5f8da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-07-26 16:02:24 +02:00
parent 94ba1b8b5d
commit 3dcce060b2
50 changed files with 461 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/unit/unittest/sqlitedatabase-test.cpp
View File

@@ -36,6 +36,10 @@
namespace {
using testing::Contains;
using Sqlite::SqliteTable;
class SqliteDatabase : public ::testing::Test
{
protected:
@@ -44,7 +48,7 @@ protected:
SpyDummy spyDummy;
QString databaseFilePath = QStringLiteral(":memory:");
::SqliteDatabase database;
Sqlite::SqliteDatabase database;
};
TEST_F(SqliteDatabase, SetDatabaseFilePath)
@@ -62,20 +66,16 @@ TEST_F(SqliteDatabase, SetJournalMode)
TEST_F(SqliteDatabase, OpenDatabase)
{
database.close();
QSignalSpy signalSpy(&spyDummy, &SpyDummy::databaseIsOpened);
database.open();
ASSERT_TRUE(signalSpy.wait(100000));
ASSERT_TRUE(database.isOpen());
}
TEST_F(SqliteDatabase, CloseDatabase)
{
QSignalSpy signalSpy(&spyDummy, &SpyDummy::databaseIsClosed);
database.close();
ASSERT_TRUE(signalSpy.wait(100000));
ASSERT_FALSE(database.isOpen());
}
@@ -85,20 +85,19 @@ TEST_F(SqliteDatabase, AddTable)
database.addTable(sqliteTable);
ASSERT_THAT(database.tables().first(), sqliteTable);
ASSERT_THAT(database.tables(), Contains(sqliteTable));
}
void SqliteDatabase::SetUp()
{
QObject::connect(&database, &::SqliteDatabase::databaseIsOpened, &spyDummy, &SpyDummy::databaseIsOpened);
QObject::connect(&database, &::SqliteDatabase::databaseIsClosed, &spyDummy, &SpyDummy::databaseIsClosed);
database.setJournalMode(JournalMode::Memory);
database.setDatabaseFilePath(databaseFilePath);
database.open();
}
void SqliteDatabase::TearDown()
{
database.close();
if (database.isOpen())
database.close();
}
}