diff UnitTestsSources/ServerIndexTests.cpp @ 3017:517fc4767ae0 db-changes

renamed class DatabaseWrapper as SQLiteDatabaseWrapper
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 14 Dec 2018 14:55:49 +0100
parents 7695a9c81099
children e3b5c07146a3
line wrap: on
line diff
--- a/UnitTestsSources/ServerIndexTests.cpp	Fri Dec 14 14:21:27 2018 +0100
+++ b/UnitTestsSources/ServerIndexTests.cpp	Fri Dec 14 14:55:49 2018 +0100
@@ -37,7 +37,7 @@
 #include "../Core/FileStorage/FilesystemStorage.h"
 #include "../Core/FileStorage/MemoryStorageArea.h"
 #include "../Core/Logging.h"
-#include "../OrthancServer/DatabaseWrapper.h"
+#include "../OrthancServer/SQLiteDatabaseWrapper.h"
 #include "../OrthancServer/Search/LookupIdentifierQuery.h"
 #include "../OrthancServer/ServerContext.h"
 #include "../OrthancServer/ServerIndex.h"
@@ -117,7 +117,7 @@
       switch (GetParam())
       {
         case DatabaseWrapperClass_SQLite:
-          index_.reset(new DatabaseWrapper());
+          index_.reset(new SQLiteDatabaseWrapper());
           break;
 
         default:
@@ -141,7 +141,7 @@
       {
         case DatabaseWrapperClass_SQLite:
         {
-          DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
+          SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get());
           ASSERT_EQ(expected, sqlite->GetTableRecordCount(table));
           break;
         }
@@ -159,7 +159,7 @@
       {
         case DatabaseWrapperClass_SQLite:
         {
-          DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
+          SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get());
           ASSERT_FALSE(sqlite->GetParentPublicId(s, id));
           break;
         }
@@ -177,7 +177,7 @@
       {
         case DatabaseWrapperClass_SQLite:
         {
-          DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
+          SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get());
           ASSERT_TRUE(sqlite->GetParentPublicId(s, id));
           ASSERT_EQ(expected, s);
           break;
@@ -196,7 +196,7 @@
       {
         case DatabaseWrapperClass_SQLite:
         {
-          DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
+          SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get());
           sqlite->GetChildren(j, id);
           ASSERT_EQ(0u, j.size());
           break;
@@ -215,7 +215,7 @@
       {
         case DatabaseWrapperClass_SQLite:
         {
-          DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
+          SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get());
           sqlite->GetChildren(j, id);
           ASSERT_EQ(1u, j.size());
           ASSERT_EQ(expected, j.front());
@@ -237,7 +237,7 @@
       {
         case DatabaseWrapperClass_SQLite:
         {
-          DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
+          SQLiteDatabaseWrapper* sqlite = dynamic_cast<SQLiteDatabaseWrapper*>(index_.get());
           sqlite->GetChildren(j, id);
           ASSERT_EQ(2u, j.size());
           ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) ||
@@ -676,7 +676,7 @@
 
   SystemToolbox::RemoveFile(path + "/index");
   FilesystemStorage storage(path);
-  DatabaseWrapper db;   // The SQLite DB is in memory
+  SQLiteDatabaseWrapper db;   // The SQLite DB is in memory
   db.Open();
   ServerContext context(db, storage, true /* running unit tests */, 10);
   context.SetupJobsEngine(true, false);
@@ -776,7 +776,7 @@
 
   SystemToolbox::RemoveFile(path + "/index");
   FilesystemStorage storage(path);
-  DatabaseWrapper db;   // The SQLite DB is in memory
+  SQLiteDatabaseWrapper db;   // The SQLite DB is in memory
   db.Open();
   ServerContext context(db, storage, true /* running unit tests */, 10);
   context.SetupJobsEngine(true, false);
@@ -864,7 +864,7 @@
     bool overwrite = (i == 0);
 
     MemoryStorageArea storage;
-    DatabaseWrapper db;   // The SQLite DB is in memory
+    SQLiteDatabaseWrapper db;   // The SQLite DB is in memory
     db.Open();
     ServerContext context(db, storage, true /* running unit tests */, 10);
     context.SetupJobsEngine(true, false);