| Index: testing/gmock/test/gmock-internal-utils_test.cc
|
| diff --git a/testing/gmock/test/gmock-internal-utils_test.cc b/testing/gmock/test/gmock-internal-utils_test.cc
|
| index ac3b2dd213e053fe0921907aab2a973b64e09568..7dd831150da2635ae33284838e57dc49e8850e48 100644
|
| --- a/testing/gmock/test/gmock-internal-utils_test.cc
|
| +++ b/testing/gmock/test/gmock-internal-utils_test.cc
|
| @@ -819,7 +819,7 @@ TEST(CopyArrayTest, WorksForTwoDimensionalArrays) {
|
| TEST(NativeArrayTest, ConstructorFromArrayWorks) {
|
| const int a[3] = { 0, 1, 2 };
|
| NativeArray<int> na(a, 3, kReference);
|
| - EXPECT_EQ(3, na.size());
|
| + EXPECT_EQ(3U, na.size());
|
| EXPECT_EQ(a, na.begin());
|
| }
|
|
|
| @@ -849,7 +849,7 @@ TEST(NativeArrayTest, TypeMembersAreCorrect) {
|
| TEST(NativeArrayTest, MethodsWork) {
|
| const int a[3] = { 0, 1, 2 };
|
| NativeArray<int> na(a, 3, kCopy);
|
| - ASSERT_EQ(3, na.size());
|
| + ASSERT_EQ(3U, na.size());
|
| EXPECT_EQ(3, na.end() - na.begin());
|
|
|
| NativeArray<int>::const_iterator it = na.begin();
|
| @@ -875,7 +875,7 @@ TEST(NativeArrayTest, MethodsWork) {
|
| TEST(NativeArrayTest, WorksForTwoDimensionalArray) {
|
| const char a[2][3] = { "hi", "lo" };
|
| NativeArray<char[3]> na(a, 2, kReference);
|
| - ASSERT_EQ(2, na.size());
|
| + ASSERT_EQ(2U, na.size());
|
| EXPECT_EQ(a, na.begin());
|
| }
|
|
|
| @@ -910,11 +910,11 @@ TEST(StlContainerViewTest, WorksForStaticNativeArray) {
|
|
|
| int a1[3] = { 0, 1, 2 };
|
| NativeArray<int> a2 = StlContainerView<int[3]>::ConstReference(a1);
|
| - EXPECT_EQ(3, a2.size());
|
| + EXPECT_EQ(3U, a2.size());
|
| EXPECT_EQ(a1, a2.begin());
|
|
|
| const NativeArray<int> a3 = StlContainerView<int[3]>::Copy(a1);
|
| - ASSERT_EQ(3, a3.size());
|
| + ASSERT_EQ(3U, a3.size());
|
| EXPECT_EQ(0, a3.begin()[0]);
|
| EXPECT_EQ(1, a3.begin()[1]);
|
| EXPECT_EQ(2, a3.begin()[2]);
|
| @@ -937,12 +937,12 @@ TEST(StlContainerViewTest, WorksForDynamicNativeArray) {
|
| const int* const p1 = a1;
|
| NativeArray<int> a2 = StlContainerView<tuple<const int*, int> >::
|
| ConstReference(make_tuple(p1, 3));
|
| - EXPECT_EQ(3, a2.size());
|
| + EXPECT_EQ(3U, a2.size());
|
| EXPECT_EQ(a1, a2.begin());
|
|
|
| const NativeArray<int> a3 = StlContainerView<tuple<int*, size_t> >::
|
| Copy(make_tuple(static_cast<int*>(a1), 3));
|
| - ASSERT_EQ(3, a3.size());
|
| + ASSERT_EQ(3U, a3.size());
|
| EXPECT_EQ(0, a3.begin()[0]);
|
| EXPECT_EQ(1, a3.begin()[1]);
|
| EXPECT_EQ(2, a3.begin()[2]);
|
|
|