Homec4science

Merge pull request #511 from BillyDonahue/unification

Description

Merge pull request #511 from BillyDonahue/unification

Bring GoogleMock into the GoogleTest repository

Event Timeline

Billy Donahue <BillyDonahue@users.noreply.github.com> committed R9484:661699bfc024: Merge pull request #511 from BillyDonahue/unification (authored by Billy Donahue <BillyDonahue@users.noreply.github.com>).Aug 26 2015, 00:46

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
8a3c8c937616Billy Donahue
tiny fix 
Aug 26 2015
5b3ef3bd6cb9Billy Donahue
unified project home 
Aug 26 2015
7563fe553e7eBilly Donahue
cat _home.md files into README.md 
Aug 25 2015
67f6188c8fc3Billy Donahue
move ProjectHome files into root 
Aug 25 2015
ad47332a7aefBilly Donahue
Merge branch 'unification' of github.com:BillyDonahue/googlemock into… 
Aug 25 2015
affb09edf0dfBilly Donahue
move googlemock files into googlemock/ subdir 
Aug 25 2015
84b8863dd934Billy Donahue
Merge remote-tracking branch 'google/master' 
Aug 25 2015
65f381be21eaBilly Donahue
Merge pull request #182 from BillyDonahue/wiki 
Aug 25 2015
3e42adb74f33Billy Donahue
move versioned docs to version directories 
Aug 25 2015
07b2bd1f7b71Billy Donahue
Merge pull request #180 from google/wiki 
Aug 25 2015
168ab067835aBilly Donahue
Merge pull request #179 from BillyDonahue/wiki 
Aug 25 2015
06fcd9ff1170Billy Donahue
readme.md updates 
Aug 25 2015
36d1a71badbbBilly Donahue
README -> README.md 
Aug 25 2015
872c422ec203Billy Donahue
move CheatSheet.md into docs 
Aug 25 2015
3b6c87d41309Billy Donahue
Move all .md files from wiki into docs/ dir. 
Aug 25 2015
26effd4ac9cbBilly Donahue
Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki 
Aug 25 2015
c3d8269e34b9Google Code Exporter
Migrating wiki contents from Google Code 
Aug 25 2015
6e1087218be3kosak
Rename custom/callback-actions.h[.pump] => custom/gmock-generated-actions.h… 
Jul 28 2015
01db9d469ba1kosak
Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_ 
Jul 28 2015
e83085aeb11dkosak
Inject a mock stack trace getter. 
Jul 28 2015
58a4bb42c88akosak
Add an injection point for customizing GMOCK_DECLARE_bool and the like. 
Jul 28 2015
cac6c1bb5396kosak
Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_. Pull in… 
Jul 28 2015
6702b97d5e01kosak
Inject customization point for gmock-matchers.h 
Jul 28 2015
c820efcc04bdkosak
Templatize ParseeGoogleMockStringFlag on String type. 
Jul 28 2015
37a8c1068d06kosak
Missing diff that should have gone along with the pull of gtest 738. 
Jul 27 2015
a6e32f0a2c68kosak
Explicitly specify return value for lambda in AsStdFunction() to ensure it… 
Jul 24 2015
f6df4c6baf24kosak
Remove some tests. 
Jul 20 2015
67c377d3b182kosak
Move Callback-related generated actions to a custom/ file. 
Jul 19 2015
d86a723ed952kosak
Mark the default constructor of Matcher<> explicit. This prevents implicitly… 
Jul 13 2015
9b1a944ec48bkosak
Fix EXPECT_THAT() to support literal strings as a second argument. 
Apr 29 2015
6305ff5a922dkosak
Change IsNull and NotNull to use ==/!= nullptr in C++11. Also update… 
Apr 29 2015
5625dd333a62kosak
Suppresses the stack trace in a warning for uninteresting call by default; the… 
Feb 14 2015
d478a1f46d51kosak
In C++11 and above, makes a mock method whose return type is default… 
Feb 14 2015
02d647925955kosak
This change adds an explicit invocation of std::move to workaround a problem in… 
Feb 14 2015
53d49dc43ea3kosak
Make ReturnNull() support unique_ptr and shared_ptr. 
Jan 8 2015
8e838ce0fd14kosak
Adding support to gmock_gen for nested templates. 
Jan 8 2015
6b817803104bkosak
Makes DoubleNear() print the diff between the actual and the expected value… 
Jan 8 2015
61adbcc5c6b8kosak
Add support for C++11 explicitly defaulted and deleted special member functions… 
Nov 17 2014
055b6b17d235kosak
Prevent gmock_gen from returning exit code zero on a failure to parse. 
Nov 17 2014
f58b49a2b14fkosak
Handle parameters without variable names when the type includes *, & or []. 
Nov 17 2014
6e87b780d348kosak
Update gmock_doctor to accept static_assert output. 
Nov 17 2014
cd99eb0bbd83kosak
Fix gmock-matchers_test's ConstIter. 
Nov 17 2014
7123d8313283kosak
Fix gmock Action behaviour when return type is Wrapper 
Nov 17 2014
506340a66b78kosak
Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro. 
Nov 17 2014
d370f85b0236kosak
Call move() by qualified name (::testing::internal::move() or just internal… 
Nov 17 2014
389bad61e2ebkosak
Silence a signedness-comparison warning in gmock-actions_test. include… 
Nov 17 2014
3d1c78b2bff0kosak
Add ByMove() modifier for the Return() action. Pull in gtest 695. 
Nov 17 2014
5b9cbbb16d77kosak
Distinguish between C++11 language and library support for std::function, std… 
Nov 17 2014
2336e9c171b5kosak
Defines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m… 
Jul 29 2014
06678924fa3akosak
Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the… 
Jul 28 2014