3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-22 15:56:16 +08:00
Code Issues Projects Releases Wiki Activity
2,667 Commits 7 Branches 27 Tags 40 MiB
Commit Graph

2667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abseil Team
dda0df3b0a Googletest export 
Internal change

PiperOrigin-RevId: 232362580
 2019-02-12 13:20:05 -05:00
Gennadiy Civil
9a502a5b14
Merge pull request #2100 from ngie-eign/test-clang-osx-every-travis-run 
Test out changes with clang/OSX each PR using Travis CI
 2019-02-05 12:12:38 -05:00
Gennadiy Civil
e28b50609e
Merge pull request #2103 from kw-udon/fix-json-in-advanced-md 
Fix an invalid example of JSON report in advanced.md
 2019-02-05 12:10:51 -05:00
Keiichi Watanabe
b3679d8565 Fix an invalid example of JSON report in advanced.md 
This is just a mistake in the document. Google Test doesn't output
such an invalid JSON report.

Signed-off-by: Keiichi Watanabe <keiichiw@chromium.org>
 2019-02-05 21:05:16 +09:00
Gennadiy Civil
f80d6644d4
Update .travis.yml 2019-02-04 15:30:37 -05:00
Gennadiy Civil
5dfcd1bc42
Update .travis.yml 2019-02-04 15:29:18 -05:00
Enji Cooper
9df5475b82 Test out changes with clang/OSX each PR using Travis CI 
This will help ensure that test coverage isn't missed when changes that
can impact OSX with clang are submitted. Although not perfect, testing
changes on OSX with clang is an ok proxy [for now] for testing changes on
FreeBSD with clang (testing on FreeBSD is non-trivial, as Travis CI doesn't
support operating systems other than Linux and OSX).

