Mercurial > hg > orthanc-databases
comparison MySQL/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 | 675f8322eb7c |
comparison
equal
deleted
inserted
replaced
225:94c9908e6aca | 226:a4918d57435c |
---|---|
48 lock.SetLock(true); | 48 lock.SetLock(true); |
49 | 49 |
50 OrthancDatabases::MySQLIndex db1(NULL, noLock); | 50 OrthancDatabases::MySQLIndex db1(NULL, noLock); |
51 db1.SetClearAll(true); | 51 db1.SetClearAll(true); |
52 | 52 |
53 OrthancDatabases::DatabaseManager manager1(db1.CreateDatabaseFactory()); | 53 std::unique_ptr<OrthancDatabases::DatabaseManager> manager1(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db1)); |
54 manager1.Open(); | |
55 | 54 |
56 { | 55 { |
57 OrthancDatabases::MySQLIndex db2(NULL, lock); | 56 OrthancDatabases::MySQLIndex db2(NULL, lock); |
58 OrthancDatabases::DatabaseManager manager2(db2.CreateDatabaseFactory()); | 57 std::unique_ptr<OrthancDatabases::DatabaseManager> manager2(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db2)); |
59 manager2.Open(); | |
60 | 58 |
61 OrthancDatabases::MySQLIndex db3(NULL, lock); | 59 OrthancDatabases::MySQLIndex db3(NULL, lock); |
62 OrthancDatabases::DatabaseManager manager3(db3.CreateDatabaseFactory()); | 60 ASSERT_THROW(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db3), Orthanc::OrthancException); |
63 ASSERT_THROW(manager3.Open(), Orthanc::OrthancException); | 61 |
64 } | 62 } |
65 | 63 |
66 OrthancDatabases::MySQLIndex db4(NULL, lock); | 64 OrthancDatabases::MySQLIndex db4(NULL, lock); |
67 OrthancDatabases::DatabaseManager manager4(db4.CreateDatabaseFactory()); | 65 std::unique_ptr<OrthancDatabases::DatabaseManager> manager4(OrthancDatabases::IndexBackend::CreateSingleDatabaseManager(db4)); |
68 manager4.Open(); | |
69 } | 66 } |
70 | 67 |
71 | 68 |
72 TEST(MySQL, Lock2) | 69 TEST(MySQL, Lock2) |
73 { | 70 { |
149 } | 146 } |
150 | 147 |
151 | 148 |
152 TEST(MySQL, StorageArea) | 149 TEST(MySQL, StorageArea) |
153 { | 150 { |
154 OrthancDatabases::MySQLStorageArea storageArea(globalParameters_); | 151 OrthancDatabases::MySQLStorageArea storageArea(globalParameters_, true); |
155 storageArea.SetClearAll(true); | |
156 | 152 |
157 { | 153 { |
158 OrthancDatabases::DatabaseManager::Transaction transaction(storageArea.GetManager(), OrthancDatabases::TransactionType_ReadWrite); | 154 OrthancDatabases::DatabaseManager::Transaction transaction(storageArea.GetManager(), OrthancDatabases::TransactionType_ReadWrite); |
159 OrthancDatabases::MySQLDatabase& db = | 155 OrthancDatabases::MySQLDatabase& db = |
160 dynamic_cast<OrthancDatabases::MySQLDatabase&>(transaction.GetDatabase()); | 156 dynamic_cast<OrthancDatabases::MySQLDatabase&>(transaction.GetDatabase()); |