commit ee5dc2b79b6920fa3f51bc5c235fddc30dc09398
author Jeff McGlynn <jwmcglynn@google.com> Tue Aug 07 20:03:27 2018 -0700
committer Jeff McGlynn <jwmcglynn@google.com> Tue Aug 07 20:03:27 2018 -0700
tree 877265e53f23c6898638daeb36bb4c41e2a05847
parent c3d1dc28fc0908cfc8d412b38521593b45fe1417
parent d16f2f6c3c7c2f899fde35782e1ee978877bb14b

Merge changes from upstream-master

* Fix build with googletest-1.8.0 and when linking unittests into a
single binary.

Change-Id: I0555fe7d15c28c774f2c4534888829a23f0e5f62

src/decoder/test/endpoint_codec_test.cc

diff --git a/src/decoder/test/endpoint_codec_test.cc b/src/decoder/test/endpoint_codec_test.cc
index f2fef54..de7d9ca 100644
--- a/src/decoder/test/endpoint_codec_test.cc
+++ b/src/decoder/test/endpoint_codec_test.cc
@@ -35,7 +35,6 @@
 using ::testing::Ge;
 using ::testing::Le;
 using ::testing::Ne;
-using ::testing::Optional;
 using ::testing::Pointwise;
 using ::testing::SizeIs;
 using ::testing::Pair;

src/decoder/test/image_utils.h

diff --git a/src/decoder/test/image_utils.h b/src/decoder/test/image_utils.h
index 718696e..adfded5 100644
--- a/src/decoder/test/image_utils.h
+++ b/src/decoder/test/image_utils.h
@@ -116,7 +116,7 @@
   }
 }
 
-void LoadGoldenBmp(const std::string& path, ImageBuffer* result) {
+static void LoadGoldenBmp(const std::string& path, ImageBuffer* result) {
   constexpr size_t kBmpHeaderSize = 54;
 
   SCOPED_TRACE(testing::Message() << "LoadGoldenBmp " << path);

src/decoder/test/intermediate_astc_block_test.cc

diff --git a/src/decoder/test/intermediate_astc_block_test.cc b/src/decoder/test/intermediate_astc_block_test.cc
index 69935ef..41861cb 100644
--- a/src/decoder/test/intermediate_astc_block_test.cc
+++ b/src/decoder/test/intermediate_astc_block_test.cc
@@ -27,7 +27,6 @@
 using ::testing::ElementsAre;
 using ::testing::Eq;
 using ::testing::HasSubstr;
-using ::testing::Optional;
 using ::testing::SizeIs;
 using ::testing::TestWithParam;
 using ::testing::ValuesIn;
@@ -313,7 +312,8 @@
 // if we properly set the endpoint range.
 TEST(IntermediateASTCBlockTest, TestEndpointRange) {
   PhysicalASTCBlock blk(0x0000000001FE000173ULL);
-  EXPECT_THAT(blk.ColorValuesRange(), Optional(Eq(255)));
+  EXPECT_TRUE(blk.ColorValuesRange().hasValue());
+  EXPECT_EQ(blk.ColorValuesRange().valueOr(0), 255);
 
   auto b = UnpackIntermediateBlock(blk);
   ASSERT_TRUE(b);
@@ -322,7 +322,8 @@
   ASSERT_THAT(data.endpoints, SizeIs(1));
   EXPECT_THAT(data.endpoints[0].mode, Eq(ColorEndpointMode::kLDRLumaDirect));
   EXPECT_THAT(data.endpoints[0].colors, ElementsAre(0, 255));
-  EXPECT_THAT(data.endpoint_range, Optional(Eq(255)));
+  EXPECT_TRUE(data.endpoint_range.hasValue());
+  EXPECT_EQ(data.endpoint_range.valueOr(0), 255);
 }
 
 struct ImageTestParams {