comparison PostgreSQL/UnitTests/UnitTestsMain.cpp @ 226:a4918d57435c

DatabaseManager doesn't IDatabaseFactory anymore
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 02 Apr 2021 19:23:36 +0200
parents 94c9908e6aca
children ece4663dedde
comparison
equal deleted inserted replaced
225:94c9908e6aca 226:a4918d57435c
25 #include <gtest/gtest.h> 25 #include <gtest/gtest.h>
26 26
27 OrthancDatabases::PostgreSQLParameters globalParameters_; 27 OrthancDatabases::PostgreSQLParameters globalParameters_;
28 28
29 #include "../../Framework/Plugins/IndexUnitTests.h" 29 #include "../../Framework/Plugins/IndexUnitTests.h"
30 #include "../../Framework/PostgreSQL/PostgreSQLDatabase.h"
30 31
31 32
32 #if ORTHANC_POSTGRESQL_STATIC == 1 33 #if ORTHANC_POSTGRESQL_STATIC == 1
33 # include <c.h> // PostgreSQL includes 34 # include <c.h> // PostgreSQL includes
34 35
90 lock.SetLock(true); 91 lock.SetLock(true);
91 92
92 OrthancDatabases::PostgreSQLIndex db1(NULL, noLock); 93 OrthancDatabases::PostgreSQLIndex db1(NULL, noLock);
93 db1.SetClearAll(true); 94 db1.SetClearAll(true);
94 95
95 OrthancDatabases::DatabaseManager manager1(db1.CreateDatabaseFactory()); 96 std::unique_ptr<OrthancDatabases::DatabaseManager> manager1(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db1));
96 manager1.Open();
97 97
98 { 98 {
99 OrthancDatabases::PostgreSQLIndex db2(NULL, lock); 99 OrthancDatabases::PostgreSQLIndex db2(NULL, lock);
100 OrthancDatabases::DatabaseManager manager2(db2.CreateDatabaseFactory()); 100 std::unique_ptr<OrthancDatabases::DatabaseManager> manager2(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db2));
101 manager2.Open();
102 101
103 OrthancDatabases::PostgreSQLIndex db3(NULL, lock); 102 OrthancDatabases::PostgreSQLIndex db3(NULL, lock);
104 OrthancDatabases::DatabaseManager manager3(db3.CreateDatabaseFactory()); 103 ASSERT_THROW(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db3), Orthanc::OrthancException);
105 ASSERT_THROW(manager3.Open(), Orthanc::OrthancException);
106 } 104 }
107 105
108 OrthancDatabases::PostgreSQLIndex db4(NULL, lock); 106 OrthancDatabases::PostgreSQLIndex db4(NULL, lock);
109 OrthancDatabases::DatabaseManager manager4(db4.CreateDatabaseFactory()); 107 std::unique_ptr<OrthancDatabases::DatabaseManager> manager4(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db4));
110 manager4.Open();
111 } 108 }
112 109
113 110
114 int main(int argc, char **argv) 111 int main(int argc, char **argv)
115 { 112 {