Mercurial > hg > orthanc-databases

comparison PostgreSQL/UnitTests/PostgreSQLTests.cpp @ 225:94c9908e6aca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
224:61c309e06797 225:94c9908e6aca
453 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1 453 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
454 TEST(PostgreSQLIndex, CreateInstance) 454 TEST(PostgreSQLIndex, CreateInstance)
455 { 455 {
456 OrthancDatabases::PostgreSQLIndex db(NULL, globalParameters_); 456 OrthancDatabases::PostgreSQLIndex db(NULL, globalParameters_);
457 db.SetClearAll(true); 457 db.SetClearAll(true);
458 db.Open(); 458
459 OrthancDatabases::DatabaseManager manager(db.CreateDatabaseFactory());
460 manager.Open();
459 461
460 std::string s; 462 std::string s;
461 ASSERT_TRUE(db.LookupGlobalProperty(s, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal1)); 463 ASSERT_TRUE(db.LookupGlobalProperty(s, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal1));
462 ASSERT_EQ("2", s); 464 ASSERT_EQ("2", s);
463 465
464 OrthancPluginCreateInstanceResult r1, r2; 466 OrthancPluginCreateInstanceResult r1, r2;
465 467
466 memset(&r1, 0, sizeof(r1)); 468 memset(&r1, 0, sizeof(r1));
467 db.CreateInstance(r1, "a", "b", "c", "d"); 469 db.CreateInstance(r1, manager, "a", "b", "c", "d");
468 ASSERT_TRUE(r1.isNewInstance); 470 ASSERT_TRUE(r1.isNewInstance);
469 ASSERT_TRUE(r1.isNewSeries); 471 ASSERT_TRUE(r1.isNewSeries);
470 ASSERT_TRUE(r1.isNewStudy); 472 ASSERT_TRUE(r1.isNewStudy);
471 ASSERT_TRUE(r1.isNewPatient); 473 ASSERT_TRUE(r1.isNewPatient);
472 474
473 memset(&r2, 0, sizeof(r2)); 475 memset(&r2, 0, sizeof(r2));
474 db.CreateInstance(r2, "a", "b", "c", "d"); 476 db.CreateInstance(r2, manager, "a", "b", "c", "d");
475 ASSERT_FALSE(r2.isNewInstance); 477 ASSERT_FALSE(r2.isNewInstance);
476 ASSERT_EQ(r1.instanceId, r2.instanceId); 478 ASSERT_EQ(r1.instanceId, r2.instanceId);
477 479
478 // Breaking the hierarchy 480 // Breaking the hierarchy
479 memset(&r2, 0, sizeof(r2)); 481 memset(&r2, 0, sizeof(r2));
480 ASSERT_THROW(db.CreateInstance(r2, "a", "e", "c", "f"), Orthanc::OrthancException); 482 ASSERT_THROW(db.CreateInstance(r2, manager, "a", "e", "c", "f"), Orthanc::OrthancException);
481 483
482 memset(&r2, 0, sizeof(r2)); 484 memset(&r2, 0, sizeof(r2));
483 db.CreateInstance(r2, "a", "b", "c", "e"); 485 db.CreateInstance(r2, manager, "a", "b", "c", "e");
484 ASSERT_TRUE(r2.isNewInstance); 486 ASSERT_TRUE(r2.isNewInstance);
485 ASSERT_FALSE(r2.isNewSeries); 487 ASSERT_FALSE(r2.isNewSeries);
486 ASSERT_FALSE(r2.isNewStudy); 488 ASSERT_FALSE(r2.isNewStudy);
487 ASSERT_FALSE(r2.isNewPatient); 489 ASSERT_FALSE(r2.isNewPatient);
488 ASSERT_EQ(r1.patientId, r2.patientId); 490 ASSERT_EQ(r1.patientId, r2.patientId);
489 ASSERT_EQ(r1.studyId, r2.studyId); 491 ASSERT_EQ(r1.studyId, r2.studyId);
490 ASSERT_EQ(r1.seriesId, r2.seriesId); 492 ASSERT_EQ(r1.seriesId, r2.seriesId);
491 ASSERT_NE(r1.instanceId, r2.instanceId); 493 ASSERT_NE(r1.instanceId, r2.instanceId);
492 494
493 memset(&r2, 0, sizeof(r2)); 495 memset(&r2, 0, sizeof(r2));
494 db.CreateInstance(r2, "a", "b", "f", "g"); 496 db.CreateInstance(r2, manager, "a", "b", "f", "g");
495 ASSERT_TRUE(r2.isNewInstance); 497 ASSERT_TRUE(r2.isNewInstance);
496 ASSERT_TRUE(r2.isNewSeries); 498 ASSERT_TRUE(r2.isNewSeries);
497 ASSERT_FALSE(r2.isNewStudy); 499 ASSERT_FALSE(r2.isNewStudy);
498 ASSERT_FALSE(r2.isNewPatient); 500 ASSERT_FALSE(r2.isNewPatient);
499 ASSERT_EQ(r1.patientId, r2.patientId); 501 ASSERT_EQ(r1.patientId, r2.patientId);
500 ASSERT_EQ(r1.studyId, r2.studyId); 502 ASSERT_EQ(r1.studyId, r2.studyId);
501 ASSERT_NE(r1.seriesId, r2.seriesId); 503 ASSERT_NE(r1.seriesId, r2.seriesId);
502 ASSERT_NE(r1.instanceId, r2.instanceId); 504 ASSERT_NE(r1.instanceId, r2.instanceId);
503 505
504 memset(&r2, 0, sizeof(r2)); 506 memset(&r2, 0, sizeof(r2));
505 db.CreateInstance(r2, "a", "h", "i", "j"); 507 db.CreateInstance(r2, manager, "a", "h", "i", "j");
506 ASSERT_TRUE(r2.isNewInstance); 508 ASSERT_TRUE(r2.isNewInstance);
507 ASSERT_TRUE(r2.isNewSeries); 509 ASSERT_TRUE(r2.isNewSeries);
508 ASSERT_TRUE(r2.isNewStudy); 510 ASSERT_TRUE(r2.isNewStudy);
509 ASSERT_FALSE(r2.isNewPatient); 511 ASSERT_FALSE(r2.isNewPatient);
510 ASSERT_EQ(r1.patientId, r2.patientId); 512 ASSERT_EQ(r1.patientId, r2.patientId);
511 ASSERT_NE(r1.studyId, r2.studyId); 513 ASSERT_NE(r1.studyId, r2.studyId);
512 ASSERT_NE(r1.seriesId, r2.seriesId); 514 ASSERT_NE(r1.seriesId, r2.seriesId);
513 ASSERT_NE(r1.instanceId, r2.instanceId); 515 ASSERT_NE(r1.instanceId, r2.instanceId);
514 516
515 memset(&r2, 0, sizeof(r2)); 517 memset(&r2, 0, sizeof(r2));
516 db.CreateInstance(r2, "k", "l", "m", "n"); 518 db.CreateInstance(r2, manager, "k", "l", "m", "n");
517 ASSERT_TRUE(r2.isNewInstance); 519 ASSERT_TRUE(r2.isNewInstance);
518 ASSERT_TRUE(r2.isNewSeries); 520 ASSERT_TRUE(r2.isNewSeries);
519 ASSERT_TRUE(r2.isNewStudy); 521 ASSERT_TRUE(r2.isNewStudy);
520 ASSERT_TRUE(r2.isNewPatient); 522 ASSERT_TRUE(r2.isNewPatient);
521 ASSERT_NE(r1.patientId, r2.patientId); 523 ASSERT_NE(r1.patientId, r2.patientId);