diff options
| author | David Schuldenfrei <david.schuldenfrei@gmail.com> | 2018-08-27 15:55:01 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-27 16:22:33 (GMT) |
| commit | 603ce4b81df48a268b84d0e4f2b999b89b903250 (patch) | |
| tree | b1ae525fe5312513b29883ad4ae8c6ed2f3e6e27 /googletest/test/gtest_unittest.cc | |
| parent | a0e62d9f1a5f24cbc9d16bb9d1c4b606e960b2af (diff) | |
| download | googletest-603ce4b81df48a268b84d0e4f2b999b89b903250.zip googletest-603ce4b81df48a268b84d0e4f2b999b89b903250.tar.gz googletest-603ce4b81df48a268b84d0e4f2b999b89b903250.tar.bz2 | |
Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7f42e8ae66ea365b5b8508fecb31509
Closes #1658
Review and changes, mister@google.com
PiperOrigin-RevId: 210374286
Diffstat (limited to 'googletest/test/gtest_unittest.cc')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index e1c30f3..f7213fb 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2090,8 +2090,8 @@ TEST_F(UnitTestRecordPropertyTest, AddRecordWithReservedKeysGeneratesCorrectPropertyList) { EXPECT_NONFATAL_FAILURE( Test::RecordProperty("name", "1"), - "'classname', 'name', 'status', 'time', 'type_param', and 'value_param'" - " are reserved"); + "'classname', 'name', 'status', 'time', 'type_param', 'value_param'," + " 'file', and 'line' are reserved"); } class UnitTestRecordPropertyTestEnvironment : public Environment { |