3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-27 10:11:03 +08:00
Code Issues Projects Releases Wiki Activity

Revert "Fix gmock_output_test when using MSVC"

Browse Source 
This reverts commit 0a3b403fe037ff80daa1826ae99eed41e94dea05.
This commit is contained in:
Yonggang Luo 2023-02-09 15:29:01 +08:00
parent b73f27fd16
commit 097f64e986
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
googlemock/test/gmock_output_test_.cc
View File

@ -33,7 +33,6 @@
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
#include <tuple>
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
@ -255,16 +254,12 @@ TEST_F(GMockOutputTest, CatchesLeakedMocks) {
} }
MATCHER_P2(IsPair, first, second, "") { MATCHER_P2(IsPair, first, second, "") {
return Value(std::get<0>(arg), first) && Value(std::get<1>(arg), second); return Value(arg.first, first) && Value(arg.second, second);
} }
TEST_F(GMockOutputTest, PrintsMatcher) { TEST_F(GMockOutputTest, PrintsMatcher) {
const testing::Matcher<int> m1 = Ge(48); const testing::Matcher<int> m1 = Ge(48);
// Explicitly using std::tuple instead of std::pair due to differences between EXPECT_THAT((std::pair<int, bool>(42, true)), IsPair(m1, true));
// MSVC and other compilers. std::pair is printed as
// "struct std::pair<int,bool>" when using MSVC vs "std::pair<int,bool>" with
// other compilers.
EXPECT_THAT((std::tuple<int, bool>(42, true)), IsPair(m1, true));
} }
void TestCatchesLeakedMocksInAdHocTests() { void TestCatchesLeakedMocksInAdHocTests() {

4
googlemock/test/gmock_output_test_golden.txt
View File

@ -290,9 +290,9 @@ Stack trace:
[ OK ] GMockOutputTest.CatchesLeakedMocks [ OK ] GMockOutputTest.CatchesLeakedMocks
[ RUN ] GMockOutputTest.PrintsMatcher [ RUN ] GMockOutputTest.PrintsMatcher
FILE:#: Failure FILE:#: Failure
Value of: (std::tuple<int, bool>(42, true)) Value of: (std::pair<int, bool>(42, true))
Expected: is pair (first: is >= 48, second: true) Expected: is pair (first: is >= 48, second: true)
Actual: (42, true) Actual: (42, true) (of type std::pair<int, bool>)
[ FAILED ] GMockOutputTest.PrintsMatcher [ FAILED ] GMockOutputTest.PrintsMatcher
[ FAILED ] GMockOutputTest.UnexpectedCall [ FAILED ] GMockOutputTest.UnexpectedCall
[ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction [ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction