Commit Graph

389 Commits

Author SHA1 Message Date
misterg
3a460a26b7 Googletest export
TestCase->TestSuite refactoring

PiperOrigin-RevId: 227702164
2019-01-03 16:40:20 -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
Ryohei Machida
6729a13611 Merge #2002
PiperOrigin-RevId: 227030722
2018-12-27 15:31:14 -05: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
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
ed3f9bb229 Googletest export
Internal Change

PiperOrigin-RevId: 225849972
2018-12-17 13:53:46 -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
Abseil Team
26743363be Googletest export
Applied fixes for ClangTidy modernize-use-override and modernize-use-using.

PiperOrigin-RevId: 223800219
2018-12-03 12:54:11 -05:00
durandal
8fbf9d16a6 Googletest export
Fix: remove two added testcases that depend on gmock; I'll put them back later in a way that doesn't break the build.
PiperOrigin-RevId: 223227562
2018-11-28 23:10:23 -05:00
durandal
b22d23667b Googletest export
Accept gmock matchers in EXPECT_EXIT and friends to allow matches other than simple regex matches on death output.

PiperOrigin-RevId: 223035409
2018-11-28 23:10:17 -05:00
durandal
8e86f67261 Googletest export
Move the Matcher<T> interface to googletest so I can use it to extend death test regex matching in a subsequent change.

PiperOrigin-RevId: 221675910
2018-11-20 13:29:20 -05:00
Robin Lindén
c43603f288
Remove GTEST_HAS_HASH_SET/MAP check 2018-11-10 15:27:33 +01:00
krzysio
105579a6e4 Googletest export
Improve Bazel build files.

New target gtest_prod allows access to the FRIEND_TEST macro without depending on the entirety of GTest in production executables. Additionally, duplicate config_setting rules were removed and formatting was adjusted.

PiperOrigin-RevId: 220279205
2018-11-07 14:37:18 -05:00
misterg
e857f9cdd9 Googletest export
Remove scoped_ptr replace with std::unique_ptr

PiperOrigin-RevId: 219291284
2018-10-30 21:20:43 -04:00
Gennadiy Civil
e9085769d4 Merge pull request #1941 from barkovv:master
PiperOrigin-RevId: 219134349
2018-10-29 13:46:24 -04:00
misterg
80b43d900b Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 219129336
2018-10-29 13:46:16 -04:00
Vadim Barkov
53d61b5b23 Replaced all NULLs with nullptr in googletest 2018-10-28 03:10:37 +03:00
Abseil Team
b57c703963 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218618184
2018-10-26 14:19:59 -04:00
misterg
a50e4f05b3 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218571466
2018-10-26 14:19:51 -04:00
durandal
59f90a338b Googletest export
Honor GTEST_SKIP() in SetUp().

PiperOrigin-RevId: 218387359
2018-10-24 11:26:16 -04:00
Abseil Team
82987067d8 Googletest export
Change ValuesArray to require much less template instantiation depth.

PiperOrigin-RevId: 218170842
2018-10-22 11:29:14 -04:00
Gennadiy Civil
c955e33497
Merge branch 'master' into python3-tests 2018-10-19 13:30:13 -07:00
misterg
663ef8636a Googletest export
New variadic implementation for gtest-param-test
Removed non-variadic implementation and added variadic for ValueArray and Values

PiperOrigin-RevId: 217703627
2018-10-18 11:32:37 -04:00
misterg
864b6c2d35 Remove duplicate functionality PrintValue (in googletest-param-test-test.cc), use testing::PrintToString
PiperOrigin-RevId: 216733373
2018-10-11 16:15:32 -04:00
KO Myung-Hun
b3b19a796c Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77
Closes #1899

PiperOrigin-RevId: 216719020
2018-10-11 13:31:25 -04:00
Abseil Team
bc6a4ce380 Project import generated by Copybara.
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
0e71eb069a Internal Change
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
Abseil Team
7d3b73c85a Unconditionally use std::tuple.
Remove all mention of TR1 tuple and our own implementation of tuple.

