summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updates the version number in CMakeLists.txt to 1.12.1 (#3919)release-1.12.1v1.12.xDerek Mauro2022-06-271-1/+1
| | | | | | | Due to an oversight version 1.12.0 didn't update the version in CMakeLists.txt. A patch release will fix this issue. I've also added a note to instructions for creating a release to check for this issue.
* Update versions of WORKSPACE dependenciesv1.12.0-prev1.12.0release-1.12.0Derek Mauro2022-06-221-12/+12
| | | | | PiperOrigin-RevId: 456532035 Change-Id: I60fa4d4e7827516d317ce893377d1f72e49c6a2f
* Update GCC floor container used by CI to fix the Bazel cache errorDerek Mauro2022-06-211-1/+2
| | | | | PiperOrigin-RevId: 456323043 Change-Id: I86e3d52b72b51c2d4e96f536daa7f84a52c598f5
* Disable warning C4251 around refactored codeDerek Mauro2022-06-162-0/+9
| | | | | PiperOrigin-RevId: 455452553 Change-Id: I1dc3772ae61daf6d2d39484a0b1aad7eb0134525
* Merge pull request #3863 from eidosmontreal:fix_unused-variable_warningCopybara-Service2022-06-141-9/+9
|\ | | | | | | | | PiperOrigin-RevId: 454940948 Change-Id: Ic87dadfe9c6fc8882b0f425aa2056f0cc7a90b55
| * Move declaration of kStdOutFileNo and kStdErrFilenoGaspard Petit2022-06-111-11/+9
| | | | | | | | Move declaration of kStdOutFileNo and kStdErrFileno closer to where they are used to avoid having to guard for GTEST_HAS_STREAM_REDIRECTION twice
| * Merge branch 'google:main' into fix_unused-variable_warningGaspard Petit2022-05-301-7/+1
| |\
| * | Fix "unused variable" warningGaspard Petit2022-05-301-0/+2
| | | | | | | | | | | | Fix "unused variable" warning when GTEST_HAS_STREAM_REDIRECTION is set to false in gtest-port.cc
* | | gmock_cook_book.md: Delete superfluous statement from 2014.Abseil Team2022-06-131-2/+1
| | | | | | | | | | | | | | | PiperOrigin-RevId: 454677195 Change-Id: I7a1419e22d617db41a5c310bc6f6158ba4cec1ab
* | | Merge pull request #3866 from eidosmontreal:simplify_shouldusecolorCopybara-Service2022-06-132-6/+2
|\ \ \ | | | | | | | | | | | | | | | | PiperOrigin-RevId: 454616721 Change-Id: I33b5671646ec027da48cc941baf84b4ddc722e07
| * \ \ Merge branch 'google:main' into simplify_shouldusecolorGaspard Petit2022-05-301-7/+1
| |\ \ \ | | | |/ | | |/|
| * | | Simplify ColoredPrintf to rely on ShouldUseColorGaspard Petit2022-05-302-8/+3
| | |/ | |/| | | | | | | Use ShouldUseColor to set use_color instead of having a separate check for the windows mobile cases; these cases are now moved directly to `DoIsATTY`
* | | Update googletest docs to indicate that RE2 is now used for regexp ↵Abseil Team2022-06-091-2/+4
| | | | | | | | | | | | | | | | | | | | | implementation when building with Bazel and using Abseil. PiperOrigin-RevId: 454012698 Change-Id: I3a9df78368ffe3cb7cf3d315001125b97b1aebbe
* | | Remove undefined internal function.Abseil Team2022-06-091-8/+0
| | | | | | | | | | | | | | | | | | | | | Fixes #3856 PiperOrigin-RevId: 453992227 Change-Id: I5f3330a454bdcd6b0522ebba4cdfe2c888f8e638
* | | Work around a maybe-uninitialized warning under GCC 12Derek Mauro2022-06-013-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Mock constructors insert the pointer to the Mock itself into a global registry. Since GCC cannot see how the pointer is used (only as an identifier), it cannot tell that the object doesn't need to be initialized at that point at all. Work around this by using uintptr_t instead. PiperOrigin-RevId: 452380347 Change-Id: Ia5a493057ed90719de1d0efab71de9a8a08ddf8b
* | | Fix internal filesAbseil Team2022-05-311-2/+2
| |/ |/| | | | | | | PiperOrigin-RevId: 452053766 Change-Id: I9498e8809f5e66e42cfa365199a5bbc41462a533
* | gmock-spec-builders: remove the name for an unused parameter.Aaron Jacobs2022-05-301-7/+1
|/ | | | | | | | | | | This fixes unused parameter errors under both MSVC and clang (when `-Werror=unused-parameter` is used, as reported [here](https://github.com/google/googletest/commit/9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1#r74769946)). Fixes #3858 PiperOrigin-RevId: 451907906 Change-Id: Ic07da19ea6a547eb1797fbbab19cd57cc2a83fe8
* gmock-spec-builders: add support for non-moveable types.Aaron Jacobs2022-05-272-242/+158
| | | | | | | | | Do this by ripping out the "untyped perform action" machinery, which isn't necessary: we can simply template the entry point on the result type, and use RAII to avoid the need to special case void. This makes it easier to understand the code and harder to introduce type-related undefined behavior, to boot. PiperOrigin-RevId: 451493451 Change-Id: I225305f83164752ca92f2916721972eafba33168
* Clarify that `this->` is needed to access members of type-parameterized tests.elixir2022-05-271-0/+4
| | | | | PiperOrigin-RevId: 451439108 Change-Id: I8929df21d53cbe6c42e38653e1bb0cac72fc36f9
* gmock-actions: properly support non-moveable results in `is_callable_r`.Aaron Jacobs2022-05-272-4/+79
| | | | | | | | | | | | | | | Previously this excluded callables that return non-moveable types. This is the same as the [libc++ std::is_invocable_r bug](https://github.com/llvm/llvm-project/issues/55346) fixed by [this commit](https://github.com/llvm/llvm-project/commit/c3a24882903d): it's wrong to use std::is_convertible for checking the return type, since (despite its name) that doesn't check the standard-defined notion of "implicitly convertible". Instead we must base the check on whether the source type can be used as an argument to a function that accepts the destination type. PiperOrigin-RevId: 451341205 Change-Id: I2530051312a0361ea7a2ce26993ae973c9242089
* gmock-spec-builders: move a method to the header.Aaron Jacobs2022-05-262-133/+134
| | | | | | | | In order to make the diff more readable in an upcoming commit that requires the method to be templated on the action's result type. PiperOrigin-RevId: 451157029 Change-Id: I57beb7544efccd0459efb3a1f039ea45cd7c7602
* Update GoogleTest documentation's spelling of "GoogleTest".Abseil Team2022-05-251-29/+29
| | | | | PiperOrigin-RevId: 451067898 Change-Id: I658ab92c4ea616736f0170ac4d1548bb15a944e2
* Clarify the pitfalls of EXPECT_THAT and highlight it's best practicesAbseil Team2022-05-241-3/+7
| | | | | PiperOrigin-RevId: 450721917 Change-Id: I34d63a65b7158975abd46a9a14cded75439e7e7f
* gmock-internal-utils.cc: Avoid implicit conversion from int to charDino Radakovic2022-05-171-1/+1
| | | | | | | Fixes #3832 PiperOrigin-RevId: 449158813 Change-Id: Ibe85239ab1f123097b2c1b61616c9d611e5b90d0
* gmock-actions: add support for move-only values to Return.Aaron Jacobs2022-05-122-29/+83
| | | | | | | | `Return(x)` can now be used directly with `WillOnce` (the only place it makes sense in the type system), without using `ByMove`. PiperOrigin-RevId: 448380066 Change-Id: Ia71cc60ccbc3b99720662731a2d309735a5ce7c8
* Add clarifying comments about when to use EXPECT_NONFATAL_FAILURE vs. ↵Abseil Team2022-05-121-4/+6
| | | | | | | EXPECT_FATAL_FAILURE. PiperOrigin-RevId: 448237839 Change-Id: Id6242f278912f8c47cf19e3ea8c061f8b18ba832
* gmock-actions: provide a const reference when converting in ReturnAction.Aaron Jacobs2022-05-112-47/+67
| | | | | | | | It doesn't make semantic sense for the conversion to modify the input, and the fact that it's allowed to do so appears to have just been a historical accident. PiperOrigin-RevId: 448135555 Change-Id: Id10f17af38cf3947ee25fe10654d97527173ebfc
* Do a consistent way of searching for a temporary directory.Abseil Team2022-05-101-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | The way temporary directories were discovered from environment variables in different operating systems was inconsistent. On Windows, only the system-specific environment variable TEMP was considered, but not the bazel-common TEST_TMPDIR. On Unix, only TEST_TMPDIR was considered, but not the otherwise typical system specific TMPDIR. Now, always consider TEST_TMPDIR first, followed by the system-typical environment variable (TEMP on Windows, TMPDIR on Unix) before falling back to a default on that particular system. Also: the value for the temporary directory coming from the environment variable was only checked for a trailing directory separator on Windows (and appended if needed), not on the other platforms. Make this also consistent accross the systems: Now always apply the same logic to all of these (to accomodate tests that just concatenate TempDir() without directory separator). PiperOrigin-RevId: 447909830 Change-Id: I9ea17acdf5944eb2a965615fd9cf142878c33a58
* gmock-actions: simplify Return and add better documentation.Aaron Jacobs2022-05-103-93/+192
| | | | | | | | | | Better document requirements, API decisions, and historical accidents. Make an implicit conversion easier and in a more appropriate place, and ease the burden of some assertions in the conversion operator. Stop using the legacy ActionInterface style for defining the action. PiperOrigin-RevId: 447894892 Change-Id: I179e23ec2abdd9bf05c204ab18dbb492f1372e8e
* gmock-actions: make OnceAction public.Aaron Jacobs2022-05-103-20/+59
| | | | | | | | So that it can be referenced in conversion operators for actions that need to know the concrete return type. PiperOrigin-RevId: 447889344 Change-Id: I643d3298bc8effd08741282a956c221f9d67d378
* Fixup some missing overrides in googletest.Abseil Team2022-05-101-2/+2
| | | | | | | | | This CL adds a couple missing overrides in the googletest sources. These were found downstream when -Wsuggest-override and -Wsuggest-destructor-override were enabled. PiperOrigin-RevId: 447754883 Change-Id: I7bf35a8757cbc5ae157827037aa3d13f47392406
* Merge pull request #3818 from joshiayush:typoCopybara-Service2022-05-061-3/+3
|\ | | | | | | | | PiperOrigin-RevId: 447003874 Change-Id: Ide8d879f6c939dbf4c10cc6d515c175d9b691e0c
| * Fix typo in the test name of `NormalizeTest`Ayush Joshi2022-04-301-3/+3
| | | | | | | | Signed-off-by: Ayush Joshi <ayush854032@gmail.com>
* | Fix example of DescribeMatcher to properly support negation.Abseil Team2022-05-031-1/+2
| | | | | | | | | | PiperOrigin-RevId: 446259163 Change-Id: I3ad5f405f44fc233f5cf5a18a274a9104b5c4ab8
* | Use TEST_TMPDIR on MacOS as well if available.Abseil Team2022-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently MacOS falls back to generic /tmp, but for all intents and purposes it should behave like other Unixes using the TEST_TMPDIR environment variable if available (this environment variable is set in bazel, which sets up a unique temp directory for the test process). While at it, remove an incorrect #endif comment, that looks like a leftover from some older implementation. PiperOrigin-RevId: 446108391 Change-Id: I118eacf6e86a41d26cb81a130f7c54cccc0c5665
* | gmock-actions: remove a no-longer-necessary friend declaration.Aaron Jacobs2022-05-021-6/+0
| | | | | | | | | | PiperOrigin-RevId: 445940487 Change-Id: I26952a72327db0d308bbe57ca4d1d91a0d7defc8
* | gmock-actions: support ByMove in a specialization of ReturnAction.Aaron Jacobs2022-05-021-25/+34
|/ | | | | | | | | | | | | Rather than branching on whether the return type is ByMoveWrapper within ReturnAction itself, hoist the distinction to outside. This allows the main class template to be modified without worrying about this special case, which means we can stop using a shared pointer to the value (introduced as a linked_ptr in commit 3d1c78b2bf to support ByMove) in this commit and simplify the class template further in a future commit with the eventual aim of directly supporting move-only result types. PiperOrigin-RevId: 445938943 Change-Id: I7bc71ea301d5e493ac6ecbe57d62738a48a2721a
* Rewrite "Testing a Certain Property of an Object" as "Defining a Custom ↵Abseil Team2022-04-281-17/+22
| | | | | | | Matcher Class", and fix the code examples. PiperOrigin-RevId: 445252626 Change-Id: I9f038cb669d3da6743606343c2341fc59725d722
* gmock-actions: improve comments and tests for the implicit cast in Return.Aaron Jacobs2022-04-272-7/+39
| | | | | | | | | | Commit a070cbd91c added an implicit cast to this path but didn't leave a very clear explanation for why it was desirable, a clear example, or even test coverage. Add a better comment and a test that fails when the implicit cast is removed. PiperOrigin-RevId: 444871311 Change-Id: I127982fa8d5bce9b6d1b68177c12dc0709449164
* Support move-only and &&-qualified actions in WithArgs.Aaron Jacobs2022-04-262-9/+73
| | | | | PiperOrigin-RevId: 444671005 Change-Id: I7df5f038caf17afb60d4fb35434ff0b656d4c954
* Use RE2 for the regex implementation when building with Bazel and using AbseilDerek Mauro2022-04-264-38/+71
| | | | | | | | | | | | | | | | | | | bazel build --define=absl=1 ... A dependency on RE2 is now required when building GoogleTest with Abseil. Using RE2 will provide a consistent cross-platform regex experience. Users will need to add the com_googlesource_code_re2, bazel_skylib, and platforms repository to their WORKSPACE files. See our WORKSPACE file in the root directory of this project for an example of how to add the dependencies. Please note that the com_googlesource_code_re2 dependency must use a commit from the `abseil` branch of the project: https://github.com/google/re2/tree/abseil PiperOrigin-RevId: 444650118 Change-Id: I45c55b26684c0c50d721a05b81c5f8a0c092400f
* Generalize gmock-matchers_test to handle is_gtest_matcher-style matchers, too.Abseil Team2022-04-265-50/+144
| | | | | PiperOrigin-RevId: 444586594 Change-Id: I0de9b40b3773e3047a492f050266967ea935ae3e
* Support move-only and &&-qualified actions in DoAll.Aaron Jacobs2022-04-263-258/+480
| | | | | | | | This is necessary for generic support of these actions, since `DoAll` is a frequently-used action wrapper. PiperOrigin-RevId: 444561964 Change-Id: I02edb55e35ab4207fbd71e371255a319c8253136
* Merge pull request #3797 from glandium:issue3514Copybara-Service2022-04-252-3/+7
|\ | | | | | | | | PiperOrigin-RevId: 444444700 Change-Id: I8ac5cc96cc6eb9d583fa7e3fb304ef3dcaa95b5b
| * Always initialize fields in MatcherBase constructorsMike Hommey2022-04-201-3/+4
| | | | | | | | | | | | This fixes -Wuninitialized warnings with GCC. Fixes #3514.
* | Remove the legacy internal GTEST_DISALLOW_* macrosDerek Mauro2022-04-2232-159/+290
| | | | | | | | | | PiperOrigin-RevId: 443715444 Change-Id: I3ffd54b63d2728ae4a668ee7875c8c3c8188087c
* | Eliminate the legacy GTEST_COMPILE_ASSERT_ macroDerek Mauro2022-04-214-55/+39
|/ | | | | PiperOrigin-RevId: 443462203 Change-Id: I0c43f981663a7531ff5da4d4be01fb3d6762273d
* Merge pull request #3791 from MR-A0101:patch-1Copybara-Service2022-04-181-2/+2
|\ | | | | | | | | PiperOrigin-RevId: 442609985 Change-Id: I4239171ef8a671ef6d548ba94e02104c5f0ecd36
| * Removing commas.MR-A2022-04-061-2/+2
| | | | | | Readme Update!
* | Document two surprises in `DoAllAction::NonFinalType`.Aaron Jacobs2022-04-132-0/+128
| | | | | | | | | | PiperOrigin-RevId: 441589196 Change-Id: Ic3e483ca70d72261046bad464d817f9dfd4bec65