gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-10 15:57:16 -04:00
parent d0de1180e4
commit e1071eb949
10 changed files with 346 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
googlemock/test/gmock-actions_test.cc
View File

@@ -33,6 +33,15 @@
//
// This file tests the built-in actions.
// Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(push)
# pragma warning(disable:4800)
#endif
#endif
#include "gmock/gmock-actions.h"
#include <algorithm>
#include <iterator>
@@ -1556,3 +1565,10 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
#endif // GTEST_LANG_CXX11
} // Unnamed namespace
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif

11
googlemock/test/gmock-generated-actions_test.cc
View File

@@ -374,10 +374,9 @@ class SubstractAction : public ActionInterface<int(int, int)> { // NOLINT
};
TEST(WithArgsTest, NonInvokeAction) {
Action<int(const string&, int, int)> a = // NOLINT
Action<int(const std::string&, int, int)> a = // NOLINT
WithArgs<2, 1>(MakeAction(new SubstractAction));
string s("hello");
EXPECT_EQ(8, a.Perform(tuple<const string&, int, int>(s, 2, 10)));
EXPECT_EQ(8, a.Perform(make_tuple(std::string("hi"), 2, 10)));
}
// Tests using WithArgs to pass all original arguments in the original order.
@@ -754,7 +753,7 @@ TEST(ActionPMacroTest, CanReferenceArgumentAndParameterTypes) {
TEST(ActionPMacroTest, WorksInCompatibleMockFunction) {
Action<std::string(const std::string& s)> a1 = Plus("tail");
const std::string re = "re";
EXPECT_EQ("retail", a1.Perform(tuple<const std::string&>(re)));
EXPECT_EQ("retail", a1.Perform(make_tuple(re)));
}
// Tests that we can use ACTION*() to define actions overloaded on the
@@ -796,7 +795,7 @@ TEST(ActionPnMacroTest, WorksFor3Parameters) {
Action<std::string(const std::string& s)> a2 = Plus("tail", "-", ">");
const std::string re = "re";
EXPECT_EQ("retail->", a2.Perform(tuple<const std::string&>(re)));
EXPECT_EQ("retail->", a2.Perform(make_tuple(re)));
}
ACTION_P4(Plus, p0, p1, p2, p3) { return arg0 + p0 + p1 + p2 + p3; }
@@ -1120,7 +1119,7 @@ TEST(ActionTemplateTest, WorksForIntegralTemplateParams) {
EXPECT_FALSE(b); // Verifies that resetter is deleted.
}
// Tests that ACTION_TEMPLATE works for a template with template parameters.
// Tests that ACTION_TEMPLATES works for template template parameters.
ACTION_TEMPLATE(ReturnSmartPointer,
HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class,
Pointer),

4
googlemock/test/gmock_output_test_.cc
View File

@@ -39,14 +39,12 @@
#include "gtest/gtest.h"
// Silence C4100 (unreferenced formal parameter) for MSVC
// Silence C4100 (unreferenced formal parameter)
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4100)
#endif
using testing::_;
using testing::AnyNumber;
using testing::Ge;