Restoring authorship annotation for <tkhanipov@yandex-team.ru>. Commit 2 of 2.

library/cpp/http/io/stream.cpp

@@ -619,10 +619,10 @@ public:
         return SupportChunkedTransfer() && IsKeepAliveEnabled() && (Request_ ? Request_->IsKeepAlive() : true);
     }
 
-    inline const TString& FirstLine() const noexcept { 
-        return FirstLine_; 
-    } 
- 
+    inline const TString& FirstLine() const noexcept {
+        return FirstLine_;
+    }
+
     inline size_t SentSize() const noexcept {
         return SizeCalculator_.Length();
     }
@@ -958,10 +958,10 @@ void THttpOutput::SendContinue() {
     Impl_->SendContinue();
 }
 
-const TString& THttpOutput::FirstLine() const noexcept { 
-    return Impl_->FirstLine(); 
-} 
- 
+const TString& THttpOutput::FirstLine() const noexcept {
+    return Impl_->FirstLine();
+}
+
 size_t THttpOutput::SentSize() const noexcept {
     return Impl_->SentSize();
 }

library/cpp/http/io/stream.h

@@ -147,12 +147,12 @@ public:
 
     void SendContinue();
 
-    /* 
-     * first line - response or request 
-     */ 
-    /// Возвращает первую строку HTTP-запроса/ответа 
-    const TString& FirstLine() const noexcept; 
- 
+    /*
+     * first line - response or request
+     */
+    /// Возвращает первую строку HTTP-запроса/ответа
+    const TString& FirstLine() const noexcept;
+
     /// Возвращает размер отправленных данных (без заголовков, с учётом сжатия, без
     /// учёта chunked transfer encoding)
     size_t SentSize() const noexcept;

library/cpp/http/io/stream_ut_medium.cpp

@@ -2,7 +2,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 #include <util/stream/zlib.h>
 
-Y_UNIT_TEST_SUITE(THttpTestMedium) { 
+Y_UNIT_TEST_SUITE(THttpTestMedium) {
     Y_UNIT_TEST(TestCodings2) {
         TStringBuf data = "aaaaaaaaaaaaaaaaaaaaaaa";
 
@@ -51,4 +51,4 @@ Y_UNIT_TEST_SUITE(THttpTestMedium) {
         }
     }
 
-} // THttpTestMedium suite 
+} // THttpTestMedium suite

library/cpp/http/io/ut/medium/ya.make

@@ -1,11 +1,11 @@
 UNITTEST_FOR(library/cpp/http/io)
 
-SIZE(MEDIUM) 
- 
+SIZE(MEDIUM)
+
 OWNER(g:util)
 
 SRCS(
-    stream_ut_medium.cpp 
+    stream_ut_medium.cpp
 )
 
 END()

library/cpp/testing/unittest/registar.h

@@ -563,68 +563,68 @@ public:                       \
 
 #define UNIT_CHECK_GENERATED_NO_EXCEPTION(A, E) UNIT_CHECK_GENERATED_NO_EXCEPTION_C(A, E, "and exception message is:\n" << CurrentExceptionMessage())
 
