fix tests

Author: scotthart

google/cloud/internal/oauth2_credentials_test.cc

@@ -27,7 +27,6 @@ using ::google::cloud::internal::UnavailableError;
 using ::google::cloud::testing_util::IsOk;
 using ::google::cloud::testing_util::IsOkAndHolds;
 using ::testing::Contains;
-using ::testing::IsEmpty;
 using ::testing::Not;
 using ::testing::Return;
 

google/cloud/storage/tests/unified_credentials_integration_test.cc

@@ -44,6 +44,7 @@ using ::google::cloud::UnifiedCredentialsOption;
 using ::google::cloud::internal::GetEnv;
 using ::google::cloud::storage::testing::TempFile;
 using ::google::cloud::testing_util::IsOk;
+using ::testing::Contains;
 using ::testing::IsEmpty;
 using ::testing::Not;
 using ::testing::StartsWith;
@@ -89,6 +90,10 @@ KlXA1yQW/ClmnHVg57SN1g1rvOJCcnHBnSbT7kGFqUol
 constexpr int kCurleAbortedByCallback = 42;
 constexpr int kCurleOk = 0;
 
+MATCHER_P(HeaderStartsWith, prefix, "header start with") {
+  return absl::StartsWith(std::string{arg}, prefix);
+}
+
 class UnifiedCredentialsIntegrationTest
     : public ::google::cloud::storage::testing::StorageIntegrationTest {
  protected:
@@ -381,7 +386,7 @@ TEST_F(UnifiedCredentialsIntegrationTest, AccessToken) {
   ASSERT_THAT(headers, IsOk());
 
   auto constexpr kPrefix = "authorization: Bearer ";
-  ASSERT_THAT(*headers, Contains(StartsWith(kPrefix)));
+  ASSERT_THAT(*headers, Contains(HeaderStartsWith(kPrefix)));
   std::string authorization;
   for (auto const& h : *headers) {
     authorization = std::string{h};
@@ -412,7 +417,7 @@ TEST_F(UnifiedCredentialsIntegrationTest, AccessTokenCustomTrustStore) {
   ASSERT_THAT(headers, IsOk());
 
   auto constexpr kPrefix = "authorization: Bearer ";
-  ASSERT_THAT(*headers, Contains(StartsWith(kPrefix)));
+  ASSERT_THAT(*headers, Contains(HeaderStartsWith(kPrefix)));
   std::string authorization;
   for (auto const& h : *headers) {
     authorization = std::string{h};
@@ -446,7 +451,7 @@ TEST_F(UnifiedCredentialsIntegrationTest, AccessTokenEmptyTrustStore) {
   ASSERT_THAT(headers, IsOk());
 
   auto constexpr kPrefix = "authorization: Bearer ";
-  ASSERT_THAT(*headers, Contains(StartsWith(kPrefix)));
+  ASSERT_THAT(*headers, Contains(HeaderStartsWith(kPrefix)));
   std::string authorization;
   for (auto const& h : *headers) {
     authorization = std::string{h};