zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,105 Commits 10 Branches 30 Tags
0a3b403fe037ff80daa1826ae99eed41e94dea05
Commit Graph
21 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Hughes 0a3b403fe0 Fix gmock_output_test when using MSVC 
std::pair is printed as "struct std::pair<int,bool>" when using MSVC
vs "std::pair<int,bool>" with other compilers. Switch to "std::tuple", which
is the same for all compilers.

See
https://learn.microsoft.com/en-us/cpp/standard-library/pair-structure
https://learn.microsoft.com/en-us/cpp/standard-library/tuple-class

PiperOrigin-RevId: 506340295
Change-Id: Ib4ce2f74d54888a4e4173f42da1b55cc5583f7d4
 2023-02-01 09:33:23 -08:00
Tom Hughes d9251171f5 Fix sign conversion warning from clang: 
googletest/samples/prime_tables.h:81:57: error:
implicit conversion changes signedness: 'int' to 'unsigned long'
[-Werror,-Wsign-conversion]
      : is_prime_size_(max + 1), is_prime_(new bool[max + 1]) {
                                           ~~~      ~~~~^~~

PiperOrigin-RevId: 506065360
Change-Id: Ida4550562531012c089e2f9fcf530b3a78889fa3
 2023-01-31 11:37:10 -08:00
Tom Hughes 4fb7039fda Use GTEST_DISABLE_MSC_WARNINGS macros to disable warnings 
Prior to this change we had a mixture of pragmas and
GTEST_DISABLE_MSC_WARNINGS; this change consolidates all instances
to use the macros.

PiperOrigin-RevId: 505786926
Change-Id: I2be8f6304387393995081af42ed32c2ad1bba5a7
 2023-01-30 13:45:46 -08:00
Tom Hughes f1c05d4544 Use explicit short to fix MSVC compiler warning 
warning C4244: 'initializing': conversion from 'int' to 'short', possible
loss of data

PiperOrigin-RevId: 505774670
Change-Id: I3524040334a4b265bae12cfacdd2b615cbb1cfc8
 2023-01-30 12:58:34 -08:00
Tom Hughes b72202078d Test current behavior of doubles and floats in RecordProperty 
PiperOrigin-RevId: 505104193
Change-Id: I4c2758f22ee1321ed6b6662ab2668f6c5b6aa661
 2023-01-27 06:38:52 -08:00
Tom Hughes 403a968d3c Fix formatting in Python files 
PiperOrigin-RevId: 504890435
Change-Id: Ia9a89d0d7a07fe70c12f7f0202c8256c94d2f118
 2023-01-26 11:06:14 -08:00
Tom Hughes 0194f90d0e Fix Python docstrings to match style guide 
https://google.github.io/styleguide/pyguide.html#s3.8.3-functions-and-methods

PiperOrigin-RevId: 504857416
Change-Id: I7815ce27e454a120b3974ae7e2bea952108b836c
 2023-01-26 09:04:40 -08:00
Tom Hughes b495f72f1f Use more specific assertLess instead of assertTrue 
PiperOrigin-RevId: 504670738
Change-Id: Ib68b676403204098e89f536f9b8317f9f717c24d
 2023-01-25 15:01:21 -08:00
Tom Hughes f47d75faf3 Fix pylint warning 
Possible unbalanced tuple unpacking with sequence defined at line N:
left side has 1 label(s), right side has 0 value(s)
[unbalanced-tuple-unpacking]

PiperOrigin-RevId: 504640001
Change-Id: If8d6038a9acf74a409cb6b6ee30cea7745b4b303
 2023-01-25 13:03:31 -08:00
Tom Hughes 137dcd18cc Remove pylint disable comments that no longer trigger warnings 
PiperOrigin-RevId: 504633130
Change-Id: I3fdbc83975fea97aa53f7325d323adead0a30e24
 2023-01-25 12:35:34 -08:00
Tom Hughes d1ad27e0a4 Fix formatting in subset of Python files 
These files were formatted with automated tools. The remaining Python
files require some manual fix ups, so they will be fixed separately.

PiperOrigin-RevId: 504579820
Change-Id: I3923bd414bffe3ded6163ec496cd09ace3951928
 2023-01-25 09:14:26 -08:00
Tom Hughes 6c65a1ca35 Replace numeric lints with their string equivalent 
PiperOrigin-RevId: 504570278
Change-Id: Iab9c988b3a781eaafbdd97c924a74c2269125799
 2023-01-25 08:32:19 -08:00
Tom Hughes 2491710524 Fix formatting of C++ files 
PiperOrigin-RevId: 504325204
Change-Id: Iaa1d6d0ab1dccaaeef26f9cb109d530835499240
 2023-01-24 11:10:09 -08:00
Tom Hughes 408471e20c Fix formatting of Markdown files 
PiperOrigin-RevId: 504308485
Change-Id: Ia4ae97b2173b44b89aa5d987ddefd6e0c1488386
 2023-01-24 10:13:03 -08:00
Tom Hughes bdb3b0a493 Replace deprecated python calls 
assert_ -> assertTrue/assertFalse/assertIn/assertNotIn
assertEquals -> assertEqual

PiperOrigin-RevId: 502654909
Change-Id: I25d30095a83c3806606cb80d676b3c979495e6bd
 2023-01-17 12:16:29 -08:00
Tom Hughes 5cd81a7848 Fix -Wimplicit-int-float-conversion warning 
We're intentionally losing precision in this case, so add a cast.

googletest/googletest/include/gtest/gtest-printers.h:532:9: error:
implicit conversion from 'int32_t' (aka 'int') to 'float' may lose precision
[-Werror,-Wimplicit-int-float-conversion]
    if (static_cast<int32_t>(val * mulfor6 + 0.5) / mulfor6 == val) return 6;
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~

googletest/googletest/include/gtest/gtest-printers.h:544:9: error:
implicit conversion from 'int32_t' (aka 'int') to 'float' may lose precision
[-Werror,-Wimplicit-int-float-conversion]
    if (static_cast<int32_t>(val / divfor6 + 0.5) * divfor6 == val) return 6;
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~

PiperOrigin-RevId: 502646042
Change-Id: I05989ee42675b531a9907616c9582a5a7c77bed6
 2023-01-17 11:44:46 -08:00
Tom Hughes 356fc30125 Fix -Wshadow warnings 
../googlemock/test/gmock-actions_test.cc:687:36: warning: declaration of ‘v’ shadows a member of ‘testing::{anonymous}::ReturnTest_SupportsReferenceLikeReturnType_Test::TestBody()::Result’ [-Wshadow]
  687 |     Result(const std::vector<int>& v) : v(&v) {}  // NOLINT
      |            ~~~~~~~~~~~~~~~~~~~~~~~~^
../googlemock/test/gmock-actions_test.cc:686:29: note: shadowed declaration is here
  686 |     const std::vector<int>* v;
      |                             ^

../googlemock/test/gmock-actions_test.cc: In constructor ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out::Out(int)’:
../googlemock/test/gmock-actions_test.cc:720:28: warning: declaration of ‘x’ shadows a member of ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out’ [-Wshadow]
  720 |     explicit Out(const int x) : x(x) {}
      |                  ~~~~~~~~~~^
../googlemock/test/gmock-actions_test.cc:718:9: note: shadowed declaration is here
  718 |     int x;
      |         ^

PiperOrigin-RevId: 501580618
Change-Id: I584710fbbe440ec724f88746e51f3be5653c32d5
 2023-01-12 09:04:13 -08:00
Tom Hughes 9345421658 Fix GTEST_OS_ESP8266 check 
Everywhere else in the code, we check the value of GTEST_OS_ESP8266, not just
whether it is defined.

PiperOrigin-RevId: 499946909
Change-Id: I86f7e8947abb4e928fc24d1416d8237987b27845
 2023-01-05 11:15:29 -08:00
Tom Hughes e5e46b09a1 IWYU: Add missing std includes 
PiperOrigin-RevId: 499893032
Change-Id: I33304802b7c82ae2d008f3ee89df38866e5f57ba
 2023-01-05 08:44:01 -08:00
Tom Hughes 3a99ab6d83 Fix _MSC_VER check 
Use "#if defined(_MSC_VER)" instead of "#if _MSC_VER" to be consistent with other usages in the file and to work with the "-Wundef" warning.

PiperOrigin-RevId: 499471290
Change-Id: I34a9442eecf266afd74d4332cab7d39766df4ed9
 2023-01-04 06:40:48 -08:00
Tom Hughes 516940f16d Fall back to the system clock when building with newlib on a system without a monotonic clock. 
PiperOrigin-RevId: 493917905
Change-Id: I20137cfcda3671ffc8edcda2b6554aa392e3a00a
 2022-12-08 09:34:13 -08:00