intermediate changes

ref:d5f945ecdc1f5af1ad57e12787c6b8ed1a9f0f12

1 files changed, 21 insertions, 21 deletions

diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/library/cpp/http/misc/httpreqdata_ut.cpp
index e7f16ef27c..3e13046fd0 100644
--- a/library/cpp/http/misc/httpreqdata_ut.cpp
+++ b/library/cpp/http/misc/httpreqdata_ut.cpp
@@ -13,8 +13,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
 
         sd.AddHeader("x-XxX", "y-yyy");
         UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 2);
-        UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-XX")), TStringBuf("y-yy"));
-        UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-XXX")), TStringBuf("y-yyy"));
+        UNIT_ASSERT_VALUES_EQUAL(sd.HeaderInOrEmpty("X-XX"), TStringBuf("y-yy"));
+        UNIT_ASSERT_VALUES_EQUAL(sd.HeaderInOrEmpty("X-XXX"), TStringBuf("y-yyy"));
     }
 
     Y_UNIT_TEST(ComplexHeaders) {
@@ -23,21 +23,21 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
 
         sd.AddHeader("x-Xx", "y-yy");
         UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 1);
-        UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-XX")), TStringBuf("y-yy"));
+        UNIT_ASSERT_VALUES_EQUAL(sd.HeaderInOrEmpty("X-XX"), TStringBuf("y-yy"));
 
         sd.AddHeader("x-Xz", "y-yy");
         UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 2);
-        UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("X-Xz")), TStringBuf("y-yy"));
+        UNIT_ASSERT_VALUES_EQUAL(sd.HeaderInOrEmpty("X-Xz"), TStringBuf("y-yy"));
 
         UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "zzz");
         UNIT_ASSERT_VALUES_EQUAL(sd.ServerPort(), "1");
         sd.AddHeader("Host", "1234");
         UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 3);
-        UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("Host")), TStringBuf("1234"));
+        UNIT_ASSERT_VALUES_EQUAL(sd.HeaderInOrEmpty("Host"), TStringBuf("1234"));
         UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "1234");
         sd.AddHeader("Host", "12345:678");
         UNIT_ASSERT_VALUES_EQUAL(sd.HeadersCount(), 3);
-        UNIT_ASSERT_VALUES_EQUAL(TStringBuf(sd.HeaderIn("Host")), TStringBuf("12345:678"));
+        UNIT_ASSERT_VALUES_EQUAL(sd.HeaderInOrEmpty("Host"), TStringBuf("12345:678"));
         UNIT_ASSERT_VALUES_EQUAL(sd.ServerName(), "12345");
         UNIT_ASSERT_VALUES_EQUAL(sd.ServerPort(), "678");
     }
@@ -51,8 +51,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
         // This should work
         UNIT_ASSERT(rd.Parse(" /yandsearch?&gta=fake&haha=da HTTP 1.1 OK"));
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), "&gta=fake&haha=da");
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf());
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), "&gta=fake&haha=da");
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), rd.OrigQuery());
 
         rd.Scan();
         UNIT_ASSERT(rd.CgiParam.Has("gta", "fake"));
@@ -66,8 +66,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
         const TString qs("gta=fake&haha=da");
         TServerRequestData rd(qs.c_str());
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs);
-        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), qs);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQuery(), qs);
 
         UNIT_ASSERT(rd.CgiParam.Has("gta"));
         UNIT_ASSERT(rd.CgiParam.Has("haha"));
@@ -81,8 +81,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
         TServerRequestData rd;
         rd.Parse(header.c_str());
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs);
-        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), qs);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQuery(), qs);
 
         rd.Scan();
         UNIT_ASSERT(rd.CgiParam.Has("gta"));
@@ -94,8 +94,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
         TServerRequestData rd;
         rd.Parse(" /y#ndsearch?&gta=fake&haha=da&uberParam=yes&q=? HTTP 1.1 OK");
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), "");
-        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), "");
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), "");
+        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQuery(), "");
 
         rd.Scan();
         UNIT_ASSERT(rd.CgiParam.empty());
@@ -105,8 +105,8 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
         TServerRequestData rd;
         rd.Parse(" /yandsearch?#");
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), "");
-        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), "");
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), "");
+        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQuery(), "");
 
         rd.Scan();
         UNIT_ASSERT(rd.CgiParam.empty());
@@ -119,14 +119,14 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
         UNIT_ASSERT(rd.CgiParam.Has("gta", "fake"));
         UNIT_ASSERT(rd.CgiParam.Has("haha", "da"));
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs);
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf());
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), qs);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), rd.OrigQuery());
 
         constexpr TStringBuf appendix = "gta=true&gta=new";
-        rd.AppendQueryString(appendix.data(), appendix.size());
+        rd.AppendQueryString(appendix);
 
-        UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs + '&' + appendix);
-        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.Query(), qs + '&' + appendix);
+        UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQuery(), qs);
 
         rd.Scan();