Mercurial > hg > orthanc
diff OrthancFramework/UnitTestsSources/FrameworkTests.cpp @ 4330:a01b1c9cbef4
moving generic type definitions from IHttpHandler to HttpToolbox
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 25 Nov 2020 14:39:10 +0100 |
parents | 9684a690ca63 |
children | 52166629239f |
line wrap: on
line diff
--- a/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Wed Nov 25 13:46:49 2020 +0100 +++ b/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Wed Nov 25 14:39:10 2020 +0100 @@ -34,13 +34,13 @@ #include <gtest/gtest.h> #include "../Sources/DicomFormat/DicomTag.h" +#include "../Sources/HttpServer/HttpToolbox.h" #include "../Sources/Logging.h" #include "../Sources/OrthancException.h" #include "../Sources/Toolbox.h" #if ORTHANC_SANDBOXED != 1 # include "../Sources/FileBuffer.h" -# include "../Sources/HttpServer/HttpToolbox.h" # include "../Sources/MetricsRegistry.h" # include "../Sources/SystemToolbox.h" # include "../Sources/TemporaryFile.h" @@ -101,13 +101,12 @@ } -#if ORTHANC_SANDBOXED != 1 TEST(ParseGetArguments, Basic) { - IHttpHandler::GetArguments b; + HttpToolbox::GetArguments b; HttpToolbox::ParseGetArguments(b, "aaa=baaa&bb=a&aa=c"); - IHttpHandler::Arguments a; + HttpToolbox::Arguments a; HttpToolbox::CompileGetArguments(a, b); ASSERT_EQ(3u, a.size()); @@ -115,15 +114,14 @@ ASSERT_EQ(a["bb"], "a"); ASSERT_EQ(a["aa"], "c"); } -#endif -#if ORTHANC_SANDBOXED != 1 + TEST(ParseGetArguments, BasicEmpty) { - IHttpHandler::GetArguments b; + HttpToolbox::GetArguments b; HttpToolbox::ParseGetArguments(b, "aaa&bb=aa&aa"); - IHttpHandler::Arguments a; + HttpToolbox::Arguments a; HttpToolbox::CompileGetArguments(a, b); ASSERT_EQ(3u, a.size()); @@ -131,44 +129,41 @@ ASSERT_EQ(a["bb"], "aa"); ASSERT_EQ(a["aa"], ""); } -#endif -#if ORTHANC_SANDBOXED != 1 + TEST(ParseGetArguments, Single) { - IHttpHandler::GetArguments b; + HttpToolbox::GetArguments b; HttpToolbox::ParseGetArguments(b, "aaa=baaa"); - IHttpHandler::Arguments a; + HttpToolbox::Arguments a; HttpToolbox::CompileGetArguments(a, b); ASSERT_EQ(1u, a.size()); ASSERT_EQ(a["aaa"], "baaa"); } -#endif -#if ORTHANC_SANDBOXED != 1 + TEST(ParseGetArguments, SingleEmpty) { - IHttpHandler::GetArguments b; + HttpToolbox::GetArguments b; HttpToolbox::ParseGetArguments(b, "aaa"); - IHttpHandler::Arguments a; + HttpToolbox::Arguments a; HttpToolbox::CompileGetArguments(a, b); ASSERT_EQ(1u, a.size()); ASSERT_EQ(a["aaa"], ""); } -#endif -#if ORTHANC_SANDBOXED != 1 + TEST(ParseGetQuery, Test1) { UriComponents uri; - IHttpHandler::GetArguments b; + HttpToolbox::GetArguments b; HttpToolbox::ParseGetQuery(uri, b, "/instances/test/world?aaa=baaa&bb=a&aa=c"); - IHttpHandler::Arguments a; + HttpToolbox::Arguments a; HttpToolbox::CompileGetArguments(a, b); ASSERT_EQ(3u, uri.size()); @@ -180,16 +175,15 @@ ASSERT_EQ(a["bb"], "a"); ASSERT_EQ(a["aa"], "c"); } -#endif -#if ORTHANC_SANDBOXED != 1 + TEST(ParseGetQuery, Test2) { UriComponents uri; - IHttpHandler::GetArguments b; + HttpToolbox::GetArguments b; HttpToolbox::ParseGetQuery(uri, b, "/instances/test/world"); - IHttpHandler::Arguments a; + HttpToolbox::Arguments a; HttpToolbox::CompileGetArguments(a, b); ASSERT_EQ(3u, uri.size()); @@ -198,7 +192,7 @@ ASSERT_EQ("world", uri[2]); ASSERT_EQ(0u, a.size()); } -#endif + TEST(Uri, SplitUriComponents) {