Merge branch 'unification' of github.com:BillyDonahue/googlemock into unification
Description
Description
Details
Details
- Committed
Billy Donahue <billydonahue@google.com> Aug 25 2015, 23:49 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:affb09edf0df: move googlemock files into googlemock/ subdir
R9484:1f87a0970dc0: Move everything in googletest into googletest/googletest - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
affb09edf0df | Billy Donahue | move googlemock files into googlemock/ subdir | Aug 25 2015 | |||
84b8863dd934 | Billy Donahue | Merge remote-tracking branch 'google/master' | Aug 25 2015 | |||
65f381be21ea | Billy Donahue | Merge pull request #182 from BillyDonahue/wiki | Aug 25 2015 | |||
3e42adb74f33 | Billy Donahue | move versioned docs to version directories | Aug 25 2015 | |||
07b2bd1f7b71 | Billy Donahue | Merge pull request #180 from google/wiki | Aug 25 2015 | |||
168ab067835a | Billy Donahue | Merge pull request #179 from BillyDonahue/wiki | Aug 25 2015 | |||
06fcd9ff1170 | Billy Donahue | readme.md updates | Aug 25 2015 | |||
36d1a71badbb | Billy Donahue | README -> README.md | Aug 25 2015 | |||
872c422ec203 | Billy Donahue | move CheatSheet.md into docs | Aug 25 2015 | |||
3b6c87d41309 | Billy Donahue | Move all .md files from wiki into docs/ dir. | Aug 25 2015 | |||
26effd4ac9cb | Billy Donahue | Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki | Aug 25 2015 | |||
c3d8269e34b9 | Google Code Exporter | Migrating wiki contents from Google Code | Aug 25 2015 | |||
6e1087218be3 | kosak | Rename custom/callback-actions.h[.pump] => custom/gmock-generated-actions.h… | Jul 28 2015 | |||
01db9d469ba1 | kosak | Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_ | Jul 28 2015 | |||
e83085aeb11d | kosak | Inject a mock stack trace getter. | Jul 28 2015 | |||
58a4bb42c88a | kosak | Add an injection point for customizing GMOCK_DECLARE_bool and the like. | Jul 28 2015 | |||
cac6c1bb5396 | kosak | Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_. Pull in… | Jul 28 2015 | |||
6702b97d5e01 | kosak | Inject customization point for gmock-matchers.h | Jul 28 2015 | |||
c820efcc04bd | kosak | Templatize ParseeGoogleMockStringFlag on String type. | Jul 28 2015 | |||
37a8c1068d06 | kosak | Missing diff that should have gone along with the pull of gtest 738. | Jul 27 2015 | |||
a6e32f0a2c68 | kosak | Explicitly specify return value for lambda in AsStdFunction() to ensure it… | Jul 24 2015 | |||
f6df4c6baf24 | kosak | Remove some tests. | Jul 20 2015 | |||
67c377d3b182 | kosak | Move Callback-related generated actions to a custom/ file. | Jul 19 2015 | |||
d86a723ed952 | kosak | Mark the default constructor of Matcher<> explicit. This prevents implicitly… | Jul 13 2015 | |||
9b1a944ec48b | kosak | Fix EXPECT_THAT() to support literal strings as a second argument. | Apr 29 2015 | |||
6305ff5a922d | kosak | Change IsNull and NotNull to use ==/!= nullptr in C++11. Also update… | Apr 29 2015 | |||
5625dd333a62 | kosak | Suppresses the stack trace in a warning for uninteresting call by default; the… | Feb 14 2015 | |||
d478a1f46d51 | kosak | In C++11 and above, makes a mock method whose return type is default… | Feb 14 2015 | |||
02d647925955 | kosak | This change adds an explicit invocation of std::move to workaround a problem in… | Feb 14 2015 | |||
53d49dc43ea3 | kosak | Make ReturnNull() support unique_ptr and shared_ptr. | Jan 8 2015 | |||
8e838ce0fd14 | kosak | Adding support to gmock_gen for nested templates. | Jan 8 2015 | |||
6b817803104b | kosak | Makes DoubleNear() print the diff between the actual and the expected value… | Jan 8 2015 | |||
61adbcc5c6b8 | kosak | Add support for C++11 explicitly defaulted and deleted special member functions… | Nov 17 2014 | |||
055b6b17d235 | kosak | Prevent gmock_gen from returning exit code zero on a failure to parse. | Nov 17 2014 | |||
f58b49a2b14f | kosak | Handle parameters without variable names when the type includes *, & or []. | Nov 17 2014 | |||
6e87b780d348 | kosak | Update gmock_doctor to accept static_assert output. | Nov 17 2014 | |||
cd99eb0bbd83 | kosak | Fix gmock-matchers_test's ConstIter. | Nov 17 2014 | |||
7123d8313283 | kosak | Fix gmock Action behaviour when return type is Wrapper | Nov 17 2014 | |||
506340a66b78 | kosak | Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro. | Nov 17 2014 | |||
d370f85b0236 | kosak | Call move() by qualified name (::testing::internal::move() or just internal… | Nov 17 2014 | |||
389bad61e2eb | kosak | Silence a signedness-comparison warning in gmock-actions_test. include… | Nov 17 2014 | |||
3d1c78b2bff0 | kosak | Add ByMove() modifier for the Return() action. Pull in gtest 695. | Nov 17 2014 | |||
5b9cbbb16d77 | kosak | Distinguish between C++11 language and library support for std::function, std… | Nov 17 2014 | |||
2336e9c171b5 | kosak | Defines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m… | Jul 29 2014 | |||
06678924fa3a | kosak | Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the… | Jul 28 2014 | |||
a9e02a9178d2 | kosak | Add MockFunction::AsStdFunction(). Also pull in gtest 688. | Jun 18 2014 | |||
1f5fdea417f1 | billydonahue | Push several shanges: | May 19 2014 | |||
bd0188320de5 | kosak | Export tuple and friends in the ::testing namespace. | Apr 2 2014 | |||
15d61e42bdd4 | kosak | Implement threading support for gmock on Windows. Replace U+2013 with U+002D in… | Mar 24 2014 | |||
c26f969579d6 | kosak | Make the gmock generator work with the 'override' keyword. Also pull in gtest… | Mar 13 2014 |