diff options
author | jgm@google.com <jgm@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2012-11-15 15:47:38 +0000 |
---|---|---|
committer | jgm@google.com <jgm@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2012-11-15 15:47:38 +0000 |
commit | 03c314931649a999b0cf5deb0a434a1009157416 (patch) | |
tree | 640cd727bab672105c57f563091dc58b7a81a1be /test/gtest-param-test_test.cc | |
parent | 5d9f11fe81eaca3989ec7e8dbfe5b31608a75121 (diff) | |
download | googletest-03c314931649a999b0cf5deb0a434a1009157416.tar.gz |
Unfortunately, the svn repo is a bit out of date. This commit contains 8
changes that haven't made it to svn. The descriptions of each change are listed
below.
- Fixes some python shebang lines.
- Add ElementsAreArray overloads to gmock. ElementsAreArray now makes a copy of
its input elements before the conversion to a Matcher. ElementsAreArray can
now take a vector as input. ElementsAreArray can now take an iterator pair as
input.
- Templatize MatchAndExplain to allow independent string types for the matcher
and matchee. I also templatized the ConstCharPointer version of
MatchAndExplain to avoid calls with "char*" from using the new templated
MatchAndExplain.
- Fixes the bug where the constructor of the return type of ElementsAre() saves
a reference instead of a copy of the arguments.
- Extends ElementsAre() to accept arrays whose sizes aren't known.
- Switches gTest's internal FilePath class from testing::internal::String to
std::string. testing::internal::String was introduced when gTest couldn't
depend on std::string. It's now deprecated.
- Switches gTest & gMock from using testing::internal::String objects to
std::string. Some static methods of String are still in use. We may be able
to remove some but not all of them. In particular, String::Format() should
eventually be removed as it truncates the result at 4096 characters, often
causing problems.
git-svn-id: http://googletest.googlecode.com/svn/trunk@628 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test/gtest-param-test_test.cc')
-rw-r--r-- | test/gtest-param-test_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest-param-test_test.cc b/test/gtest-param-test_test.cc index cf61866..7b6f7e2 100644 --- a/test/gtest-param-test_test.cc +++ b/test/gtest-param-test_test.cc @@ -280,10 +280,10 @@ class DogAdder { bool operator<(const DogAdder& other) const { return value_ < other.value_; } - const ::testing::internal::String& value() const { return value_; } + const std::string& value() const { return value_; } private: - ::testing::internal::String value_; + std::string value_; }; TEST(RangeTest, WorksWithACustomType) { |