-// Same as UNIT_ASSERT_EXCEPTION_SATISFIES but prints additional string C when nothing was thrown 
-#define UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E, pred, C)   \ 
-    do {                                                                        \ 
-        bool _thrown = false;                                                   \ 
-        try {                                                                   \ 
-            (void)(A);                                                          \ 
-        } catch (const ::NUnitTest::TAssertException&) {                        \ 
-            throw;                                                              \ 
-        } catch (const E& e) {                                                  \ 
-            _thrown = true;                                                     \ 
-            UNIT_ASSERT_C(pred(e), "Exception does not satisfy predicate '"     \ 
-                                << #pred << "'");                               \ 
-        } catch (...) {                                                         \ 
-            _thrown = true;                                                     \ 
-            UNIT_FAIL_IMPL("exception assertion failed",                        \ 
-                           #A << " did not throw " << #E                        \ 
-                              << ", but threw other exception "                 \ 
-                              << "with message:\n"                              \ 
-                              << CurrentExceptionMessage());                    \ 
-        }                                                                       \ 
-        if (!_thrown) {                                                         \ 
-            UNIT_FAIL_IMPL("exception assertion failed",                        \ 
-                           #A << " did not throw any exception"                 \ 
-                              << " (expected " << #E << ") " << C);             \ 
-        }                                                                       \ 
+// Same as UNIT_ASSERT_EXCEPTION_SATISFIES but prints additional string C when nothing was thrown
+#define UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E, pred, C)   \
+    do {                                                                        \
+        bool _thrown = false;                                                   \
+        try {                                                                   \
+            (void)(A);                                                          \
+        } catch (const ::NUnitTest::TAssertException&) {                        \
+            throw;                                                              \
+        } catch (const E& e) {                                                  \
+            _thrown = true;                                                     \
+            UNIT_ASSERT_C(pred(e), "Exception does not satisfy predicate '"     \
+                                << #pred << "'");                               \
+        } catch (...) {                                                         \
+            _thrown = true;                                                     \
+            UNIT_FAIL_IMPL("exception assertion failed",                        \
+                           #A << " did not throw " << #E                        \
+                              << ", but threw other exception "                 \
+                              << "with message:\n"                              \
+                              << CurrentExceptionMessage());                    \
+        }                                                                       \
+        if (!_thrown) {                                                         \
+            UNIT_FAIL_IMPL("exception assertion failed",                        \
+                           #A << " did not throw any exception"                 \
+                              << " (expected " << #E << ") " << C);             \
+        }                                                                       \
     } while (false)
 
-// Assert that a specific exception is thrown and satisfies predicate pred(e), where e is the exception instance. 
-// Example: 
-//      UNIT_ASSERT_EXCEPTION_SATISFIES(MakeRequest(invalidData), TError, 
-//          [](const TError& e){ return e.Status == HTTP_BAD_REQUEST; }) 
-// This code validates that MakeRequest with invalidData throws TError with code 400. 
-#define UNIT_ASSERT_EXCEPTION_SATISFIES(A, E, pred) \ 
-    UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E, pred, "") 
- 
-// Same as UNIT_ASSERT_EXCEPTION_CONTAINS but prints additional string C when nothing was thrown 
-#define UNIT_ASSERT_EXCEPTION_CONTAINS_C(A, E, substr, C)                   \ 
-    do {                                                                    \ 
-        const TString _substr{substr};                                      \ 
-        UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E,                             \ 
-            [&_substr](const E&){                                           \ 
-                if (!_substr.empty()) {                                     \ 
-                    UNIT_ASSERT_C(CurrentExceptionMessage()                 \ 
-                                      .Contains(_substr),                   \ 
-                                  "Exception message does not contain \""   \ 
-                                      << _substr << "\".\n"                 \ 
-                                      << "Exception message: "              \ 
-                                      << CurrentExceptionMessage());        \ 
-                }                                                           \ 
-                return true;                                                \ 
-            },                                                              \ 
-            C);                                                             \ 
-    } while (false) 
- 
-// Assert that a specific exception is thrown and CurrentExceptionMessage() contains substr 
+// Assert that a specific exception is thrown and satisfies predicate pred(e), where e is the exception instance.
+// Example:
+//      UNIT_ASSERT_EXCEPTION_SATISFIES(MakeRequest(invalidData), TError,
+//          [](const TError& e){ return e.Status == HTTP_BAD_REQUEST; })
+// This code validates that MakeRequest with invalidData throws TError with code 400.
+#define UNIT_ASSERT_EXCEPTION_SATISFIES(A, E, pred) \
+    UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E, pred, "")
+
+// Same as UNIT_ASSERT_EXCEPTION_CONTAINS but prints additional string C when nothing was thrown
+#define UNIT_ASSERT_EXCEPTION_CONTAINS_C(A, E, substr, C)                   \
+    do {                                                                    \
+        const TString _substr{substr};                                      \
+        UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E,                             \
+            [&_substr](const E&){                                           \
+                if (!_substr.empty()) {                                     \
+                    UNIT_ASSERT_C(CurrentExceptionMessage()                 \
+                                      .Contains(_substr),                   \
+                                  "Exception message does not contain \""   \
+                                      << _substr << "\".\n"                 \
+                                      << "Exception message: "              \
+                                      << CurrentExceptionMessage());        \
+                }                                                           \
+                return true;                                                \
+            },                                                              \
+            C);                                                             \
+    } while (false)
+
+// Assert that a specific exception is thrown and CurrentExceptionMessage() contains substr
 #define UNIT_ASSERT_EXCEPTION_CONTAINS(A, E, substr) \
     UNIT_ASSERT_EXCEPTION_CONTAINS_C(A, E, substr, "")
 
-// Same as UNIT_ASSERT_EXCEPTION but prints additional string C when nothing was thrown 
-#define UNIT_ASSERT_EXCEPTION_C(A, E, C) UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E, [](const E&){ return true; }, C) 
+// Same as UNIT_ASSERT_EXCEPTION but prints additional string C when nothing was thrown
+#define UNIT_ASSERT_EXCEPTION_C(A, E, C) UNIT_ASSERT_EXCEPTION_SATISFIES_C(A, E, [](const E&){ return true; }, C)
 
-// Assert that a specific exception is thrown 
+// Assert that a specific exception is thrown
 #define UNIT_ASSERT_EXCEPTION(A, E) UNIT_ASSERT_EXCEPTION_C(A, E, "")
 
 #define UNIT_ASSERT_NO_EXCEPTION_RESULT_C(A, C)                 \

library/cpp/testing/unittest/registar_ut.cpp

@@ -301,15 +301,15 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
             UNIT_ASSERT_EXCEPTION_CONTAINS(Throw(), TExpectedException, substr);
         }
 
