summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Googletest exportAbseil Team2019-10-2314-1085/+399
| | | | | | Add a matcher `testing::ReturnRoundRobin` which, on each call, returns the next element in the sequence, restarting at the beginning once it has reached the end. PiperOrigin-RevId: 276312136
* Merge pull request #2514 from thejcannon:msvc_macro_issuevslashg2019-10-232-77/+41
|\ | | | | | | PiperOrigin-RevId: 276134684
| * Avoid recursive macrosrefs/pull/2514/headJoshua Cannon2019-10-111-22/+28
| |
| * Removing extraneous parenthesisJoshua Cannon2019-10-111-1/+1
| |
| * Evaluate and cat NARG in different macrosJoshua Cannon2019-10-111-8/+8
| |
| * Removing extraneous testJoshua Cannon2019-10-111-1/+0
| |
| * Replace compile-test with preprocessor testJoshua Cannon2019-10-112-7/+11
| |
| * Fix preprocessor testsJoshua Cannon2019-10-111-3/+1
| |
| * Add a compile testJoshua Cannon2019-10-111-0/+7
| |
| * Workaround MSVC VA_ARGS weirdnessJoshua Cannon2019-10-111-66/+19
| |
* | Merge pull request #2444 from kuzkry:remove-GTEST_ARRAY_SIZE_Gennadiy Civil2019-10-222-44/+47
|\ \ | | | | | | | | | PiperOrigin-RevId: 275842505
| * | remove GTEST_ARRAY_SIZE_refs/pull/2444/headKrystian Kuzniarek2019-09-232-41/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | This macro didn't work when an array was passed to a function by pointer, in which case the information about its size was lost. Better alternatives are: * std::extent<T>::value (compile-time) * std::array<T, N>::size() (compile-time) * std::distance(std::begin(array), std::end(array)) (run-time)
* | | Googletest exportAbseil Team2019-10-222-66/+28
| | | | | | | | | | | | | | | | | | | | | | | | Remove bool_constant in favor of std::integral_constant<bool, ...>; The one non-trivial use of bool_constant has been changed to have significantly fewer template specializations. PiperOrigin-RevId: 275842490
* | | Googletest exportAbseil Team2019-10-223-2/+133
| | | | | | | | | | | | | | | | | | Rolling forward IsNan() matcher with fixes in test for -Wconversion issues. Use std::nanf and std::nanl where appropriate. PiperOrigin-RevId: 275523003
* | | Googletest exportmisterg2019-10-183-133/+2
| | | | | | | | | | | | | | | | | | Added IsNan matcher PiperOrigin-RevId: 275473218
* | | Googletest exportAbseil Team2019-10-182-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | Addressing https://github.com/google/googletest/issues/2502 Add MOCK_METHOD support for returning function pointers. PiperOrigin-RevId: 275323671
* | | Googletest exportAbseil Team2019-10-173-2/+133
| | | | | | | | | | | | | | | | | | Added IsNan matcher PiperOrigin-RevId: 275278634
* | | Merge pull request #2507 from roblub:masterGennadiy Civil2019-10-174-62/+62
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 275076905
| * | | Add more override keywordsrefs/pull/2507/headRobert Luberda2019-10-114-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark more functions with "override" keyword, just like it was done in commit 2460f97152c. This should prevent compiler from complaining while compiling both user code, and the googletest code itself with the -Wsuggest-override option turned on; with the exception of: * calls to new MOCK_METHOD() in test/gmock-function-mocker_test.cc * calls to old MOCK_METHODx()/MOCK_CONST_METHODx() in other unit test files. Closes #2493
* | | | Merge pull request #2421 from kuzkry:cleanup-for-regexAndy Soffer2019-10-162-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | PiperOrigin-RevId: 275058934
| * | | mention the existing support for wide strings in string matchersrefs/pull/2421/headKrystian Kuzniarek2019-09-231-2/+2
| | | |
| * | | change usingsKrystian Kuzniarek2019-09-121-1/+1
| | | |
* | | | Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-112-51/+20
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 274155281
* \ \ \ \ Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-112-20/+51
|\ \ \ \ \ | |/ / / / | | | | | | | | | | PiperOrigin-RevId: 274097989
| * | | | Made noexcept condition more excitingrefs/pull/2498/headJoshua Cannon2019-10-101-8/+12
| | | | |
| * | | | Use declval in noexcept expressionJoshua Cannon2019-10-071-7/+8
| | | | |
| * | | | Switch to free function to avoid GCC bugJoshua Cannon2019-10-071-3/+3
| | | | |
| * | | | Avoid comma operatorJoshua Cannon2019-10-071-2/+3
| | | | |
| * | | | Fix spacingJoshua Cannon2019-10-071-3/+3
| | | | |
| * | | | Use the verbatim noexcept spec in MOCKED_METHODJoshua Cannon2019-10-072-10/+35
| | |_|/ | |/| |
* | | | Googletest exportAbseil Team2019-10-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the O(n^2) number of instantiations in ElemFromList. It is now O(n). It still has O(1) instantiation depth. PiperOrigin-RevId: 273980821
* | | | Merge pull request #2497 from thejcannon:handle_null_filenameGennadiy Civil2019-10-101-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 273585229
| * | | | Use FormatFileLocation for streaming file and linerefs/pull/2497/headJoshua Cannon2019-10-071-1/+2
| |/ / /
* | | | Merge pull request #2448 from kuzkry:bad-googletest-exportGennadiy Civil2019-10-103-5/+2
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 273585026
| * | | | square away the stuff that hasn't been merged in a manual reviewKrystian Kuzniarek2019-09-163-5/+2
| | |_|/ | |/| | | | | | | | | | | | | | This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
* | | | Merge pull request #2495 from hyukmyeong:typoGennadiy Civil2019-10-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 273346440
| * | | | Fix typo in documentsrefs/pull/2495/headrefs/pull/2486/headhyuk.myeong2019-10-011-1/+1
| | |/ / | |/| |
* | | | Revert "Use pcfiledir for prefix in pkgconfig file"David Seifert2019-10-052-6/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | The change makes implicit assumptions on the layout of the install tree, which is going to break in many ways. The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable to inject the cross-compiled sysroot into `-I` and `-L` paths.
* | | Googletest exportAbseil Team2019-09-272-2/+14
| | | | | | | | | | | | | | | | | | Makes testing::ResultOf() work with non-copyable arguments. PiperOrigin-RevId: 271222632
* | | Googletest exportAbseil Team2019-09-271-88/+88
| | | | | | | | | | | | | | | | | | Updates headings. PiperOrigin-RevId: 271148974
* | | Googletest exportAbseil Team2019-09-271-4/+4
|/ / | | | | | | | | | | Remove unnecessary full qualifications from std types. PiperOrigin-RevId: 270101485
* | Googletest exportkuzkry2019-09-163-18/+16
|/ | | | | | | | | Merge 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd into fb49e6c164490a227bbb7cf5223b846c836a0305 Closes #2407 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2407 from kuzkry:StaticAssertTypeEq 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd PiperOrigin-RevId: 269255328
* Merge pull request #2387 from kuzkry:iffShaindel Schwartz2019-09-1213-85/+98
|\ | | | | | | PiperOrigin-RevId: 268693457
| * restore mistakenly removed iffs in their explicit formrefs/pull/2387/headKrystian Kuzniarek2019-08-2013-84/+98
| | | | | | | | | | Due to confusion arisen from "iff" standing for "if and only if", this commit uses the latter.
* | Googletest exportHosein Ghahremanzadeh2019-09-122-50/+55
| | | | | | | | | | | | | | | | | | Merge 4c9ef099b29d2c840c04643cd9662fd7be712f7b into 565f1b848215b77c3732bca345fe76a0431d8b34 Closes #2403 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2403 from IYP-Programer-Yeah:remove-compile-assert-type-equal 4c9ef099b29d2c840c04643cd9662fd7be712f7b PiperOrigin-RevId: 268681883
* | Googletest exportAbseil Team2019-09-091-2/+2
| | | | | | | | | | | | | | | | Move IsFalse/IsTrue to a more appropriate section in the gmock matchers cheat sheet. I'm assuming their current placement within the "Container Matchers" list is a mistake -- they don't seem to be container related and would fit well with other generic matchers. PiperOrigin-RevId: 268016027
* | Googletest exportAbseil Team2019-09-091-1/+12
| | | | | | | | | | | | ...text exposed to GitHub repo https://www.github.com/google/googletest PiperOrigin-RevId: 267654546
* | Googletest exportAbseil Team2019-09-091-4/+4
| | | | | | | | | | | | ...text exposed to GitHub repo https://www.github.com/google/googletest PiperOrigin-RevId: 267617889
* | Googletest exportkuzkry2019-09-064-21/+4
| | | | | | | | | | | | | | | | | | Merge 7f4f58da20e1066a888d3e4bcbef541db798a605 into 90a443f9c2437ca8a682a1ac625eba64e1d74a8a Closes #2395 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2395 from kuzkry:custom-type-traits-remove_reference 7f4f58da20e1066a888d3e4bcbef541db798a605 PiperOrigin-RevId: 266189044
* | Merge pull request #2426 from kuzkry:#2396-postreviewGennadiy Civil2019-08-281-9/+9
|\ \ | | | | | | | | | PiperOrigin-RevId: 265785837