comparison OrthancFramework/UnitTestsSources/RestApiTests.cpp @ 4204:318c16cfccab

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Sep 2020 16:18:01 +0200
parents 32ac045109a6
children b96aedfa8cc1
comparison
equal deleted inserted replaced
4203:4d42408da117 4204:318c16cfccab
531 Json::Value v2; 531 Json::Value v2;
532 p.Serialize(v2, false, true); 532 p.Serialize(v2, false, true);
533 ASSERT_EQ(v, v2); 533 ASSERT_EQ(v, v2);
534 534
535 p.Serialize(v2, false, false /* no password */); 535 p.Serialize(v2, false, false /* no password */);
536 WebServiceParameters p2(v2);
537 ASSERT_EQ(Json::arrayValue, v2.type()); 536 ASSERT_EQ(Json::arrayValue, v2.type());
538 ASSERT_EQ(3u, v2.size()); 537 ASSERT_EQ(3u, v2.size());
539 ASSERT_EQ("http://localhost:8042/", v2[0u].asString()); 538 ASSERT_EQ("http://localhost:8042/", v2[0u].asString());
540 ASSERT_EQ("user", v2[1u].asString()); 539 ASSERT_EQ("user", v2[1u].asString());
541 ASSERT_TRUE(v2[2u].asString().empty()); 540 ASSERT_TRUE(v2[2u].asString().empty());
541
542 WebServiceParameters p2(v2); // Test decoding
543 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
542 } 544 }
543 545
544 { 546 {
545 Json::Value v = Json::arrayValue; 547 Json::Value v = Json::arrayValue;
546 v.append("http://localhost:8042/"); 548 v.append("http://localhost:8042/");
550 p.SetPkcs11Enabled(true); 552 p.SetPkcs11Enabled(true);
551 ASSERT_TRUE(p.IsAdvancedFormatNeeded()); 553 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
552 554
553 Json::Value v2; 555 Json::Value v2;
554 p.Serialize(v2, false, true); 556 p.Serialize(v2, false, true);
555 WebServiceParameters p2(v2);
556 557
557 ASSERT_EQ(Json::objectValue, v2.type()); 558 ASSERT_EQ(Json::objectValue, v2.type());
558 ASSERT_EQ(3u, v2.size()); 559 ASSERT_EQ(3u, v2.size());
559 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); 560 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString());
560 ASSERT_TRUE(v2["Pkcs11"].asBool()); 561 ASSERT_TRUE(v2["Pkcs11"].asBool());
561 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); 562 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type());
562 ASSERT_EQ(0u, v2["HttpHeaders"].size()); 563 ASSERT_EQ(0u, v2["HttpHeaders"].size());
564
565 WebServiceParameters p2(v2); // Test decoding
566 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
563 } 567 }
564 568
565 { 569 {
566 Json::Value v = Json::arrayValue; 570 Json::Value v = Json::arrayValue;
567 v.append("http://localhost:8042/"); 571 v.append("http://localhost:8042/");
571 p.SetClientCertificate("a", "b", "c"); 575 p.SetClientCertificate("a", "b", "c");
572 ASSERT_TRUE(p.IsAdvancedFormatNeeded()); 576 ASSERT_TRUE(p.IsAdvancedFormatNeeded());
573 577
574 Json::Value v2; 578 Json::Value v2;
575 p.Serialize(v2, false, true); 579 p.Serialize(v2, false, true);
576 WebServiceParameters p2(v2);
577 580
578 ASSERT_EQ(Json::objectValue, v2.type()); 581 ASSERT_EQ(Json::objectValue, v2.type());
579 ASSERT_EQ(6u, v2.size()); 582 ASSERT_EQ(6u, v2.size());
580 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString()); 583 ASSERT_EQ("http://localhost:8042/", v2["Url"].asString());
581 ASSERT_EQ("a", v2["CertificateFile"].asString()); 584 ASSERT_EQ("a", v2["CertificateFile"].asString());
582 ASSERT_EQ("b", v2["CertificateKeyFile"].asString()); 585 ASSERT_EQ("b", v2["CertificateKeyFile"].asString());
583 ASSERT_EQ("c", v2["CertificateKeyPassword"].asString()); 586 ASSERT_EQ("c", v2["CertificateKeyPassword"].asString());
584 ASSERT_FALSE(v2["Pkcs11"].asBool()); 587 ASSERT_FALSE(v2["Pkcs11"].asBool());
585 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type()); 588 ASSERT_EQ(Json::objectValue, v2["HttpHeaders"].type());
586 ASSERT_EQ(0u, v2["HttpHeaders"].size()); 589 ASSERT_EQ(0u, v2["HttpHeaders"].size());
590
591 WebServiceParameters p2(v2); // Test decoding
592 ASSERT_EQ("http://localhost:8042/", p2.GetUrl());
587 } 593 }
588 594
589 { 595 {
590 Json::Value v = Json::arrayValue; 596 Json::Value v = Json::arrayValue;
591 v.append("http://localhost:8042/"); 597 v.append("http://localhost:8042/");
979 chunkSize_(chunkSize), 985 chunkSize_(chunkSize),
980 pos_(0) 986 pos_(0)
981 { 987 {
982 } 988 }
983 989
984 virtual bool ReadNextChunk(std::string& chunk) 990 virtual bool ReadNextChunk(std::string& chunk) ORTHANC_OVERRIDE
985 { 991 {
986 if (pos_ == size_) 992 if (pos_ == size_)
987 { 993 {
988 return false; 994 return false;
989 } 995 }
1016 RequestOrigin origin, 1022 RequestOrigin origin,
1017 const char* remoteIp, 1023 const char* remoteIp,
1018 const char* username, 1024 const char* username,
1019 HttpMethod method, 1025 HttpMethod method,
1020 const UriComponents& uri, 1026 const UriComponents& uri,
1021 const Arguments& headers) 1027 const Arguments& headers) ORTHANC_OVERRIDE
1022 { 1028 {
1023 return false; 1029 return false;
1024 } 1030 }
1025 1031
1026 virtual bool Handle(HttpOutput& output, 1032 virtual bool Handle(HttpOutput& output,
1030 HttpMethod method, 1036 HttpMethod method,
1031 const UriComponents& uri, 1037 const UriComponents& uri,
1032 const Arguments& headers, 1038 const Arguments& headers,
1033 const GetArguments& getArguments, 1039 const GetArguments& getArguments,
1034 const void* bodyData, 1040 const void* bodyData,
1035 size_t bodySize) 1041 size_t bodySize) ORTHANC_OVERRIDE
1036 { 1042 {
1037 printf("received %d\n", static_cast<int>(bodySize)); 1043 printf("received %d\n", static_cast<int>(bodySize));
1038 1044
1039 const uint8_t* b = reinterpret_cast<const uint8_t*>(bodyData); 1045 const uint8_t* b = reinterpret_cast<const uint8_t*>(bodyData);
1040 1046