Mercurial > hg > orthanc
comparison OrthancFramework/UnitTestsSources/RestApiTests.cpp @ 4522:017ab543e6ef
added field "Timeout" in "OrthancPeers" configuration option
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 23 Feb 2021 11:28:28 +0100 |
parents | 4f8e77c650e8 |
children | 0ad5736c8d62 |
comparison
equal
deleted
inserted
replaced
4521:60e4f94ec30f | 4522:017ab543e6ef |
---|---|
566 | 566 |
567 Json::Value v2; | 567 Json::Value v2; |
568 p.Serialize(v2, false, true); | 568 p.Serialize(v2, false, true); |
569 | 569 |
570 ASSERT_EQ(Json::objectValue, v2.type()); | 570 ASSERT_EQ(Json::objectValue, v2.type()); |
571 ASSERT_EQ(3u, v2.size()); | 571 ASSERT_EQ(4u, v2.size()); |
572 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); | 572 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); |
573 ASSERT_TRUE(v2["Pkcs11"].asBool()); | 573 ASSERT_TRUE(v2["Pkcs11"].asBool()); |
574 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); | 574 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); |
575 ASSERT_EQ(0u, v2["HttpHeaders"].size()); | 575 ASSERT_EQ(0u, v2["HttpHeaders"].size()); |
576 ASSERT_EQ(0, v2["Timeout"].asInt()); | |
576 | 577 |
577 WebServiceParameters p2(v2); // Test decoding | 578 WebServiceParameters p2(v2); // Test decoding |
578 ASSERT_EQ("http://localhost:8042/", p2.GetUrl()); | 579 ASSERT_EQ("http://localhost:8042/", p2.GetUrl()); |
579 } | 580 } |
580 | 581 |
589 | 590 |
590 Json::Value v2; | 591 Json::Value v2; |
591 p.Serialize(v2, false, true); | 592 p.Serialize(v2, false, true); |
592 | 593 |
593 ASSERT_EQ(Json::objectValue, v2.type()); | 594 ASSERT_EQ(Json::objectValue, v2.type()); |
594 ASSERT_EQ(6u, v2.size()); | 595 ASSERT_EQ(7u, v2.size()); |
595 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); | 596 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); |
596 ASSERT_EQ("a", v2["CertificateFile"].asString()); | 597 ASSERT_EQ("a", v2["CertificateFile"].asString()); |
597 ASSERT_EQ("b", v2["CertificateKeyFile"].asString()); | 598 ASSERT_EQ("b", v2["CertificateKeyFile"].asString()); |
598 ASSERT_EQ("c", v2["CertificateKeyPassword"].asString()); | 599 ASSERT_EQ("c", v2["CertificateKeyPassword"].asString()); |
599 ASSERT_FALSE(v2["Pkcs11"].asBool()); | 600 ASSERT_FALSE(v2["Pkcs11"].asBool()); |
600 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); | 601 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); |
601 ASSERT_EQ(0u, v2["HttpHeaders"].size()); | 602 ASSERT_EQ(0u, v2["HttpHeaders"].size()); |
603 ASSERT_EQ(0, v2["Timeout"].asInt()); | |
602 | 604 |
603 WebServiceParameters p2(v2); // Test decoding | 605 WebServiceParameters p2(v2); // Test decoding |
604 ASSERT_EQ("http://localhost:8042/", p2.GetUrl()); | 606 ASSERT_EQ("http://localhost:8042/", p2.GetUrl()); |
605 } | 607 } |
606 | 608 |
610 | 612 |
611 WebServiceParameters p(v); | 613 WebServiceParameters p(v); |
612 ASSERT_FALSE(p.IsAdvancedFormatNeeded()); | 614 ASSERT_FALSE(p.IsAdvancedFormatNeeded()); |
613 p.AddHttpHeader("a", "b"); | 615 p.AddHttpHeader("a", "b"); |
614 p.AddHttpHeader("c", "d"); | 616 p.AddHttpHeader("c", "d"); |
617 p.SetTimeout(42); | |
615 ASSERT_TRUE(p.IsAdvancedFormatNeeded()); | 618 ASSERT_TRUE(p.IsAdvancedFormatNeeded()); |
616 | 619 |
617 Json::Value v2; | 620 Json::Value v2; |
618 p.Serialize(v2, false, true); | 621 p.Serialize(v2, false, true); |
619 WebServiceParameters p2(v2); | 622 WebServiceParameters p2(v2); |
620 | 623 |
621 ASSERT_EQ(Json::objectValue, v2.type()); | 624 ASSERT_EQ(Json::objectValue, v2.type()); |
622 ASSERT_EQ(3u, v2.size()); | 625 ASSERT_EQ(4u, v2.size()); |
623 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); | 626 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); |
624 ASSERT_FALSE(v2["Pkcs11"].asBool()); | 627 ASSERT_FALSE(v2["Pkcs11"].asBool()); |
625 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); | 628 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); |
626 ASSERT_EQ(2u, v2["HttpHeaders"].size()); | 629 ASSERT_EQ(2u, v2["HttpHeaders"].size()); |
627 ASSERT_EQ("b", v2["HttpHeaders"]["a"].asString()); | 630 ASSERT_EQ("b", v2["HttpHeaders"]["a"].asString()); |
628 ASSERT_EQ("d", v2["HttpHeaders"]["c"].asString()); | 631 ASSERT_EQ("d", v2["HttpHeaders"]["c"].asString()); |
632 ASSERT_EQ(42, v2["Timeout"].asInt()); | |
629 | 633 |
630 std::set<std::string> a; | 634 std::set<std::string> a; |
631 p2.ListHttpHeaders(a); | 635 p2.ListHttpHeaders(a); |
632 ASSERT_EQ(2u, a.size()); | 636 ASSERT_EQ(2u, a.size()); |
633 ASSERT_TRUE(a.find("a") != a.end()); | 637 ASSERT_TRUE(a.find("a") != a.end()); |