In order to support this, install the packages via homebrew using a
`addons::homebrew::packages` block (similar to `addons::apt::packages`
for Ubuntu), as documented in the Travis CI docs
( https://docs.travis-ci.com/user/installing-dependencies/ ). While
here, try pushing apt* calls into the Travis config for Ubuntu, instead
of delaying the equivalent calls in the `ci/*.sh` scripts. Keep the
`ci/*.sh` scripts for ease of testing locally (and extend the OSX one to
install gcc 4.9 and llvm 3.9, like the travis config does).

In order to accomodate this change (and because the homebrew package for
llvm@3.9 doesn't automatically add clang*-3.9 to `$PATH`), `$PATH` needs
to be adjusted to find the llvm@3.9 toolchain.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
 2019-02-04 12:19:27 -08:00
misterg
50059a12b9 Googletest export 
Address -Wgnu-zero-variadic-macro-arguments
Originally in OSS PR #2063 https://github.com/google/googletest/pull/2063
Fix regression in INSTANTIATE_TEST_SUITE_P macro to accept function pointers properly.

PiperOrigin-RevId: 232316698
 2019-02-04 14:19:58 -05:00
misterg
52ea4f7bea Googletest export 
Mark legacy _TEST_CASE_ macros as deprecated

PiperOrigin-RevId: 232303251
 2019-02-04 14:19:50 -05:00
Abseil Team
876bdfa565 Googletest export 
Update example code in gtest.h to prefer override over virtual now
that it is widely available in C++11.

PiperOrigin-RevId: 232057792
 2019-02-04 14:19:41 -05:00
Gennadiy Civil
471f5bc433 Merge pull request #2098 from ciband:feat/finish_platformio_support 
PiperOrigin-RevId: 232028696
 2019-02-04 14:19:31 -05:00
Abseil Team
0ea2d8f8fa Googletest export 
Fix stack overflow in AnyOfArray tests.

PiperOrigin-RevId: 231881125
 2019-02-01 12:52:31 -05:00
Chris Johnson
53798de939
chore: Add PlatformIO supported platforms list 2019-02-01 10:05:31 -06:00
Chris
b2b2462250 fix: Add Arduino to embedded platform list 
Added Arduino to the embedded platform list to allow for a stubbed out version
of GetCurrentDir.
 2019-01-31 21:56:34 -06:00
Chris
fe519d64a6 fix: Add *_all.cc files to ignore list 
Added [gmock|gtest]_all.cc to PIO ignore list to avoid getting duplicate
symbols since PIO will compile the individual files.
 2019-01-31 21:56:30 -06:00
Gennadiy Civil
4f4c01d8c8
Merge pull request #2092 from Billy4195/Update_README 
Fix README.md broken link
 2019-01-31 17:15:49 -05:00
Billy SU
1c23efb424
Fix README.md broken link 
Fix the **include/gtest/internal/gtest-port.h** link in the `Tweaking Google Test` title
 2019-01-31 08:23:15 +08:00
Gennadiy Civil
e04254989d
Merge pull request #2091 from google/gennadiycivil-patch-1 
Repeat #2090
 2019-01-30 15:36:27 -05:00
Gennadiy Civil
acde02c635
Repeat #2090 
Testing
 2019-01-30 14:44:27 -05:00
Ashley Hedberg
8e37822b4b Merge pull request #2063 from mathbunnyru:master 
PiperOrigin-RevId: 231456275
 2019-01-30 14:26:14 -05:00
Gennadiy Civil
ce29e55cfc
Merge pull request #2090 from KellyWalker/patch-1 
Update advanced.md casing in example
 2019-01-30 13:19:14 -05:00
Kelly Walker
2775733ee1
Update advanced.md casing in example 
Updated the example that says not to use SetupTestSuite with a small 'u' to actually use a small 'u'
 2019-01-30 09:01:58 -06:00
Gennadiy Civil
9318a18ccf
Added -Wgnu-zero-variadic-macro-arguments" clang 
This is inspired by work in http://go/gh/google/googletest/pull/2063 but in a separate commit
 2019-01-29 14:38:50 -05:00
Gennadiy Civil
1f42ae7353 Merge pull request #2063 from mathbunnyru:master 
PiperOrigin-RevId: 231434457
 2019-01-29 14:32:06 -05:00
Gennadiy Civil
01148677a9 Merge pull request #2086 from hugolm84:fix-dynamic/static-runtime-link 
PiperOrigin-RevId: 231286700
 2019-01-28 17:31:42 -05:00
Hugo Lindström
718bb65acf Avoid dynamic/static runtime linking (LNK4098) by properly replacing MD(d)->MT(d) in both C and CXX flags, resolves 2074 2019-01-28 21:07:41 +01:00
Gennadiy Civil
5ec7f0c4a1 Merge pull request #2079 from acozzette:fix-dist 
PiperOrigin-RevId: 230902623
 2019-01-25 11:01:36 -05:00
Adam Cozzette
46b81732b6 Fixed "make dist" 
I made a few updates to the Makefile.am files so that "make dist"
succeeds and produces a usable tarball. We need this for protobuf
because the protobuf tarballs include a bundled copy of googletest.
 2019-01-24 14:51:40 -08:00
Gennadiy Civil
bf07131c1d Merge pull request #2041 from ciband:chore/fix_library_json 
PiperOrigin-RevId: 230554814
 2019-01-23 13:27:16 -05:00
Abseil Team
fdc59ffd05 Googletest export 
Add AllOfArray matcher that verifies a value matches all member of some array/container/list/set/..., e.g:
EXPECT_THAT(1, AnyOfArray({1, 2, 3}))
In the simplest form this is identical to AnyOf(1, 2, 3). But unlike that one it works on containers.

Add AnyOfArray matcher that verifies a value matches any member of some
array/container/list/set/...

PiperOrigin-RevId: 230403653
 2019-01-23 13:27:08 -05:00
Abseil Team
569fba4d74 Googletest export 
Make internal FunctionMocker class final

PiperOrigin-RevId: 230332778
 2019-01-22 13:12:13 -05:00
Abseil Team
9518a57428 Googletest export 
Fix mocking method arguments with templated copy constructors.

A previous change removed workarounds for old compilers from googletest and googlemock. Unfortunately, a bit of code that started as a workaround for Symbian's C++ compiler is still needed to avoid copy/move constructor ambiguity when mocking functions with certain argument types.

The test case added by this CL is extracted from Chrome's codebase, and was discovered while attempting to roll googletest.

PiperOrigin-RevId: 229801765
 2019-01-18 14:06:03 -05:00
Ayaz Salikhov
7c4164bf40 Fix INSTANTIATE_TEST_CASE_P with zero variadic arguments 2019-01-18 14:53:56 +03:00
Abseil Team
0adeadd283 Googletest export 
Refactor the `Invoke` and `InvokeWithoutArgs` actions:
 - Replace pump'd classes and functions with templates.
 - Make the polymorphic actions be polymorphic functors instead.
 - Fix Invoke(Callback*) to work with subclasses of the callbacks, instead of trying to diagnose that in gmock_doctor.

PiperOrigin-RevId: 229604112
 2019-01-17 14:41:08 -05:00
misterg
eb9225ce36 Googletest export 
Change remaining samples to use new Test Suite API

PiperOrigin-RevId: 229231566
 2019-01-14 17:02:11 -05:00
Abseil Team
9acd065a90 Googletest export 
Add move-only argument support to almost all remaining matchers.

PiperOrigin-RevId: 229030728
 2019-01-14 17:02:03 -05:00
Abseil Team
097407fd3c Googletest export 
Deduplicate testing::ReferenceWrapper with std::reference_wrapper.
Minor cleanups in matchers_test.

PiperOrigin-RevId: 229022872
 2019-01-14 17:01:56 -05:00
misterg
0599a7b841 Googletest export 
Change tests to use new Test Suite API

PiperOrigin-RevId: 228908894
 2019-01-11 13:59:22 -05:00
Gennadiy Civil
2edadcedf3
Workaround homebrew issue 2019-01-10 18:20:44 -05:00
Gennadiy Civil
6693e85b04 Merge branch 'master' of github.com:google/googletest 2019-01-10 16:33:42 -05:00
Abseil Team
bc1023b413 Googletest export 
Fix warning about deprecation of implicit operations such as copy constructors or assignment operators.

Specifically:

MatcherBase's default copy constructor, assignment operator, move operator, and move assignment operator are now declared explicitly rather than depending on the compiler implicit generation (which is disallowed/warned against due to MatcherBase's declaration of the destructor).

PiperOrigin-RevId: 228573333
 2019-01-10 16:32:37 -05:00
Abseil Team
7a7e2bba1d Googletest export 
...text exposed to GitHub repo https://www.github.com/google/googletest

PiperOrigin-RevId: 228573333
 2019-01-10 16:18:48 -05:00
gennadiycivil
50f1a77955 Merge pull request #2051 from enptfb55:master 
PiperOrigin-RevId: 228337465
 2019-01-08 11:51:17 -05:00
misterg
f31bf1d362 Googletest export 
Replace testing::internal::ImplicitlyConvertible with std::is_convertible
Fixes #2054

PiperOrigin-RevId: 228334305
 2019-01-08 11:51:05 -05:00
Abseil Team
216c37f057 Googletest export 
Drop generated file gmock-generated-internal-utils.h.

PiperOrigin-RevId: 228232195
 2019-01-08 11:50:56 -05:00
Chris
45c58aa6f3 fix: Add Arduino setup()/loop() functions back 
Added setup()/loop() functions back to *_main.cc files to support compiling in CI.  Future features could enable this for the end user.
 2019-01-07 12:37:34 -06:00
gennadiycivil
644319b9f0 Merge pull request #2048 from ciband:chore/clang_tidy 
PiperOrigin-RevId: 228173023
 2019-01-07 12:09:34 -05:00
Abseil Team
b6cd405286 Googletest export 
Fix GTEST_IS_NULL_LITERAL_ for types that have magic implicit conversions.

PiperOrigin-RevId: 227879345
 2019-01-07 12:09:25 -05:00
Sal Amato
8369b5bbd0 fixing build errors for unused parameter 2019-01-06 06:24:26 -05:00
Chris
ade8baa7d2 clang-tidy: modernize-deprecated-headers 2019-01-05 11:21:56 -06:00
Chris
23e6937873 misc: Reapply Arduino functions 2019-01-03 21:23:06 -06:00
Chris
202dcabf39 misc: Revert formatting changes. 2019-01-03 21:22:00 -06:00
Chris
fd1c7976ae Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest into chore/fix_library_json 2019-01-03 21:15:19 -06:00
Chris Johnson
0ffa5f9779
Merge branch 'master' into chore/fix_library_json 2019-01-03 21:13:20 -06:00
Chris
23533009b8 chore: Add Windows cmake files to .gitignore 2019-01-03 21:06:20 -06:00
Chris
adc5045cbf chore: Alphabetize exclude directories. 2019-01-03 21:01:02 -06:00
Gennadiy Civil
3880b13e4c
Merge pull request #2042 from gennadiycivil/master 
Update Docs TestCase->TestSuite
 2019-01-03 21:36:19 -05:00
Gennadiy Civil
58e62f7a98 Merge branch 'master' of https://github.com/google/googletest 2019-01-03 17:18:32 -05:00
Gennadiy Civil
5d3a2cd9c8 Update docs, TestCase->TestSuite 2019-01-03 17:18:03 -05:00
misterg
827515f8a0 Googletest export 
Fixes #1261

PiperOrigin-RevId: 227740670
 2019-01-03 16:40:27 -05:00
misterg
3a460a26b7 Googletest export 
TestCase->TestSuite refactoring

PiperOrigin-RevId: 227702164
 2019-01-03 16:40:20 -05:00
Chris
0c0ca90382 fix: Correct *_main.cc paths 2019-01-03 12:14:40 -06:00
Chris
4d62b5b9ae fix: Remove Arduino entry points 
Improved flexibility by removing the Arduino entry points in favor of manual calls to setup/loop that the user can call from their entry point.  This is the more common use case for Arudino.

Also added the gtest/gmock_main files to the PlatformIO ignore list since we are not supporting that feature.
 2019-01-03 12:12:19 -06:00
Gennadiy Civil
ac8c102dae
Update README.md 2019-01-03 11:41:41 -05:00
Gennadiy Civil
6e410a3ae9
Update README.md 2019-01-03 11:41:17 -05:00
Gennadiy Civil
8a27d164cb
Update README.md 2019-01-03 11:40:37 -05:00
Gennadiy Civil
bfcc47fc2f
Merge pull request #2026 from justin6case/example_makefile_improvements 
Example/sample makefile improvements
 2019-01-03 11:38:47 -05:00
Gennadiy Civil
1bcbd5871e Merge pull request #2037 from ciband:chore/fix_library_json 
PiperOrigin-RevId: 227615222
 2019-01-02 21:39:36 -05:00
misterg
14c2fba734 Googletest export 
Internal Change

PiperOrigin-RevId: 227575279
 2019-01-02 16:51:40 -05:00
Abseil Team
f8b1c1af17 Googletest export 
Remove the #ifs for old, unsupported and buggy compilers:
* old versions of GCC & MSVC
* Symbian

PiperOrigin-RevId: 227116941
 2019-01-02 16:51:33 -05:00
Gennadiy Civil
933e5df283
Merge pull request #2039 from gennadiycivil/master 
Remove outdated scripts
 2019-01-02 16:23:06 -05:00
Gennadiy Civil
8ed34e0f6b Remove outdated scripts 2019-01-02 16:03:50 -05:00
Gennadiy Civil
2ace910a35 Revert "test, please ignore" 
This reverts commit 4665eee10a1d495aec9970fddf6231cf2339b1b7.
 2019-01-02 16:02:34 -05:00
Gennadiy Civil
25905b9f9a Merge branch 'master' of https://github.com/google/googletest 2019-01-02 15:49:22 -05:00
Chris
de99386b67 Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest into chore/fix_library_json 2018-12-29 12:57:33 -06:00
Chris
6d5ce40d4c fix: Add additional source and include directories. 
This is still a work in progress.
 2018-12-29 12:57:04 -06:00
Gennadiy Civil
3bedb5a9fc
Merge pull request #2035 from syohex/update-xcode-project-file 
Update Xcode project file
 2018-12-28 11:21:32 -05:00
Syohei YOSHIDA
0cf2130c0b Update Xcode project file 
Remove files which no longer exist.
 2018-12-28 13:23:44 +09:00
Ryohei Machida
6729a13611 Merge #2002 
PiperOrigin-RevId: 227030722
 2018-12-27 15:31:14 -05:00
Gennadiy Civil
77004096e8
Update README.md 2018-12-27 12:04:11 -05:00
Gennadiy Civil
16269ae2f8 Merge pull request #2027 from ciband:chore/fix_library_json 
PiperOrigin-RevId: 227028806
 2018-12-27 11:52:54 -05:00
Chris Johnson
c0ef2cbe42
fix: Correct GitHub paths 2018-12-21 12:44:54 -06:00
Gennadiy Civil
1506131665
Update README.md 2018-12-21 13:24:39 -05:00
Gennadiy Civil
4160336cb4 Merge pull request #2013 from ciband:chore/fix_library_json 
PiperOrigin-RevId: 226493373
 2018-12-21 11:30:27 -05:00
Abseil Team
34a99e547a Googletest export 
Get rid of code generation for NiceMock / StrictMock.
They got small enough that it doesn't make sense to generate them.

PiperOrigin-RevId: 226455689
 2018-12-21 11:30:20 -05:00
Case, Matt
b93a13ec4d Improvements have been made to the example/sample makefiles for both googlemock 
and googletest.
Library files are now created and named like versions produced
by Cmake.
 2018-12-20 20:58:56 -06:00
Abseil Team
a83cc11abe Googletest export 
Add public entry point testing::RegisterTest.

PiperOrigin-RevId: 226350937
 2018-12-20 14:09:52 -05:00
Abseil Team
9494c45e75 Googletest export 
Use std::function to implement type erasure in Action, wrapping the legacy
ActionInterface if necessary.

This makes functors / std::function the primary way to implement Action; the
existing ActionInterface implementations are handled through ActionAdaptor.
The existing actions are not (yet) migrated though; they'll pay the cost of one
additional indirection - but that should be negligible.

PiperOrigin-RevId: 226126137
 2018-12-20 14:09:39 -05:00
Abseil Team
e26a3fa13c Googletest export 
Unifdef c++11-related macros from googletest now that it requires C++11.

PiperOrigin-RevId: 225905601
 2018-12-20 14:09:31 -05:00
misterg
9ab640ce5e Googletest export 
Suppress C4503 for MCVS , again

PiperOrigin-RevId: 225895719
 2018-12-17 17:57:39 -05:00
misterg
7515e39943 Googletest export 
Suppress C4503 for MCVS

PiperOrigin-RevId: 225871050
 2018-12-17 15:37:31 -05:00
Gennadiy Civil
85c4172ed6
Update README.md 
Update build badge to point to the correct location
 2018-12-17 14:03:51 -05:00
misterg
ed3f9bb229 Googletest export 
Internal Change

PiperOrigin-RevId: 225849972
 2018-12-17 13:53:46 -05:00
Abseil Team
b7dd66519f Googletest export 
Remove GTEST_REFERENCE_TO_CONST_ usage from GMock. In C++11, it's redundant.

PiperOrigin-RevId: 225719210
 2018-12-17 13:53:39 -05:00
Abseil Team
1ec20f87e3 Googletest export 
Allow container matchers to accept move-only containers.

PiperOrigin-RevId: 225667441
 2018-12-17 13:53:33 -05:00
Abseil Team
096fb37a19 Googletest export 
Replace pump'd code for DoAll with variadic templates.

PiperOrigin-RevId: 225584656
 2018-12-17 13:53:26 -05:00
Chris
0f698c830f chore: Add .vs to .gitignore for Visual Studio 2018-12-15 13:32:19 -06:00
Chris
1496f73cc4 fix: correct JSON syntax 2018-12-15 13:31:56 -06:00
Gennadiy Civil
b5f5c596a9 Merge pull request #2000 from ciband:feat/add_support_platformio 
PiperOrigin-RevId: 225552792
 2018-12-14 13:54:43 -05:00
Abseil Team
c6cb7e0335 Googletest export 
Support skipped in XML and JSON output

PiperOrigin-RevId: 225386540
 2018-12-13 16:00:21 -05:00