PiperOrigin-RevId: 216395043
2018-10-09 16:25:58 -04:00
Gennadiy Civil
689ac9fbd0
Update BUILD.bazel
Remove references to googletest-tuple-test.cc
2018-10-09 15:42:49 -04:00
Gennadiy Civil
3149e0e88b
Merge branch 'master' into python3-tests 2018-10-05 16:23:55 -04:00
Abseil Team
4bb49ed640 Apply clang-tidy modernize-use-nullptr to googletest.
Now that googletest has moved to C++11, it should no longer
use NULL or 0 for the null pointer. This patch converts all
such usages to nullptr using clang-tidy.

This prevents LLVM from issuing -Wzero-as-null-pointer-constant
warnings.

PiperOrigin-RevId: 215814400
2018-10-05 12:54:14 -04:00
misterg
f13bbe2992 Remove checking for C++ 11 and a pre-C++11 test from googletest tests
PiperOrigin-RevId: 215789971
2018-10-04 16:10:50 -04:00
Gennadiy Civil
4b82df5bb3
Merge branch 'master' into python3-tests 2018-10-04 15:08:14 -04:00
Arseny Aprelev
00938b2b22 Merge 2ce0685f76a4db403b7b2650433a584c150f2108 into 75e834700d
Closes #1544
With refinements and changes

PiperOrigin-RevId: 215273083
2018-10-02 13:03:28 -04:00
Gennadiy Civil
907ae9edad
Merge branch 'master' into python3-tests 2018-09-25 22:09:27 -07:00
Abseil Team
2b016ca493 Googletest export
Project import generated by Copybara.

PiperOrigin-RevId: 214456152
2018-09-25 13:05:37 -04:00
misterg
b2788286d1 Googletest export
Project import generated by Copybara.

PiperOrigin-RevId: 214441835
2018-09-25 13:05:25 -04:00
Abseil Team
0fc5466dbb Googletest export
Project import generated by Copybara.
Including recently accepted and merged PRs

