eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Distinguish between C++11 language and library support for <initializer_list>.

Browse Source 
Fix spelling: repositary -> repository.
Pull in gtest 671.
This commit is contained in:
kosak 2013-12-04 23:49:07 +00:00
parent 6414d806cd
commit 18489fa4f8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -42,7 +42,7 @@ Requirements for End Users
Google Mock is implemented on top of the Google Test C++ testing Google Mock is implemented on top of the Google Test C++ testing
framework (http://code.google.com/p/googletest/), and includes the framework (http://code.google.com/p/googletest/), and includes the
latter as part of the SVN repositary and distribution package. You latter as part of the SVN repository and distribution package. You
must use the bundled version of Google Test when using Google Mock, or must use the bundled version of Google Test when using Google Mock, or
you may get compiler/linker errors. you may get compiler/linker errors.
@ -92,7 +92,7 @@ Getting the Source
There are two primary ways of getting Google Mock's source code: you There are two primary ways of getting Google Mock's source code: you
can download a stable source release in your preferred archive format, can download a stable source release in your preferred archive format,
or directly check out the source from our Subversion (SVN) repositary. or directly check out the source from our Subversion (SVN) repository.
The SVN checkout requires a few extra steps and some extra software The SVN checkout requires a few extra steps and some extra software
packages on your system, but lets you track development and make packages on your system, but lets you track development and make
patches much more easily, so we highly encourage it. patches much more easily, so we highly encourage it.

8
include/gmock/gmock-matchers.h
View File

@ -52,8 +52,8 @@
#include "gmock/internal/gmock-port.h" #include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#if GTEST_LANG_CXX11 #if GTEST_HAS_STD_INITIALIZER_LIST_
#include <initializer_list> // NOLINT -- must be after gtest.h # include <initializer_list> // NOLINT -- must be after gtest.h
#endif #endif
namespace testing { namespace testing {
@ -3350,7 +3350,7 @@ inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
return ElementsAreArray(vec.begin(), vec.end()); return ElementsAreArray(vec.begin(), vec.end());
} }
#if GTEST_LANG_CXX11 #if GTEST_HAS_STD_INITIALIZER_LIST_
template <typename T> template <typename T>
inline internal::ElementsAreArrayMatcher<T> inline internal::ElementsAreArrayMatcher<T>
ElementsAreArray(::std::initializer_list<T> xs) { ElementsAreArray(::std::initializer_list<T> xs) {
@ -3392,7 +3392,7 @@ UnorderedElementsAreArray(const ::std::vector<T, A>& vec) {
return UnorderedElementsAreArray(vec.begin(), vec.end()); return UnorderedElementsAreArray(vec.begin(), vec.end());
} }
#if GTEST_LANG_CXX11 #if GTEST_HAS_STD_INITIALIZER_LIST_
template <typename T> template <typename T>
inline internal::UnorderedElementsAreArrayMatcher<T> inline internal::UnorderedElementsAreArrayMatcher<T>
UnorderedElementsAreArray(::std::initializer_list<T> xs) { UnorderedElementsAreArray(::std::initializer_list<T> xs) {

4
test/gmock-generated-matchers_test.cc
View File

@ -630,7 +630,7 @@ TEST(ElementsAreArrayTest, CanBeCreatedWithVector) {
EXPECT_THAT(test_vector, Not(ElementsAreArray(expected))); EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
} }
#if GTEST_LANG_CXX11 #if GTEST_HAS_STD_INITIALIZER_LIST_
TEST(ElementsAreArrayTest, TakesInitializerList) { TEST(ElementsAreArrayTest, TakesInitializerList) {
const int a[5] = { 1, 2, 3, 4, 5 }; const int a[5] = { 1, 2, 3, 4, 5 };
@ -666,7 +666,7 @@ TEST(ElementsAreArrayTest,
{ Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) }))); { Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) })));
} }
#endif // GTEST_LANG_CXX11 #endif // GTEST_HAS_STD_INITIALIZER_LIST_
TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) { TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) {
const int a[] = { 1, 2, 3 }; const int a[] = { 1, 2, 3 };

4
test/gmock-matchers_test.cc
View File

@ -4503,7 +4503,7 @@ TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) {
EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected))); EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected)));
} }
#if GTEST_LANG_CXX11 #if GTEST_HAS_STD_INITIALIZER_LIST_
TEST(UnorderedElementsAreArrayTest, TakesInitializerList) { TEST(UnorderedElementsAreArrayTest, TakesInitializerList) {
const int a[5] = { 2, 1, 4, 5, 3 }; const int a[5] = { 2, 1, 4, 5, 3 };
@ -4537,7 +4537,7 @@ TEST(UnorderedElementsAreArrayTest,
{ Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) }))); { Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) })));
} }
#endif // GTEST_LANG_CXX11 #endif // GTEST_HAS_STD_INITIALIZER_LIST_
class UnorderedElementsAreTest : public testing::Test { class UnorderedElementsAreTest : public testing::Test {
protected: protected: