aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/testing/unittest
diff options
context:
space:
mode:
authoryazevnul <yazevnul@yandex-team.ru>2022-02-10 16:46:46 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:46 +0300
commit8cbc307de0221f84c80c42dcbe07d40727537e2c (patch)
tree625d5a673015d1df891e051033e9fcde5c7be4e5 /library/cpp/testing/unittest
parent30d1ef3941e0dc835be7609de5ebee66958f215a (diff)
downloadydb-8cbc307de0221f84c80c42dcbe07d40727537e2c.tar.gz
Restoring authorship annotation for <yazevnul@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/testing/unittest')
-rw-r--r--library/cpp/testing/unittest/checks.cpp8
-rw-r--r--library/cpp/testing/unittest/example_ut.cpp4
-rw-r--r--library/cpp/testing/unittest/registar.cpp2
-rw-r--r--library/cpp/testing/unittest/registar.h30
-rw-r--r--library/cpp/testing/unittest/registar_ut.cpp32
-rw-r--r--library/cpp/testing/unittest/ut/main.cpp12
-rw-r--r--library/cpp/testing/unittest/utmain.cpp14
7 files changed, 51 insertions, 51 deletions
diff --git a/library/cpp/testing/unittest/checks.cpp b/library/cpp/testing/unittest/checks.cpp
index c5712ae9d2..70d6bb3410 100644
--- a/library/cpp/testing/unittest/checks.cpp
+++ b/library/cpp/testing/unittest/checks.cpp
@@ -1,5 +1,5 @@
#include <util/generic/string.h>
-#include <util/string/type.h>
+#include <util/string/type.h>
bool CheckExceptionMessage(const char* msg, TString& err) {
static const char* badMsg[] = {
@@ -10,7 +10,7 @@ bool CheckExceptionMessage(const char* msg, TString& err) {
err.clear();
- if (msg == nullptr) {
+ if (msg == nullptr) {
err = "Error message is null";
return false;
}
@@ -20,8 +20,8 @@ bool CheckExceptionMessage(const char* msg, TString& err) {
return false;
}
- for (auto& i : badMsg) {
- if (strstr(msg, i) != nullptr) {
+ for (auto& i : badMsg) {
+ if (strstr(msg, i) != nullptr) {
err = "Invalid error message: " + TString(msg);
return false;
}
diff --git a/library/cpp/testing/unittest/example_ut.cpp b/library/cpp/testing/unittest/example_ut.cpp
index bcc1ce33f0..e53d6a30fb 100644
--- a/library/cpp/testing/unittest/example_ut.cpp
+++ b/library/cpp/testing/unittest/example_ut.cpp
@@ -4,8 +4,8 @@
* just copy-paste it for good start point
*/
-Y_UNIT_TEST_SUITE(TUnitTest) {
- Y_UNIT_TEST(TestEqual) {
+Y_UNIT_TEST_SUITE(TUnitTest) {
+ Y_UNIT_TEST(TestEqual) {
UNIT_ASSERT_EQUAL(0, 0);
UNIT_ASSERT_EQUAL(1, 1);
}
diff --git a/library/cpp/testing/unittest/registar.cpp b/library/cpp/testing/unittest/registar.cpp
index 3679b768ed..945f70d1de 100644
--- a/library/cpp/testing/unittest/registar.cpp
+++ b/library/cpp/testing/unittest/registar.cpp
@@ -59,7 +59,7 @@ void ::NUnitTest::SetRaiseErrorHandler(::NUnitTest::TRaiseErrorHandler handler)
}
void ::NUnitTest::NPrivate::SetUnittestThread(bool unittestThread) {
- Y_VERIFY(UnittestThread != unittestThread, "state check");
+ Y_VERIFY(UnittestThread != unittestThread, "state check");
UnittestThread = unittestThread;
}
diff --git a/library/cpp/testing/unittest/registar.h b/library/cpp/testing/unittest/registar.h
index 44517a0092..8fb8f95e25 100644
--- a/library/cpp/testing/unittest/registar.h
+++ b/library/cpp/testing/unittest/registar.h
@@ -293,7 +293,7 @@ private: \
/* If you see this message - delete multiple UNIT_TEST(TestName) with same TestName. */ \
/* It's forbidden to declare same test twice because it breaks --fork-tests logic. */ \
int You_have_declared_test_##F##_multiple_times_This_is_forbidden; \
- Y_UNUSED(You_have_declared_test_##F##_multiple_times_This_is_forbidden);
+ Y_UNUSED(You_have_declared_test_##F##_multiple_times_This_is_forbidden);
#define UNIT_TEST_RUN(F, FF, context) \
this->BeforeTest((#F)); \
@@ -914,7 +914,7 @@ public: \
#define UNIT_TEST_SUITE_REGISTRATION(T) \
static const ::NUnitTest::TTestBaseFactory<T> Y_GENERATE_UNIQUE_ID(UTREG_);
-#define Y_UNIT_TEST_SUITE_IMPL_F(N, T, F) \
+#define Y_UNIT_TEST_SUITE_IMPL_F(N, T, F) \
namespace NTestSuite##N { \
class TCurrentTestCase: public F { \
}; \
@@ -982,12 +982,12 @@ public: \
} \
namespace NTestSuite##N
-#define Y_UNIT_TEST_SUITE_IMPL(N, T) Y_UNIT_TEST_SUITE_IMPL_F(N, T, ::NUnitTest::TBaseTestCase)
-#define Y_UNIT_TEST_SUITE(N) Y_UNIT_TEST_SUITE_IMPL(N, TTestBase)
-#define Y_UNIT_TEST_SUITE_F(N, F) Y_UNIT_TEST_SUITE_IMPL_F(N, TTestBase, F)
-#define RUSAGE_UNIT_TEST_SUITE(N) Y_UNIT_TEST_SUITE_IMPL(N, NUnitTest::TRusageTest, ::NUnitTest::TBaseTestCase)
+#define Y_UNIT_TEST_SUITE_IMPL(N, T) Y_UNIT_TEST_SUITE_IMPL_F(N, T, ::NUnitTest::TBaseTestCase)
+#define Y_UNIT_TEST_SUITE(N) Y_UNIT_TEST_SUITE_IMPL(N, TTestBase)
+#define Y_UNIT_TEST_SUITE_F(N, F) Y_UNIT_TEST_SUITE_IMPL_F(N, TTestBase, F)
+#define RUSAGE_UNIT_TEST_SUITE(N) Y_UNIT_TEST_SUITE_IMPL(N, NUnitTest::TRusageTest, ::NUnitTest::TBaseTestCase)
-#define Y_UNIT_TEST_IMPL_REGISTER(N, FF, F) \
+#define Y_UNIT_TEST_IMPL_REGISTER(N, FF, F) \
struct TTestCase##N : public F { \
TTestCase##N() \
: F() \
@@ -1007,21 +1007,21 @@ public: \
}; \
static const TTestRegistration##N testRegistration##N;
-#define Y_UNIT_TEST_IMPL(N, FF, F) \
- Y_UNIT_TEST_IMPL_REGISTER(N, FF, F) \
+#define Y_UNIT_TEST_IMPL(N, FF, F) \
+ Y_UNIT_TEST_IMPL_REGISTER(N, FF, F) \
void TTestCase##N::Execute_(NUnitTest::TTestContext& ut_context Y_DECLARE_UNUSED)
-#define Y_UNIT_TEST(N) Y_UNIT_TEST_IMPL(N, false, TCurrentTestCase)
-#define Y_UNIT_TEST_F(N, F) Y_UNIT_TEST_IMPL(N, false, F)
-#define SIMPLE_UNIT_FORKED_TEST(N) Y_UNIT_TEST_IMPL(N, true, TCurrentTestCase)
+#define Y_UNIT_TEST(N) Y_UNIT_TEST_IMPL(N, false, TCurrentTestCase)
+#define Y_UNIT_TEST_F(N, F) Y_UNIT_TEST_IMPL(N, false, F)
+#define SIMPLE_UNIT_FORKED_TEST(N) Y_UNIT_TEST_IMPL(N, true, TCurrentTestCase)
-#define Y_UNIT_TEST_SUITE_IMPLEMENTATION(N) \
+#define Y_UNIT_TEST_SUITE_IMPLEMENTATION(N) \
namespace NTestSuite##N
-#define Y_UNIT_TEST_DECLARE(N) \
+#define Y_UNIT_TEST_DECLARE(N) \
struct TTestCase##N
-#define Y_UNIT_TEST_FRIEND(N, T) \
+#define Y_UNIT_TEST_FRIEND(N, T) \
friend NTestSuite##N::TTestCase##T \
TString RandomString(size_t len, ui32 seed = 0);
diff --git a/library/cpp/testing/unittest/registar_ut.cpp b/library/cpp/testing/unittest/registar_ut.cpp
index 1f36d53abb..46b455281b 100644
--- a/library/cpp/testing/unittest/registar_ut.cpp
+++ b/library/cpp/testing/unittest/registar_ut.cpp
@@ -1,7 +1,7 @@
#include <library/cpp/testing/unittest/registar.h>
-Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
- Y_UNIT_TEST(Assert) {
+Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
+ Y_UNIT_TEST(Assert) {
auto unitAssert = [] {
UNIT_ASSERT(false);
};
@@ -10,7 +10,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT(true);
}
- Y_UNIT_TEST(TypesEqual) {
+ Y_UNIT_TEST(TypesEqual) {
auto typesEqual = [] {
UNIT_ASSERT_TYPES_EQUAL(int, long);
};
@@ -19,7 +19,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_TYPES_EQUAL(TString, TString);
}
- Y_UNIT_TEST(DoublesEqual) {
+ Y_UNIT_TEST(DoublesEqual) {
auto doublesEqual = [](double d1, double d2, double precision) {
UNIT_ASSERT_DOUBLES_EQUAL(d1, d2, precision);
};
@@ -35,7 +35,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_DOUBLES_EQUAL(nan, nan, 0.1);
}
- Y_UNIT_TEST(StringsEqual) {
+ Y_UNIT_TEST(StringsEqual) {
auto stringsEqual = [](auto s1, auto s2) {
UNIT_ASSERT_STRINGS_EQUAL(s1, s2);
};
@@ -54,7 +54,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_STRINGS_EQUAL("", static_cast<const char*>(nullptr));
}
- Y_UNIT_TEST(StringContains) {
+ Y_UNIT_TEST(StringContains) {
auto stringContains = [](auto s, auto substr) {
UNIT_ASSERT_STRING_CONTAINS(s, substr);
};
@@ -67,7 +67,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_STRING_CONTAINS("lurkmore", "more");
}
- Y_UNIT_TEST(NoDiff) {
+ Y_UNIT_TEST(NoDiff) {
auto noDiff = [](auto s1, auto s2) {
UNIT_ASSERT_NO_DIFF(s1, s2);
};
@@ -78,7 +78,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_NO_DIFF("a", "a");
}
- Y_UNIT_TEST(StringsUnequal) {
+ Y_UNIT_TEST(StringsUnequal) {
auto stringsUnequal = [](auto s1, auto s2) {
UNIT_ASSERT_STRINGS_UNEQUAL(s1, s2);
};
@@ -101,7 +101,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_STRINGS_UNEQUAL(TStringBuf("C++"), TString("python"));
}
- Y_UNIT_TEST(Equal) {
+ Y_UNIT_TEST(Equal) {
auto equal = [](auto v1, auto v2) {
UNIT_ASSERT_EQUAL(v1, v2);
};
@@ -114,7 +114,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_EQUAL(55, 55);
}
- Y_UNIT_TEST(Unequal) {
+ Y_UNIT_TEST(Unequal) {
auto unequal = [](auto v1, auto v2) {
UNIT_ASSERT_UNEQUAL(v1, v2);
};
@@ -235,7 +235,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_GE(100ul, static_cast<unsigned short>(42));
}
- Y_UNIT_TEST(ValuesEqual) {
+ Y_UNIT_TEST(ValuesEqual) {
auto valuesEqual = [](auto v1, auto v2) {
UNIT_ASSERT_VALUES_EQUAL(v1, v2);
};
@@ -246,7 +246,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_VALUES_EQUAL(1.0, 1.0);
}
- Y_UNIT_TEST(ValuesUnequal) {
+ Y_UNIT_TEST(ValuesUnequal) {
auto valuesUnequal = [](auto v1, auto v2) {
UNIT_ASSERT_VALUES_UNEQUAL(v1, v2);
};
@@ -325,7 +325,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
}
};
- Y_UNIT_TEST(Exception) {
+ Y_UNIT_TEST(Exception) {
UNIT_ASSERT_TEST_FAILS(TTestException("", false).AssertException<TTestException>());
UNIT_ASSERT_TEST_FAILS(TTestException().AssertException<TOtherTestException>());
@@ -333,7 +333,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_EXCEPTION(TTestException().Throw(), TTestException);
}
- Y_UNIT_TEST(ExceptionAssertionContainsOtherExceptionMessage) {
+ Y_UNIT_TEST(ExceptionAssertionContainsOtherExceptionMessage) {
NUnitTest::TUnitTestFailChecker checker;
{
auto guard = checker.InvokeGuard();
@@ -343,14 +343,14 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
UNIT_ASSERT_STRING_CONTAINS(checker.Msg(), "custom exception message");
}
- Y_UNIT_TEST(NoException) {
+ Y_UNIT_TEST(NoException) {
UNIT_ASSERT_TEST_FAILS(TTestException().AssertNoException());
UNIT_ASSERT_TEST_FAILS(TTestException().AssertNoExceptionRet());
UNIT_ASSERT_NO_EXCEPTION(TTestException("", false).Throw());
}
- Y_UNIT_TEST(ExceptionContains) {
+ Y_UNIT_TEST(ExceptionContains) {
UNIT_ASSERT_TEST_FAILS(TTestException("abc").AssertExceptionContains<TTestException>("cba"));
UNIT_ASSERT_TEST_FAILS(TTestException("abc").AssertExceptionContains<TTestException>(TStringBuf("cba")));
UNIT_ASSERT_TEST_FAILS(TTestException("abc").AssertExceptionContains<TTestException>(TString("cba")));
diff --git a/library/cpp/testing/unittest/ut/main.cpp b/library/cpp/testing/unittest/ut/main.cpp
index e303e21e30..13c7642dd9 100644
--- a/library/cpp/testing/unittest/ut/main.cpp
+++ b/library/cpp/testing/unittest/ut/main.cpp
@@ -61,25 +61,25 @@ TEST(ETest, Test1) {
UNIT_CHECK_GENERATED_NO_EXCEPTION(true, yexception);
}
-Y_UNIT_TEST_SUITE(TestSingleTestFixture)
+Y_UNIT_TEST_SUITE(TestSingleTestFixture)
{
- Y_UNIT_TEST_F(Test3, TSimpleFixture) {
+ Y_UNIT_TEST_F(Test3, TSimpleFixture) {
UNIT_ASSERT_EQUAL(Value, 24);
}
}
-Y_UNIT_TEST_SUITE_F(TestSuiteFixture, TSimpleFixture)
+Y_UNIT_TEST_SUITE_F(TestSuiteFixture, TSimpleFixture)
{
- Y_UNIT_TEST(Test1) {
+ Y_UNIT_TEST(Test1) {
UNIT_ASSERT(Value == 24);
Value = 25;
}
- Y_UNIT_TEST(Test2) {
+ Y_UNIT_TEST(Test2) {
UNIT_ASSERT_EQUAL(Value, 24);
}
- Y_UNIT_TEST_F(Test3, TOtherFixture) {
+ Y_UNIT_TEST_F(Test3, TOtherFixture) {
UNIT_ASSERT_EQUAL(TheAnswer, 42);
}
}
diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp
index 305bc6b40f..09605828a6 100644
--- a/library/cpp/testing/unittest/utmain.cpp
+++ b/library/cpp/testing/unittest/utmain.cpp
@@ -20,7 +20,7 @@
#include <util/network/init.h>
#include <util/stream/file.h>
-#include <util/stream/output.h>
+#include <util/stream/output.h>
#include <util/string/join.h>
#include <util/string/util.h>
@@ -502,7 +502,7 @@ private:
ythrow yexception() << "Forked test finished with unknown status";
}
case TShellCommand::SHELL_RUNNING: {
- Y_VERIFY(false, "This can't happen, we used sync mode, it's a bug!");
+ Y_VERIFY(false, "This can't happen, we used sync mode, it's a bug!");
}
case TShellCommand::SHELL_INTERNAL_ERROR: {
ythrow yexception() << "Forked test failed with internal error: " << cmd.GetInternalError();
@@ -539,7 +539,7 @@ const char* const TColoredProcessor::ForkCorrectExitMsg = "--END--";
class TEnumeratingProcessor: public ITestSuiteProcessor {
public:
- TEnumeratingProcessor(bool verbose, IOutputStream& stream) noexcept
+ TEnumeratingProcessor(bool verbose, IOutputStream& stream) noexcept
: Verbose_(verbose)
, Stream_(stream)
{
@@ -564,7 +564,7 @@ public:
private:
bool Verbose_;
- IOutputStream& Stream_;
+ IOutputStream& Stream_;
};
#ifdef _win_
@@ -600,7 +600,7 @@ private:
static const TWinEnvironment Instance;
#endif // _win_
-static int DoList(bool verbose, IOutputStream& stream) {
+static int DoList(bool verbose, IOutputStream& stream) {
TEnumeratingProcessor eproc(verbose, stream);
TTestFactory::Instance().SetProcessor(&eproc);
TTestFactory::Instance().Execute();
@@ -665,8 +665,8 @@ int NUnitTest::RunMain(int argc, char** argv) {
Y_DEFER { NPlugin::OnStopMain(argc, argv); };
TColoredProcessor processor(GetExecPath());
- IOutputStream* listStream = &Cout;
- THolder<IOutputStream> listFile;
+ IOutputStream* listStream = &Cout;
+ THolder<IOutputStream> listFile;
enum EListType {
DONT_LIST,