[WIP NOT FOR COMMIT] Switch Android to libc++

net/spdy/spdy_prefixed_buffer_reader_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_prefixed_buffer_reader.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ skipping 14 matching lines @@
   std::string prefix_, suffix_;
 };
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadRawFromPrefix) {
   SpdyPrefixedBufferReader reader = Build("foobar", "");
   EXPECT_EQ(6u, reader.Available());
 
   char buffer[] = "123456";
   EXPECT_FALSE(reader.ReadN(10, buffer));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("foobar"));
+  //EXPECT_THAT(buffer_copy, ElementsAreArray("foobar"));

[Fabrice (no longer in Chrome), 2014/11/12 11:52:30]

I have been trying to do that but I think there is a stack corruption involved.
On the other hand, it is "just" a failing test, I haven't been able to find a
single use case for positional parameters in the whole codebase.
We'd need to add a define for the transition period. Most of the changes here
are breaking changes. I think it's too much hassle for this.

[pasko, 2014/11/12 12:52:52]

can you file a bug and just do:
#if defined(ANDROID_LIBCXX) // not sure the correct macro
#undef EXPECT_THAT
#define EXPECT_THAT(a, b)
#endif

   EXPECT_EQ(0u, reader.Available());
 }
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadPieceFromPrefix) {
   SpdyPrefixedBufferReader reader = Build("foobar", "");
   EXPECT_EQ(6u, reader.Available());
 
   SpdyPinnableBufferPiece piece;
   EXPECT_FALSE(reader.ReadN(10, &piece));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, &piece));
   EXPECT_FALSE(piece.IsPinned());
   EXPECT_EQ(StringPiece("foobar"), piece);
   EXPECT_EQ(0u, reader.Available());
 }
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadRawFromSuffix) {
   SpdyPrefixedBufferReader reader = Build("", "foobar");
   EXPECT_EQ(6u, reader.Available());
 
   char buffer[] = "123456";
   EXPECT_FALSE(reader.ReadN(10, buffer));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("foobar"));
+  //EXPECT_THAT(buffer, ElementsAreArray("foobar"));
   EXPECT_EQ(0u, reader.Available());
 }
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadPieceFromSuffix) {
   SpdyPrefixedBufferReader reader = Build("", "foobar");
   EXPECT_EQ(6u, reader.Available());
 
   SpdyPinnableBufferPiece piece;
   EXPECT_FALSE(reader.ReadN(10, &piece));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, &piece));
   EXPECT_FALSE(piece.IsPinned());
   EXPECT_EQ(StringPiece("foobar"), piece);
   EXPECT_EQ(0u, reader.Available());
 }
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadRawSpanning) {
   SpdyPrefixedBufferReader reader = Build("foob", "ar");
   EXPECT_EQ(6u, reader.Available());
 
   char buffer[] = "123456";
   EXPECT_FALSE(reader.ReadN(10, buffer));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("foobar"));
+  //EXPECT_THAT(buffer, ElementsAreArray("foobar"));
   EXPECT_EQ(0u, reader.Available());
 }
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadPieceSpanning) {
   SpdyPrefixedBufferReader reader = Build("foob", "ar");
   EXPECT_EQ(6u, reader.Available());
 
   SpdyPinnableBufferPiece piece;
   EXPECT_FALSE(reader.ReadN(10, &piece));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, &piece));
   EXPECT_TRUE(piece.IsPinned());
   EXPECT_EQ(StringPiece("foobar"), piece);
   EXPECT_EQ(0u, reader.Available());
 }
 
 TEST_F(SpdyPrefixedBufferReaderTest, ReadMixed) {
   SpdyPrefixedBufferReader reader = Build("abcdef", "hijkl");
   EXPECT_EQ(11u, reader.Available());
 
   char buffer[] = "1234";
   SpdyPinnableBufferPiece piece;
 
   EXPECT_TRUE(reader.ReadN(3, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("abc4"));
+  //EXPECT_THAT(buffer, ElementsAreArray("abc4"));
   EXPECT_EQ(8u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(2, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("dec4"));
+  //EXPECT_THAT(buffer, ElementsAreArray("dec4"));
   EXPECT_EQ(6u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(3, &piece));
   EXPECT_EQ(StringPiece("fhi"), piece);
   EXPECT_TRUE(piece.IsPinned());
   EXPECT_EQ(3u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(2, &piece));
   EXPECT_EQ(StringPiece("jk"), piece);
   EXPECT_FALSE(piece.IsPinned());
   EXPECT_EQ(1u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(1, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("lec4"));
+  //EXPECT_THAT(buffer, ElementsAreArray("lec4"));
   EXPECT_EQ(0u, reader.Available());
 }
 
 }  // namespace test
 
 }  // namespace net