diff options
| author | Shahbaz Youssefi <syoussefi@google.com> | 2019-12-10 09:59:56 -0500 |
|---|---|---|
| committer | Shahbaz Youssefi <syoussefi@chromium.org> | 2019-12-16 13:01:52 -0500 |
| commit | 4b7809c2f5236b16a2e3b45e2b5ade48fb6a3c0c (patch) | |
| tree | 12c43c326e613a4d8e96fe1399521f54ae69576f /googletest/test | |
| parent | d2016469064bdb488ce271c84684518d2716fec2 (diff) | |
| download | googletest-4b7809c2f5236b16a2e3b45e2b5ade48fb6a3c0c.tar.gz googletest-4b7809c2f5236b16a2e3b45e2b5ade48fb6a3c0c.tar.bz2 googletest-4b7809c2f5236b16a2e3b45e2b5ade48fb6a3c0c.zip | |
Revert "Googletest export": Remove test for empty prefix
This reverts commit 4c25e2b87fcb78abcfdee2739db9ed7a19754cd3.
Reason for revert: Reverting the commit that disallows empty prefixes.
Original commit message:
Remove a test case rendered obsolete by disallowing empty argument for INSTANTIATE_TEST_SUITE_P.
Remove the code that it was testing.
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-output-test-golden-lin.txt | 9 | ||||
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/googletest/test/googletest-output-test-golden-lin.txt b/googletest/test/googletest-output-test-golden-lin.txt index 27f9d489..a4cade31 100644 --- a/googletest/test/googletest-output-test-golden-lin.txt +++ b/googletest/test/googletest-output-test-golden-lin.txt @@ -12,7 +12,7 @@ Expected equality of these values: 3 Stack trace: (omitted) -[0;32m[==========] [mRunning 85 tests from 40 test suites. +[0;32m[==========] [mRunning 86 tests from 41 test suites. [0;32m[----------] [mGlobal test environment set-up. FooEnvironment::SetUp() called. BarEnvironment::SetUp() called. @@ -966,6 +966,9 @@ Expected equality of these values: Stack trace: (omitted) [0;31m[ FAILED ] [mPrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 +[0;32m[----------] [m1 test from All/EmptyBasenameParamInst +[0;32m[ RUN ] [mAll/EmptyBasenameParamInst.Passes/0 +[0;32m[ OK ] [mAll/EmptyBasenameParamInst.Passes/0 [0;32m[----------] [m2 tests from PrintingStrings/ParamTest [0;32m[ RUN ] [mPrintingStrings/ParamTest.Success/a [0;32m[ OK ] [mPrintingStrings/ParamTest.Success/a @@ -998,8 +1001,8 @@ Failed Expected fatal failure. Stack trace: (omitted) -[0;32m[==========] [m85 tests from 40 test suites ran. -[0;32m[ PASSED ] [m31 tests. +[0;32m[==========] [m86 tests from 41 test suites ran. +[0;32m[ PASSED ] [m32 tests. [0;31m[ FAILED ] [m54 tests, listed below: [0;31m[ FAILED ] [mNonfatalFailureTest.EscapesStringOperands [0;31m[ FAILED ] [mNonfatalFailureTest.DiffForLongStrings diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index fe0d83f4..59b2c89b 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -96,6 +96,14 @@ INSTANTIATE_TEST_SUITE_P(PrintingFailingParams, FailingParamTest, testing::Values(2)); +// Tests that an empty value for the test suite basename yields just +// the test name without any prior / +class EmptyBasenameParamInst : public testing::TestWithParam<int> {}; + +TEST_P(EmptyBasenameParamInst, Passes) { EXPECT_EQ(1, GetParam()); } + +INSTANTIATE_TEST_SUITE_P(All, EmptyBasenameParamInst, testing::Values(1)); + static const char kGoldenString[] = "\"Line\0 1\"\nLine 2"; TEST(NonfatalFailureTest, EscapesStringOperands) { |