From 3d1dcac4c4662498c3f50fdb35071cce96231850 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 14:15:53 +0300
Subject: change link from master to main in documentation
since master branch was changed to main, the links should be changed accordingly.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 30edaec..788b857 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ that generates stub code for GoogleTest.
## Contributing Changes
Please read
-[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/master/CONTRIBUTING.md)
+[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/main/CONTRIBUTING.md)
for details on how to contribute to this project.
Happy testing!
--
cgit v0.12
From b3f3819a62d2aad678791d64cee0fefb2e921620 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 14:21:07 +0300
Subject: Update gmock_output_test_golden.txt
---
googlemock/test/gmock_output_test_golden.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/googlemock/test/gmock_output_test_golden.txt b/googlemock/test/gmock_output_test_golden.txt
index fdf224f..467fa20 100644
--- a/googlemock/test/gmock_output_test_golden.txt
+++ b/googlemock/test/gmock_output_test_golden.txt
@@ -75,14 +75,14 @@ GMOCK WARNING:
Uninteresting mock function call - returning default value.
Function call: Bar2(0, 1)
Returns: false
-NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
[ OK ] GMockOutputTest.UninterestingCall
[ RUN ] GMockOutputTest.UninterestingCallToVoidFunction
GMOCK WARNING:
Uninteresting mock function call - returning directly.
Function call: Bar3(0, 1)
-NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
[ OK ] GMockOutputTest.UninterestingCallToVoidFunction
[ RUN ] GMockOutputTest.RetiredExpectation
unknown file: Failure
@@ -266,14 +266,14 @@ Uninteresting mock function call - taking default action specified at:
FILE:#:
Function call: Bar2(2, 2)
Returns: true
-NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
GMOCK WARNING:
Uninteresting mock function call - taking default action specified at:
FILE:#:
Function call: Bar2(1, 1)
Returns: false
-NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
[ OK ] GMockOutputTest.UninterestingCallWithDefaultAction
[ RUN ] GMockOutputTest.ExplicitActionsRunOutWithDefaultAction
--
cgit v0.12
From 358a3f6e3ebba782b0e04011ffb4f4202355fae9 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 14:31:03 +0300
Subject: documentation, change mater branch to main
---
docs/samples.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/samples.md b/docs/samples.md
index 2d97ca5..c11177b 100644
--- a/docs/samples.md
+++ b/docs/samples.md
@@ -1,7 +1,7 @@
# Googletest Samples
If you're like us, you'd like to look at
-[googletest samples.](https://github.com/google/googletest/tree/master/googletest/samples)
+[googletest samples.](https://github.com/google/googletest/tree/main/googletest/samples)
The sample directory has a number of well-commented samples showing how to use a
variety of googletest features.
--
cgit v0.12
From 1b772a9bc4aad97764840000c52309de42d7ae48 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 14:36:10 +0300
Subject: documentation, change mater branch to main
---
docs/_layouts/default.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index dcb42d9..c7f331b 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -48,7 +48,7 @@
<div class="footer">
GoogleTest ·
<a href="https://github.com/google/googletest">GitHub Repository</a> ·
- <a href="https://github.com/google/googletest/blob/master/LICENSE">License</a> ·
+ <a href="https://github.com/google/googletest/blob/main/LICENSE">License</a> ·
<a href="https://policies.google.com/privacy">Privacy Policy</a>
</div>
</div>
--
cgit v0.12
From f2f099fb7034370927ff8b62ce7892c485a8565a Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 16:09:54 +0300
Subject: Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b3f5043..3aba7f6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -80,7 +80,7 @@ fairly rigid coding style, as defined by the
[google-styleguide](https://github.com/google/styleguide) project. All patches
will be expected to conform to the style outlined
[here](https://google.github.io/styleguide/cppguide.html). Use
-[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
+[.clang-format](https://github.com/google/googletest/blob/main/.clang-format)
to check your formatting.
## Requirements for Contributors
--
cgit v0.12
From b59ae848d16b3f3f5f20e38f91c70d748fe733f2 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 16:12:54 +0300
Subject: Update faq.md
---
docs/faq.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/faq.md b/docs/faq.md
index c849aff..1928097 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -267,7 +267,7 @@ If necessary, you can continue to derive test fixtures from a derived fixture.
GoogleTest has no limit on how deep the hierarchy can be.
For a complete example using derived test fixtures, see
-[sample5_unittest.cc](https://github.com/google/googletest/blob/master/googletest/samples/sample5_unittest.cc).
+[sample5_unittest.cc](https://github.com/google/googletest/blob/main/googletest/samples/sample5_unittest.cc).
## My compiler complains "void value not ignored as it ought to be." What does this mean?
--
cgit v0.12
From fde6af67908ce431d7c08fa81781978b988fdb73 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 16:21:35 +0300
Subject: documentation, change mater branch to main
---
googletest/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/googletest/README.md b/googletest/README.md
index d26b309..60aaede 100644
--- a/googletest/README.md
+++ b/googletest/README.md
@@ -9,7 +9,7 @@ depends on which build system you use, and is usually straightforward.
### Build with CMake
GoogleTest comes with a CMake build script
-([CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt))
+([CMakeLists.txt](https://github.com/google/googletest/blob/main/CMakeLists.txt))
that can be used on a wide range of platforms ("C" stands for cross-platform.).
If you don't have CMake installed already, you can download it for free from
<http://www.cmake.org/>.
@@ -140,7 +140,7 @@ command line. Generally, these macros are named like `GTEST_XYZ` and you define
them to either 1 or 0 to enable or disable a certain feature.
We list the most frequently used macros below. For a complete list, see file
-[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h).
+[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/main/googletest/include/gtest/internal/gtest-port.h).
### Multi-threaded Tests
--
cgit v0.12
From df4b8edee0928a080852237c9a3443aaa68af7b9 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:48:05 +0300
Subject: Update advanced.md
master branch changed to main branch in links
---
docs/advanced.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/advanced.md b/docs/advanced.md
index 9a752b9..bce983c 100644
--- a/docs/advanced.md
+++ b/docs/advanced.md
@@ -1142,8 +1142,8 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FooTest);
You can see [sample7_unittest.cc] and [sample8_unittest.cc] for more examples.
-[sample7_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample7_unittest.cc "Parameterized Test example"
-[sample8_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters"
+[sample7_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample7_unittest.cc "Parameterized Test example"
+[sample8_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters"
### Creating Value-Parameterized Abstract Tests
@@ -1294,7 +1294,7 @@ TYPED_TEST(FooTest, HasPropertyA) { ... }
You can see [sample6_unittest.cc] for a complete example.
-[sample6_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample6_unittest.cc "Typed Test example"
+[sample6_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample6_unittest.cc "Typed Test example"
## Type-Parameterized Tests
@@ -1733,7 +1733,7 @@ You can do so by adding one line:
Now, sit back and enjoy a completely different output from your tests. For more
details, see [sample9_unittest.cc].
-[sample9_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample9_unittest.cc "Event listener example"
+[sample9_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample9_unittest.cc "Event listener example"
You may append more than one listener to the list. When an `On*Start()` or
`OnTestPartResult()` event is fired, the listeners will receive it in the order
@@ -1760,7 +1760,7 @@ by the former.
See [sample10_unittest.cc] for an example of a failure-raising listener.
-[sample10_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample10_unittest.cc "Failure-raising listener example"
+[sample10_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample10_unittest.cc "Failure-raising listener example"
## Running Test Programs: Advanced Options
--
cgit v0.12
From dfa990f9426797abfc10e2ec02ff9ccdbe8b4619 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:50:36 +0300
Subject: Update gmock-spec-builders.cc
---
googlemock/src/gmock-spec-builders.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 658ad3f..78fbdfa 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -295,7 +295,7 @@ void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
"call should not happen. Do not suppress it by blindly adding "
"an EXPECT_CALL() if you don't mean to enforce the call. "
"See "
- "https://github.com/google/googletest/blob/master/docs/"
+ "https://github.com/google/googletest/blob/main/docs/"
"gmock_cook_book.md#"
"knowing-when-to-expect for details.\n",
stack_frames_to_skip);
--
cgit v0.12
From 64df55449acb3b0c2e9de2ded58def728f8e3114 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:51:44 +0300
Subject: Update gtest-death-test.cc
---
googletest/src/gtest-death-test.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index e6abc62..5c9d3f2 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -249,7 +249,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
msg << "detected " << thread_count << " threads.";
}
msg << " See "
- "https://github.com/google/googletest/blob/master/docs/"
+ "https://github.com/google/googletest/blob/main/docs/"
"advanced.md#death-tests-and-threads"
<< " for more explanation and suggested solutions, especially if"
<< " this is the last message you see before your test times out.";
--
cgit v0.12
From 66d2463610e5db956e742e4267312169b0a84958 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:53:40 +0300
Subject: Update gmock-spec-builders_test.cc
master branch changed to main in link
---
googlemock/test/gmock-spec-builders_test.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc
index 122d5b9..bb1e83e 100644
--- a/googlemock/test/gmock-spec-builders_test.cc
+++ b/googlemock/test/gmock-spec-builders_test.cc
@@ -2059,7 +2059,7 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
"call should not happen. Do not suppress it by blindly adding "
"an EXPECT_CALL() if you don't mean to enforce the call. "
"See "
- "https://github.com/google/googletest/blob/master/docs/"
+ "https://github.com/google/googletest/blob/main/docs/"
"gmock_cook_book.md#"
"knowing-when-to-expect for details.";
--
cgit v0.12
From 1547c2acc833f53263b23fdea7fe1eeddd792933 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:55:28 +0300
Subject: Update gmock-actions.h
master branch changed to main in links
---
googlemock/include/gmock/gmock-actions.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h
index c785ad8..7e78c09 100644
--- a/googlemock/include/gmock/gmock-actions.h
+++ b/googlemock/include/gmock/gmock-actions.h
@@ -122,7 +122,7 @@
// MORE INFORMATION:
//
// To learn more about using these macros, please search for 'ACTION' on
-// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
+// https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md
// IWYU pragma: private, include "gmock/gmock.h"
// IWYU pragma: friend gmock/.*
--
cgit v0.12
From d0af91ead3983b0eacae3efa5bf3a2b368141bb0 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:56:59 +0300
Subject: Update gmock-matchers.h
branch master changed to main on link
---
googlemock/include/gmock/gmock-matchers.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index 6282901..186a95c 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -240,7 +240,7 @@
//
// To learn more about using these macros, please search for 'MATCHER'
// on
-// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
+// https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md
//
// This file also implements some commonly used argument matchers. More
// matchers can be defined by the user implementing the
--
cgit v0.12
From dd72ed19fe52f2dbca3b354d9a49eb4124693b99 Mon Sep 17 00:00:00 2001
From: assafpr <93249401+assafpr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:59:06 +0300
Subject: Update gtest.cc
fix a broken link
---
googletest/src/gtest.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 6f31dd2..1b9c51b 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -6037,7 +6037,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
// each TestSuite and TestInfo object.
// If shard_tests == true, further filters tests based on sharding
// variables in the environment - see
-// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
+// https://github.com/google/googletest/blob/main/docs/advanced.md
// . Returns the number of tests that should run.
int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL
--
cgit v0.12