From daaed2b6cb7ba4165636a7de20a691e4e78a7d38 Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Mon, 14 Aug 2017 18:07:55 +0200
Subject: [PATCH 1/7] fix typo in comment and string (SetUpTestCase)
---
googletest/test/gtest_unittest.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index 1d3c7c7a..0ae8e035 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -3115,13 +3115,13 @@ TEST(DISABLED_TestCase, DISABLED_TestShouldNotRun) {
FAIL() << "Unexpected failure: Test in disabled test case should not be run.";
}
-// Check that when all tests in a test case are disabled, SetupTestCase() and
+// Check that when all tests in a test case are disabled, SetUpTestCase() and
// TearDownTestCase() are not called.
class DisabledTestsTest : public Test {
protected:
static void SetUpTestCase() {
FAIL() << "Unexpected failure: All tests disabled in test case. "
- "SetupTestCase() should not be called.";
+ "SetUpTestCase() should not be called.";
}
static void TearDownTestCase() {
From fe760e9c6d92f55c04c000ae65df2336ede42eea Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Tue, 29 Aug 2017 15:27:54 +0200
Subject: [PATCH 2/7] fix typo: xUnit
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 3efd2ebf..f858833d 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ in its interior [googletest/README.md](googletest/README.md) file.
## Features ##
- * An [XUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
+ * An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
* Test discovery.
* A rich set of assertions.
* User-defined assertions.
From 4a451575895dc665db33cd940b47f38e804a291d Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Tue, 29 Aug 2017 17:04:15 +0200
Subject: [PATCH 3/7] switch on verbose make
---
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3204dfac..a8c27409 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,9 @@ compiler:
script: ./travis.sh
env:
matrix:
- - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE
- - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE
- - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11 VERBOSE_MAKE=true VERBOSE
+ - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
+ - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
+ - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11
# - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
# - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
notifications:
From d33861dca6fac5482f0c82a413a2571172d16fac Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Tue, 29 Aug 2017 17:41:26 +0200
Subject: [PATCH 4/7] run combined build only
There is no need for separate 'googlemock' and 'googletest' builds,
as the 'googlemock' build includes 'googletest' and it's unit tests.
---
.travis.yml | 7 ++-----
travis.sh | 5 ++---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a8c27409..c155e571 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,11 +36,8 @@ compiler:
script: ./travis.sh
env:
matrix:
- - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
- - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
- - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11
-# - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
-# - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
+ - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
+ - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11
notifications:
email: false
sudo: false
diff --git a/travis.sh b/travis.sh
index bdecbd96..1b23a3d4 100755
--- a/travis.sh
+++ b/travis.sh
@@ -3,13 +3,12 @@ set -evx
env | sort
mkdir build || true
-mkdir build/$GTEST_TARGET || true
-cd build/$GTEST_TARGET
+cd build
cmake -Dgtest_build_samples=ON \
-Dgmock_build_samples=ON \
-Dgtest_build_tests=ON \
-Dgmock_build_tests=ON \
-DCMAKE_CXX_FLAGS=$CXX_FLAGS \
- ../../$GTEST_TARGET
+ ..
make
CTEST_OUTPUT_ON_FAILURE=1 make test
From 29c07aa9dbeb622a6f8f0d1d07c9f139e18b5dca Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Tue, 29 Aug 2017 21:19:45 +0200
Subject: [PATCH 5/7] remove Yob's comma mentioned in issue #1105
---
googlemock/docs/CookBook.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md
index 6ea7f3a9..fa2d2fd0 100644
--- a/googlemock/docs/CookBook.md
+++ b/googlemock/docs/CookBook.md
@@ -148,7 +148,7 @@ Note that the mock class doesn't define `AppendPacket()`, unlike the
real class. That's fine as long as the test doesn't need to call it.
Next, you need a way to say that you want to use
-`ConcretePacketStream` in production code, and use `MockPacketStream`
+`ConcretePacketStream` in production code and to use `MockPacketStream`
in tests. Since the functions are not virtual and the two classes are
unrelated, you must specify your choice at _compile time_ (as opposed
to run time).
From bb8399e1baf9d984894a54ba1e6e9e4d20c11a35 Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Tue, 29 Aug 2017 21:20:46 +0200
Subject: [PATCH 6/7] use plural verb as mentioned in issue #1105
---
googlemock/docs/CookBook.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md
index fa2d2fd0..753c6dd3 100644
--- a/googlemock/docs/CookBook.md
+++ b/googlemock/docs/CookBook.md
@@ -706,7 +706,7 @@ type `m` accepts):
1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
-The code won't compile if any of these conditions isn't met.
+The code won't compile if any of these conditions aren't met.
Here's one example:
From f0c72bfe09af0c5b6d48eb48456e2c4fca8858d7 Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Wed, 30 Aug 2017 12:19:59 +0200
Subject: [PATCH 7/7] fix SetUp/TearDownTestCase() in AdvancedGuide
fixes issue #1087
---
googletest/docs/AdvancedGuide.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/googletest/docs/AdvancedGuide.md b/googletest/docs/AdvancedGuide.md
index a454bf45..1076496d 100644
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
@@ -1623,8 +1623,8 @@ printf("We are in test %s of test case %s.\n",
```
`current_test_info()` returns a null pointer if no test is running. In
-particular, you cannot find the test case name in `TestCaseSetUp()`,
-`TestCaseTearDown()` (where you know the test case name implicitly), or
+particular, you cannot find the test case name in `SetUpTestCase()`,
+`TearDownTestCase()` (where you know the test case name implicitly), or
functions called from them.
_Availability:_ Linux, Windows, Mac.