Mercurial > hg > orthanc

comparison OrthancFramework/UnitTestsSources/JobsTests.cpp @ 4656:82a314325351

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New configuration option: "DicomTlsRemoteCertificateRequired"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 May 2021 18:39:19 +0200
parents cb8fcecf1b02
children fcd2dc7c8f31
comparison
equal deleted inserted replaced
4655:9f7eef20bc7d 4656:82a314325351
1491 ASSERT_EQ("ORTHANC", v["LocalAet"].asString()); 1491 ASSERT_EQ("ORTHANC", v["LocalAet"].asString());
1492 ASSERT_EQ(DicomAssociationParameters::GetDefaultTimeout(), v["Timeout"].asUInt()); 1492 ASSERT_EQ(DicomAssociationParameters::GetDefaultTimeout(), v["Timeout"].asUInt());
1493 ASSERT_TRUE(v.isMember("Remote")); 1493 ASSERT_TRUE(v.isMember("Remote"));
1494 ASSERT_TRUE(v.isMember("MaximumPduLength")); 1494 ASSERT_TRUE(v.isMember("MaximumPduLength"));
1495 1495
1496 ASSERT_EQ(4u, v.getMemberNames().size()); 1496 ASSERT_EQ(5u, v.getMemberNames().size());
1497 1497
1498 DicomAssociationParameters b; 1498 DicomAssociationParameters b;
1499 b.UnserializeJob(v); 1499 b.UnserializeJob(v);
1500 ASSERT_EQ("ANY-SCP", b.GetRemoteModality().GetApplicationEntityTitle()); 1500 ASSERT_EQ("ANY-SCP", b.GetRemoteModality().GetApplicationEntityTitle());
1501 ASSERT_EQ("127.0.0.1", b.GetRemoteModality().GetHost()); 1501 ASSERT_EQ("127.0.0.1", b.GetRemoteModality().GetHost());
1505 ASSERT_FALSE(b.GetRemoteModality().IsDicomTlsEnabled()); 1505 ASSERT_FALSE(b.GetRemoteModality().IsDicomTlsEnabled());
1506 ASSERT_FALSE(b.GetRemoteModality().HasLocalAet()); 1506 ASSERT_FALSE(b.GetRemoteModality().HasLocalAet());
1507 ASSERT_THROW(b.GetRemoteModality().GetLocalAet(), OrthancException); 1507 ASSERT_THROW(b.GetRemoteModality().GetLocalAet(), OrthancException);
1508 ASSERT_FALSE(b.GetRemoteModality().HasTimeout()); 1508 ASSERT_FALSE(b.GetRemoteModality().HasTimeout());
1509 ASSERT_EQ(0u, b.GetRemoteModality().GetTimeout()); 1509 ASSERT_EQ(0u, b.GetRemoteModality().GetTimeout());
1510 ASSERT_TRUE(b.IsRemoteCertificateRequired());
1510 } 1511 }
1511 1512
1512 { 1513 {
1513 RemoteModalityParameters p; 1514 RemoteModalityParameters p;
1514 p.SetApplicationEntityTitle("WORLD"); 1515 p.SetApplicationEntityTitle("WORLD");
1518 p.SetTimeout(42); 1519 p.SetTimeout(42);
1519 1520
1520 DicomAssociationParameters a("HELLO", p); 1521 DicomAssociationParameters a("HELLO", p);
1521 a.SetOwnCertificatePath("key", "crt"); 1522 a.SetOwnCertificatePath("key", "crt");
1522 a.SetTrustedCertificatesPath("trusted"); 1523 a.SetTrustedCertificatesPath("trusted");
1524 a.SetRemoteCertificateRequired(false);
1523 1525
1524 ASSERT_THROW(a.SetMaximumPduLength(4095), OrthancException); 1526 ASSERT_THROW(a.SetMaximumPduLength(4095), OrthancException);
1525 ASSERT_THROW(a.SetMaximumPduLength(131073), OrthancException); 1527 ASSERT_THROW(a.SetMaximumPduLength(131073), OrthancException);
1526 a.SetMaximumPduLength(4096); 1528 a.SetMaximumPduLength(4096);
1527 a.SetMaximumPduLength(131072); 1529 a.SetMaximumPduLength(131072);
1528 1530
1529 Json::Value v = Json::objectValue; 1531 Json::Value v = Json::objectValue;
1530 a.SerializeJob(v); 1532 a.SerializeJob(v);
1531 1533
1532 ASSERT_EQ(7u, v.getMemberNames().size()); 1534 ASSERT_EQ(8u, v.getMemberNames().size());
1533 1535
1534 DicomAssociationParameters b = DicomAssociationParameters::UnserializeJob(v); 1536 DicomAssociationParameters b = DicomAssociationParameters::UnserializeJob(v);
1535 1537
1536 ASSERT_EQ("WORLD", b.GetRemoteModality().GetApplicationEntityTitle()); 1538 ASSERT_EQ("WORLD", b.GetRemoteModality().GetApplicationEntityTitle());
1537 ASSERT_EQ("hello.world.com", b.GetRemoteModality().GetHost()); 1539 ASSERT_EQ("hello.world.com", b.GetRemoteModality().GetHost());
1542 ASSERT_EQ("crt", b.GetOwnCertificatePath()); 1544 ASSERT_EQ("crt", b.GetOwnCertificatePath());
1543 ASSERT_EQ("trusted", b.GetTrustedCertificatesPath()); 1545 ASSERT_EQ("trusted", b.GetTrustedCertificatesPath());
1544 ASSERT_EQ(131072u, b.GetMaximumPduLength()); 1546 ASSERT_EQ(131072u, b.GetMaximumPduLength());
1545 ASSERT_TRUE(b.GetRemoteModality().HasTimeout()); 1547 ASSERT_TRUE(b.GetRemoteModality().HasTimeout());
1546 ASSERT_EQ(42u, b.GetRemoteModality().GetTimeout()); 1548 ASSERT_EQ(42u, b.GetRemoteModality().GetTimeout());
1549 ASSERT_FALSE(b.IsRemoteCertificateRequired());
1547 } 1550 }
1548 } 1551 }