Mercurial > hg > orthanc-databases
diff PostgreSQL/UnitTests/PostgreSQLTests.cpp @ 225:94c9908e6aca
removed DatabaseManager member out of class IndexBackend
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 01 Apr 2021 19:18:19 +0200 |
parents | 73cc85f3d9c1 |
children | a4918d57435c |
line wrap: on
line diff
--- a/PostgreSQL/UnitTests/PostgreSQLTests.cpp Thu Apr 01 16:09:59 2021 +0200 +++ b/PostgreSQL/UnitTests/PostgreSQLTests.cpp Thu Apr 01 19:18:19 2021 +0200 @@ -455,32 +455,34 @@ { OrthancDatabases::PostgreSQLIndex db(NULL, globalParameters_); db.SetClearAll(true); - db.Open(); + + OrthancDatabases::DatabaseManager manager(db.CreateDatabaseFactory()); + manager.Open(); std::string s; - ASSERT_TRUE(db.LookupGlobalProperty(s, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal1)); + ASSERT_TRUE(db.LookupGlobalProperty(s, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal1)); ASSERT_EQ("2", s); OrthancPluginCreateInstanceResult r1, r2; memset(&r1, 0, sizeof(r1)); - db.CreateInstance(r1, "a", "b", "c", "d"); + db.CreateInstance(r1, manager, "a", "b", "c", "d"); ASSERT_TRUE(r1.isNewInstance); ASSERT_TRUE(r1.isNewSeries); ASSERT_TRUE(r1.isNewStudy); ASSERT_TRUE(r1.isNewPatient); memset(&r2, 0, sizeof(r2)); - db.CreateInstance(r2, "a", "b", "c", "d"); + db.CreateInstance(r2, manager, "a", "b", "c", "d"); ASSERT_FALSE(r2.isNewInstance); ASSERT_EQ(r1.instanceId, r2.instanceId); // Breaking the hierarchy memset(&r2, 0, sizeof(r2)); - ASSERT_THROW(db.CreateInstance(r2, "a", "e", "c", "f"), Orthanc::OrthancException); + ASSERT_THROW(db.CreateInstance(r2, manager, "a", "e", "c", "f"), Orthanc::OrthancException); memset(&r2, 0, sizeof(r2)); - db.CreateInstance(r2, "a", "b", "c", "e"); + db.CreateInstance(r2, manager, "a", "b", "c", "e"); ASSERT_TRUE(r2.isNewInstance); ASSERT_FALSE(r2.isNewSeries); ASSERT_FALSE(r2.isNewStudy); @@ -491,7 +493,7 @@ ASSERT_NE(r1.instanceId, r2.instanceId); memset(&r2, 0, sizeof(r2)); - db.CreateInstance(r2, "a", "b", "f", "g"); + db.CreateInstance(r2, manager, "a", "b", "f", "g"); ASSERT_TRUE(r2.isNewInstance); ASSERT_TRUE(r2.isNewSeries); ASSERT_FALSE(r2.isNewStudy); @@ -502,7 +504,7 @@ ASSERT_NE(r1.instanceId, r2.instanceId); memset(&r2, 0, sizeof(r2)); - db.CreateInstance(r2, "a", "h", "i", "j"); + db.CreateInstance(r2, manager, "a", "h", "i", "j"); ASSERT_TRUE(r2.isNewInstance); ASSERT_TRUE(r2.isNewSeries); ASSERT_TRUE(r2.isNewStudy); @@ -513,7 +515,7 @@ ASSERT_NE(r1.instanceId, r2.instanceId); memset(&r2, 0, sizeof(r2)); - db.CreateInstance(r2, "k", "l", "m", "n"); + db.CreateInstance(r2, manager, "k", "l", "m", "n"); ASSERT_TRUE(r2.isNewInstance); ASSERT_TRUE(r2.isNewSeries); ASSERT_TRUE(r2.isNewStudy);