PiperOrigin-RevId: 213856848
2018-09-25 13:05:03 -04:00
Gennadiy Civil
a4f57cf49a
Merge branch 'master' into python3-tests 2018-09-25 00:10:15 -07:00
Gennadiy Civil
81c0b876b4
Formatting 2018-09-23 09:42:11 -07:00
Gennadiy Civil
5293383707
Formatting 2018-09-23 09:35:25 -07:00
Jonny007-MKD
67d3c0f6d7 Fix unit test 2018-09-23 16:39:13 +02:00
Jonny007-MKD
2b2b8d71c1 Fix ColoredOutputTest.UsesColorsWhenTermSupportsColors again 2018-09-23 15:50:29 +02:00
Jonny007-MKD
cecea92af8 Rename private member of AdditionalMessage
Shorten lines in unit tests
2018-09-23 15:46:47 +02:00
Jonny007-MKD
1cb10b357a Readded changes from 6494f5232b 2018-09-23 15:15:38 +02:00
Gennadiy Civil
90943525c5
Merge branch 'master' into python3-tests 2018-09-20 14:30:26 -04:00
Gennadiy Civil
8bf297233f
Merge pull request #1843 from matlo607/fix-unittest-msys-ColoredOutputTest
[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors
2018-09-20 11:42:29 -04:00
Abseil Team
1b20bd176f Googletest export
support printing std::reference_wrapper<T> in gUnit

PiperOrigin-RevId: 213270392
2018-09-20 11:01:16 -04:00
Matthieu Longo
c9fe337ae2 [msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors 2018-09-18 18:29:42 +02:00
Peter Levine
149c0d2414 Fix Python3 support 2018-09-14 19:40:51 -04:00
Jonny007-MKD
6494f5232b Print message of unexpected std::exception in EXPECT_THROW, too 2018-09-14 23:22:04 +02:00
Jonny007-MKD
631e3a5838
Merge branch 'master' into master 2018-09-14 22:39:45 +02:00
misterg
bc9df6ad46 Googletest export
Removing checks for C++11 from unit tests

PiperOrigin-RevId: 212990514
2018-09-14 14:52:40 -04:00
Jonny007-MKD
82eeb009b2 Make it public again *sigh* 2018-09-13 14:49:15 +02:00
Jonny007-MKD
8c849c584c Try to fix gcc and clang issues 2018-09-13 13:57:27 +02:00
Jonny007-MKD
0354ccb049 Added special catch for std::exception in GTEST_TEST_NO_THROW_ 2018-09-13 10:24:10 +02:00
Georgi D. Sotirov
94046c91db
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env to avoide comilation error (with -Werror)
The unused attribute was removed with commit 3299a23 on 2018-02-23, but it currently breaks build of 1.8.1, because of -Werror GCC parameter as reported in issue #1825.
2018-09-12 10:44:52 +03:00
Gennadiy Civil
6dd60ec437
Update googletest-output-test-golden-lin.txt 2018-08-31 10:26:59 -04:00
Gennadiy Civil
76af254c47
Update googletest-output-test-golden-lin.txt
manual update golden lin
2018-08-30 21:46:15 -04:00
Gennadiy Civil
0ecf38f3a2
Update googletest-output-test-golden-lin.txt
manual update, golden lin
2018-08-30 21:42:07 -04:00
misterg
41b539941f Googletest export
Silence MSVC warnings

PiperOrigin-RevId: 210726964
2018-08-30 21:33:02 -04:00
Abseil Team
00d1ffc8c8 Googletest export
Fix the typed test names in the tests for customized typed test parameters.

As required by googletest documentation, the names should not contain an underscore.

PiperOrigin-RevId: 210678652
2018-08-30 21:32:54 -04:00
misterg
2cc008538c Googletest export
Internal Change

PiperOrigin-RevId: 210594341
2018-08-30 21:32:41 -04:00
Gennadiy Civil
e103fa4f2a
Disable MCVS warnings 2018-08-28 23:55:17 -04:00
Gennadiy Civil
9b2016a01d
typo 2018-08-28 23:46:23 -04:00
Gennadiy Civil
e8e26d25bd
typo 2018-08-28 23:36:50 -04:00
Gennadiy Civil
8c0e0d5c17
MSVC warnings silence 2018-08-28 23:25:51 -04:00
Gennadiy Civil
9d9d7a6a89
Update googletest-output-test-golden-lin.txt 2018-08-28 23:11:51 -04:00
Abseil Team
03867b5389 Googletest export
Add the possibility of specifying the name in type parameterized tests.

Similar to how the last parameter of INSTANTIATE_TEST_CASE_P allows to override the name for (non-type) parametrized tests, this adds the possibility of adding a parameter to INSTANTIATE_TYPED_TEST_CASE_P. The argument has to be a class, which contains a static templated function GetName<T>(int), returning the name for type T.

PiperOrigin-RevId: 210532231
2018-08-28 16:53:45 -04:00
Abseil Team
52f8183e7f Googletest export
Breaks Windows builds

PiperOrigin-RevId: 210434120
2018-08-28 16:53:38 -04:00
Abseil Team
167c5e8188 Googletest export
Fix Theta(N^2) memory usage of EXPECT_EQ(string) when the strings don't match.

The underlying CalculateOptimalEdits() implementation used a simple
dynamic-programming approach that always used N^2 memory and time. This meant
that tests for equality of large strings were ticking time bombs: They'd work
fine as long as the test passed, but as soon as the strings differed the test
would OOM, which is very hard to debug.
I switched it out for a Dijkstra search, which is still worst-case O(N^2), but
in the usual case of mostly-matching strings, it is much closer to linear.

PiperOrigin-RevId: 210405025
2018-08-28 16:53:30 -04:00
David Schuldenfrei
603ce4b81d Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7
Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286
2018-08-27 12:22:33 -04:00
Gennadiy Civil
f0e4c411ca more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
bbf738a2c1 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
265efde9a5 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
a3c0dd0f4d Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
2421eff9f7
Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil
f225735222 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil
390a6b7932 Mode change on a python script 2018-08-10 15:42:16 -04:00
Gennadiy Civil
acaf5beacc formatting and small changes related to code management, no functionality changes 2018-08-09 13:37:11 -04:00
Loo Rong Jie
24786cb498
Merge branch 'master' into deprecate 2018-08-09 20:08:44 +08:00
Gennadiy Civil
00fc0d24d1 Formatting tweaks, no functionality changes 2018-08-08 15:14:21 -04:00
Gennadiy Civil
41e82cadf4 upsream additional printer test 2018-08-07 14:05:42 -04:00
Gennadiy Civil
b345bf9090 Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
Gennadiy Civil
61f949387e
Merge branch 'master' into deprecate 2018-08-03 12:05:07 -04:00
Philipp Paulweber
1da26a77c5
Printers test: fixed compilation bug, due to unnecessary parentheses in declaration 2018-08-03 12:01:30 +02:00
Gennadiy Civil
b929d55704 cmake fixes 2018-08-02 17:46:43 -04:00
Gennadiy Civil
0d29f9702d more fixes 2018-08-02 17:32:43 -04:00
Gennadiy Civil
94f2c6faa7 fixes tests 2018-08-02 16:51:03 -04:00
Gennadiy Civil
677df883ec cmake test fixes 2018-08-02 16:24:09 -04:00
Gennadiy Civil
f3511bf1c7 cleaning up and adding test changes to CMake 2018-08-02 14:56:33 -04:00
Gennadiy Civil
bbc0ac9b1a Merge branch 'master' of https://github.com/google/googletest 2018-08-01 17:26:04 -04:00
Gennadiy Civil
8dea630e88 various changes to tests 2018-08-01 17:06:17 -04:00
Gennadiy Civil
421f527df3 more test changes 2018-08-01 16:23:20 -04:00
Gennadiy Civil
7001dff4fc adding googletest-json-output unitest 2018-08-01 16:12:09 -04:00
Gennadiy Civil
09fc73dde9 more test changes 2018-08-01 15:34:30 -04:00
Gennadiy Civil
96077bc9f3 more tests changes 2018-08-01 15:02:28 -04:00
Gennadiy Civil
b888e23fce googletest list tests unitest 2018-08-01 13:49:29 -04:00
Gennadiy Civil
35aa4fe924 gtest catch exceptions test and gtest shuffle test 2018-08-01 13:32:07 -04:00
Gennadiy Civil
a28968d698 changes to googletest break on failure and googletest filter unittests 2018-08-01 11:46:43 -04:00
Gennadiy Civil
d75922ca1c changes for googletest env var test 2018-08-01 11:35:13 -04:00
Gennadiy Civil
38486eb03e googltest-color-test changes 2018-08-01 11:32:08 -04:00
Gennadiy Civil
6324796be1 googletest-output-test changes 2018-08-01 11:28:24 -04:00
Gennadiy Civil
16c65a476a
Merge branch 'master' into master 2018-08-01 11:09:34 -04:00
Gennadiy Civil
539ee4bc54 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil
6cacb41935
Merge branch 'master' into deprecate 2018-07-26 13:04:53 -04:00
Piotr Kąkol
309e8a271e Updated broken and outdated URLs 2018-07-25 19:19:26 +02:00
Gennadiy Civil
ed1edf641d Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Loo Rong Jie
3a8d744030 Disable MSVC function deprecation when using Clang 2018-07-13 21:23:28 +08:00
Derek Mauro
4c41787764 Adds stacktrace support from Abseil to Google Test
This change adds the ability to generate stacktraces in Google Test on
both failures of assertions/expectations and on crashes. The
stacktrace support is conditionally available only when using Abseil
with Google Test.

To use this support, run the test under Bazel with a command like this:

bazel test --define absl=1 --test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1 //path/to/your:test

The "--define absl=1" part enables stacktraces on assertion/expectation
failures.

The "--test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1" part enables
the signal handler that logs a stacktrace in the event of a crash
(this also requires the "--define absl=1" part). This is not the
default since it may interfere with existing tests.
2018-07-10 14:30:42 -04:00
Rohan Joyce
0563b52d3a Eliminate GTEST_TEST_FILTER_ENV_VAR_.
GTEST_TEST_FILTER_ENV_VAR_ was used to specify an environment variable to obtain
the default test filter from. By default it was unset which broke
"--test_filter" for bazel. This CL eliminates GTEST_TEST_FILTER_ENV_VAR_ and
explicitly obtains the default test filter from the environment variable
TESTBRIDGE_TEST_ONLY if it exists.
2018-06-14 15:45:55 -04:00
Gennadiy Civil
f66ab00704 Upstream, cl/199129756
Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
2018-06-04 10:45:56 -04:00
Gennadiy Civil
28c91e2cea Formatting changes 2018-05-23 11:03:31 -04:00
James Dennett
89286a4cdf
Merge branch 'master' into StdLibVersioning 2018-05-21 10:57:01 -07:00
James Dennett
b8fa4d2754
Add unit test for CanonicalizeForStdLibVersioning. 2018-05-10 22:33:29 -07:00
Jae Heon Lee
ec5ad0f869 Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively. 2018-05-07 14:09:37 -07:00
Fabrice de Gans-Riberi
13af91faff Fix more stuff and get tests to pass 2018-05-03 12:06:45 -07:00
Gennadiy Civil
c13ab6003b merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil
d52aaee8eb Upstreaming, cl 191344765 2018-04-03 16:14:35 -04:00
Gennadiy Civil
3df7cbe6f7 merges, gtest 2018-03-26 13:04:28 -04:00
Gennadiy Civil
4e89c76db8 reverting gtest_list_tests_unittest.py 2018-03-22 12:37:38 -04:00
Gennadiy Civil
da71e8c870 more merges 2018-03-22 10:58:18 -04:00
Gennadiy Civil
0f6567954f more merges 2018-03-22 10:56:35 -04:00
Gennadiy Civil
a3c2e107ae cl 189032107, again 2018-03-16 15:56:31 -04:00
Gennadiy Civil
a178cc7ef7 merge, again, IsRecursiveContainer 2018-03-15 14:31:37 -04:00
Gennadiy Civil
262aaf2f1d erging, cont 2018-03-14 10:49:18 -04:00
Gennadiy Civil
2814b4b089 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil
a719320a3c fixing, was removing too much 2018-03-13 11:53:27 -04:00
Gennadiy Civil
5461f63d01 Merge branch 'master' of https://github.com/google/googletest 2018-03-13 11:13:58 -04:00
Gennadiy Civil
af463c43ac More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Bernhard Bauer
fc437ef4b2
Merge branch 'master' into upstream_188748737 2018-03-12 18:15:35 +00:00
Bernhard Bauer
7b70413e0c Allow macros inside of parametrized test names.
This allows doing things like TEST_P(TestFixture, MAYBE(TestName))
for nicer conditional test disabling.

Upstream of cr/188748737.

Tested:
Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
2018-03-12 18:14:06 +00:00
Gennadiy Civil
e891900666 Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil
086825de5d merges-6 2018-03-05 14:21:41 -05:00
Gennadiy Civil
8385928428 merges-3 2018-03-05 13:51:39 -05:00
Petr Hosek
6baf17e9d1 Support JSON output format in addition to XML
This change allows emitting output in JSON format in addition to the
already supported XML format. The implementation as well as the file
structure is intentionally modelled after the XML one.
2018-02-28 00:48:41 -08:00
Victor Costan
84ec2e0365 Switch default death test style back to "fast".
Google Test has recently (02/09/2018) switched the default death test
style from "fast" to "threadsafe" in
ec7faa943d

Threadsafe death tests have been used internally for a while, and are
proven to be a better default.

However, adopting this better default can be challenging for large
projects with a significant investment in custom infrastructure built on
top of Google Test. The same custom infrastructure can make it difficult
for large projects to switch back to the old default by passing in
--gtest_death_test_style=fast.

For the reasons above, the default switch is considered too disruptive,
and this CL reverts it. This CL also introduces the
GTEST_DEFAULT_DEATH_TEST_STYLE preprocesor macro, which replaces the
hard-coded default. The macro can be defined in
gtest/internal/custom/gtest-port.h by projects that are ready to migrate
to thread-safe death tests.
2018-02-27 07:50:03 -08:00
Gennadiy Civil
4dbb437174 merging unittests - 5 2018-02-26 09:51:27 -05:00
Gennadiy Civil
004f6a00b2 merging unitests - check 4 2018-02-23 15:27:11 -05:00
Gennadiy Civil
29e9ca8774 merging unitests, check 2018-02-23 11:29:35 -05:00
Gennadiy Civil
3299a2386c merging unittests - 2 2018-02-23 11:07:18 -05:00
Gennadiy Civil
b7e0294c51 merging unitests 2018-02-23 10:47:11 -05:00
Gennadiy Civil
df65632489 merges 2018-02-22 15:53:14 -05:00
Gennadiy Civil
09581b3852 cleanup/merges 2018-02-13 14:56:05 -05:00
Gennadiy Civil
069724197c merging, cleaning up 2018-02-13 14:13:52 -05:00
Gennadiy Civil
ab186a8c49 merges 2018-02-13 13:49:57 -05:00
Gennadiy Civil
30d276da03 cxxx11 2018-02-13 11:48:32 -05:00
Gennadiy Civil
3b1fe3ec45 clang warnings 2018-02-13 11:24:09 -05:00
Gennadiy Civil
d7c966c4de clang warnings 2018-02-13 11:15:03 -05:00
Gennadiy Civil
2a23ca0009 https://travis-ci.org/google/googletest/jobs/340995238 2018-02-13 11:05:01 -05:00
Gennadiy Civil
a66d209061 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' 2018-02-13 10:23:42 -05:00
Gennadiy Civil
e76f4ee9fd clang warning https://travis-ci.org/google/googletest/jobs/340978022 2018-02-13 10:05:43 -05:00
Gennadiy Civil
9e072812e3 merges 2018-02-13 09:45:12 -05:00
Gennadiy Civil
d84f58ab10 Merging, coniniue 2018-02-12 14:07:45 -05:00
Gennadiy Civil
b324a36c35
Merge branch 'master' into assert 2018-02-09 11:42:05 -05:00
Gennadiy Civil
22a115055a
Merge pull request #1446 from tholsapp/master
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
ec7faa943d merges 2018-02-09 10:41:09 -05:00
Troy Holsapple
c8510504dd Fixed typos 2018-02-07 22:06:00 -08:00
Alexey Sokolov
092d088533 Add ability to throw from ASSERT
while not losing benefits of EXPECT, and not killing the whole test,
as with --gtest_throw_on_failure.

183822976
2018-02-08 01:15:42 +00:00
Gennadiy Civil
e55fded0c8 Code merges 2018-01-30 17:34:22 -05:00
Gennadiy Civil
2a4683021a Ability to optionally depend on Abseil plus upstream of 183716547 2018-01-30 11:42:03 -05:00
Gennadiy Civil
b9651c04ef placating gcc and its overzeauls size comparison warnings 2018-01-24 16:06:08 -05:00
Gennadiy Civil
e29805aa5d upstream cl 182543808 2018-01-24 13:04:36 -05:00
Gennadiy Civil
06c3cce867 revert, lets get this compiled 2018-01-24 12:14:16 -05:00
Gennadiy Civil
80defcec57 Many code merge/upstream changes 2018-01-23 12:33:54 -05:00
Gennadiy Civil
6723b6c588 Merging, upstream http://cl/182836545 2018-01-23 10:15:28 -05:00
Gennadiy Civil
bbb17ad0f7 more code merge 2018-01-22 15:28:55 -05:00
Gennadiy Civil
f1c87ad9f5 merges, cl/155419551 and other 2018-01-22 15:20:19 -05:00
Gennadiy Civil
9bc86661f8 more merging 2018-01-22 14:43:51 -05:00
Gennadiy Civil
a0435a54ce merging 2018-01-22 14:14:05 -05:00
Gennadiy Civil
8d707dfe81 code merge 2018-01-22 11:47:30 -05:00
Gennadiy Civil
b1623e9144 Adding python tests to Bazel build file. 2018-01-18 14:32:31 -05:00
Fedor Trushkin
9c82e7745c Expose ScopedTrace utility in public interface 2018-01-17 16:41:59 +01:00
Gennadiy Civil
d630a8bdac code merges, cleanup 2018-01-10 13:58:00 -05:00
Gennadiy Civil
f33902b97a revert googletest/test/gtest-param-test_test.cc 2018-01-10 11:04:49 -05:00
Gennadiy Civil
d237297ceb code merge, cleanups 2018-01-09 22:46:17 -05:00
Loo Rong Jie
cbd15d417e [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
and x64_windows_msvc
2018-01-09 08:29:44 +08:00
Gennadiy Civil
67476c1426 Revert one file for now 2018-01-05 12:35:41 -05:00
Gennadiy Civil
19b5774ccf code cleanup in preparation for merges, cl 180857299 2018-01-04 21:49:27 -05:00
Gennadiy Civil
1c09831acc upstreaming cl 124976692 2018-01-03 16:57:05 -05:00
Gennadiy Civil
49eb76df47
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-11-07 10:32:23 -08:00
Arkadiy Shapkin
2641b021fc Fix tests with VS2015 and VS2017 2017-10-25 16:04:01 +03:00
Herbert Thielen
ceee80c383 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-10-04 21:03:47 +02:00
Jonathan Wakely
b70cf1a663 Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Herbert Thielen
98024ad202 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-09-24 10:01:52 +02:00
Gennadiy Civil
d30a37e743 Revert "Allow macros inside of parametrized test names." 2017-09-21 10:54:14 -04:00
Gennadiy Civil
ff6796877f Merge pull request #1245 from sheepmaster/2017_09_04_parametrized
Allow macros inside of parametrized test names.
2017-09-21 10:52:47 -04:00
Alexey Sokolov
c9cf07a8ba Make the failure messages from EXPECT_EQ and friends actually symmetric,
instead of reading more like reversing the former "expected" and "actual"
roles of the LHS and RHS arguments.

This patch is manually applied from internal version (125109873)
2017-09-13 18:18:20 +01:00
Herbert Thielen
c86fbd766b Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-09-08 11:47:14 +02:00
Herbert Thielen
6c0146fd00 use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function 2017-09-07 17:33:19 +02:00
Herbert Thielen
aa0b5458a1 remove GTEST_HAS_PARAM_TESTS
As mentioned in issue #360:
"Now that all the platforms gtest supports work with value-parameterized
tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from
the codebase everywhere."
https://github.com/google/googletest/issues/360
2017-09-04 19:38:35 +02:00
Herbert Thielen
55fd999adf avoid warning about unused variable 2017-09-04 17:23:41 +02:00
Herbert Thielen
8abacca52e avoid -Wshadow warning on GCC
When using INSTANTIATE_TEST_CASE_P with a lambda function which uses
'info' as parameter name, GCC complains that this would shadow
parameter 'info' used in the macro's VA_ARGS call.
2017-09-04 17:18:16 +02:00
Bernhard Bauer
86e5f0083e Add a non-parametrized test. 2017-09-04 15:46:31 +01:00
Bernhard Bauer
e7c9e80e63 Allow macros inside of parametrized test names.
This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
2017-09-04 15:46:31 +01:00
Gennadiy Civil
52b6ca3428 Merge pull request #783 from tobbi/cppcheck_perf_fixes
Performance fixes reported by cppcheck
2017-09-01 13:52:33 -04:00
Herbert Thielen
daaed2b6cb fix typo in comment and string (SetUpTestCase) 2017-08-29 14:22:09 +02:00
drgler
d93ce9d6fb Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:32 +02:00
drgler
6404d45a92 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:18:54 +02:00