-        template <class TExpectedException, class P> 
-        void AssertExceptionSatisfies(const P& predicate) { 
-            UNIT_ASSERT_EXCEPTION_SATISFIES(Throw(), TExpectedException, predicate); 
-        } 
- 
-        int GetValue() const { 
-            return 5;           // just some value for predicate testing 
-        } 
- 
+        template <class TExpectedException, class P>
+        void AssertExceptionSatisfies(const P& predicate) {
+            UNIT_ASSERT_EXCEPTION_SATISFIES(Throw(), TExpectedException, predicate);
+        }
+
+        int GetValue() const {
+            return 5;           // just some value for predicate testing
+        }
+
         bool ThrowMe;
     };
 
@@ -362,12 +362,12 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
 
         UNIT_ASSERT_EXCEPTION_CONTAINS(TTestException("abc").Throw(), TTestException, "a");
     }
- 
-    Y_UNIT_TEST(ExceptionSatisfies) { 
-        const auto goodPredicate = [](const TTestException& e) { return e.GetValue() == 5; }; 
-        const auto badPredicate  = [](const TTestException& e) { return e.GetValue() != 5; }; 
-        UNIT_ASSERT_NO_EXCEPTION(TTestException().AssertExceptionSatisfies<TTestException>(goodPredicate)); 
-        UNIT_ASSERT_TEST_FAILS(TTestException().AssertExceptionSatisfies<TTestException>(badPredicate)); 
-        UNIT_ASSERT_TEST_FAILS(TTestException().AssertExceptionSatisfies<TOtherTestException>(goodPredicate)); 
-    } 
+
+    Y_UNIT_TEST(ExceptionSatisfies) {
+        const auto goodPredicate = [](const TTestException& e) { return e.GetValue() == 5; };
+        const auto badPredicate  = [](const TTestException& e) { return e.GetValue() != 5; };
+        UNIT_ASSERT_NO_EXCEPTION(TTestException().AssertExceptionSatisfies<TTestException>(goodPredicate));
+        UNIT_ASSERT_TEST_FAILS(TTestException().AssertExceptionSatisfies<TTestException>(badPredicate));
+        UNIT_ASSERT_TEST_FAILS(TTestException().AssertExceptionSatisfies<TOtherTestException>(goodPredicate));
+    }
 }

util/generic/yexception.h

@@ -121,23 +121,23 @@ class TFileError: public TIoSystemError {
 
 /**
  * TBadArgumentException should be thrown when an argument supplied to some function (or constructor)
- * is invalid or incorrect. 
- * 
- * \note 
- * A special case when such argument is given to a function which performs type casting 
- * (e.g. integer from string) is covered by the TBadCastException class which is derived from 
- * TBadArgumentException. 
- */ 
-struct TBadArgumentException: public virtual yexception { 
+ * is invalid or incorrect.
+ *
+ * \note
+ * A special case when such argument is given to a function which performs type casting
+ * (e.g. integer from string) is covered by the TBadCastException class which is derived from
+ * TBadArgumentException.
+ */
+struct TBadArgumentException: public virtual yexception {
 };
 
 /**
  * TBadCastException should be thrown to indicate the failure of some type casting procedure
- * (e.g. reading an integer parameter from string). 
- */ 
-struct TBadCastException: public virtual TBadArgumentException { 
-}; 
- 
+ * (e.g. reading an integer parameter from string).
+ */
+struct TBadCastException: public virtual TBadArgumentException {
+};
+
 #define ythrow throw __LOCATION__ +
 
 namespace NPrivate {