Switch to open source status matchers

PiperOrigin-RevId: 669005518
google · Aug 29, 2024 · d7fa8c9 · d7fa8c9
1 parent 043ea2a
commit d7fa8c9
Show file tree

Hide file tree

Showing 180 changed files with 552 additions and 801 deletions.
diff --git a/base/ast_internal/ast_impl_test.cc b/base/ast_internal/ast_impl_test.cc
@@ -24,8 +24,8 @@
 namespace cel::ast_internal {
 namespace {
 
-using testing::Pointee;
-using testing::Truly;
+using ::testing::Pointee;
+using ::testing::Truly;
 
 TEST(AstImpl, RawExprCtor) {
   // arrange

diff --git a/base/operators_test.cc b/base/operators_test.cc
@@ -25,8 +25,8 @@
 namespace cel {
 namespace {
 
-using testing::Eq;
-using testing::Optional;
+using ::testing::Eq;
+using ::testing::Optional;
 
 template <typename Op, typename OpId>
 void TestOperator(Op op, OpId id, absl::string_view name,

diff --git a/codelab/exercise1_test.cc b/codelab/exercise1_test.cc
@@ -19,8 +19,8 @@
 namespace google::api::expr::codelab {
 namespace {
 
-using cel::internal::IsOkAndHolds;
-using cel::internal::StatusIs;
+using ::absl_testing::IsOkAndHolds;
+using ::absl_testing::StatusIs;
 
 TEST(Exercise1, PrintHelloWorld) {
   EXPECT_THAT(ParseAndEvaluate("'Hello, World!'"),

diff --git a/codelab/exercise2_test.cc b/codelab/exercise2_test.cc
@@ -21,11 +21,11 @@
 namespace google::api::expr::codelab {
 namespace {
 
+using ::absl_testing::IsOkAndHolds;
+using ::absl_testing::StatusIs;
 using ::google::rpc::context::AttributeContext;
 using ::google::protobuf::TextFormat;
-using testing::HasSubstr;
-using cel::internal::IsOkAndHolds;
-using cel::internal::StatusIs;
+using ::testing::HasSubstr;
 
 TEST(Exercise2Var, Simple) {
   EXPECT_THAT(ParseAndEvaluate("bool_var", false), IsOkAndHolds(false));

diff --git a/codelab/exercise3_test.cc b/codelab/exercise3_test.cc
@@ -22,9 +22,9 @@
 namespace google::api::expr::codelab {
 namespace {
 
+using ::absl_testing::IsOkAndHolds;
+using ::absl_testing::StatusIs;
 using ::google::rpc::context::AttributeContext;
-using cel::internal::IsOkAndHolds;
-using cel::internal::StatusIs;
 
 // Helper for a simple CelExpression with no context.
 absl::StatusOr<bool> TruthTableTest(absl::string_view statement) {

diff --git a/codelab/solutions/exercise3_test.cc b/codelab/solutions/exercise3_test.cc
@@ -22,9 +22,9 @@
 namespace google::api::expr::codelab {
 namespace {
 
+using ::absl_testing::IsOkAndHolds;
+using ::absl_testing::StatusIs;
 using ::google::rpc::context::AttributeContext;
-using cel::internal::IsOkAndHolds;
-using cel::internal::StatusIs;
 
 // Helper for a simple CelExpression with no context.
 absl::StatusOr<bool> TruthTableTest(absl::string_view statement) {

diff --git a/common/BUILD b/common/BUILD
@@ -420,6 +420,7 @@ cc_library(
         ":value_kind",
         "//internal:testing",
         "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:status_matchers",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:optional",

diff --git a/common/allocator_test.cc b/common/allocator_test.cc
@@ -26,7 +26,7 @@
 namespace cel {
 namespace {
 
-using testing::NotNull;
+using ::testing::NotNull;
 
 TEST(AllocatorKind, AbslStringify) {
   EXPECT_EQ(absl::StrCat(AllocatorKind::kArena), "ARENA");

diff --git a/common/arena_string_test.cc b/common/arena_string_test.cc
@@ -22,14 +22,14 @@
 namespace cel {
 namespace {
 
-using testing::Eq;
-using testing::Ge;
-using testing::Gt;
-using testing::IsEmpty;
-using testing::Le;
-using testing::Lt;
-using testing::Ne;
-using testing::SizeIs;
+using ::testing::Eq;
+using ::testing::Ge;
+using ::testing::Gt;
+using ::testing::IsEmpty;
+using ::testing::Le;
+using ::testing::Lt;
+using ::testing::Ne;
+using ::testing::SizeIs;
 
 TEST(ArenaString, Default) {
   ArenaString string;

diff --git a/common/ast_rewrite_test.cc b/common/ast_rewrite_test.cc
@@ -35,10 +35,10 @@ namespace {
 using ::cel::ast_internal::AstImpl;
 using ::cel::extensions::CreateAstFromParsedExpr;
 using ::cel::extensions::internal::ConvertProtoExprToNative;
-using testing::_;
-using testing::ElementsAre;
-using testing::InSequence;
-using testing::Ref;
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::InSequence;
+using ::testing::Ref;
 
 class MockAstRewriter : public AstRewriter {
  public:

diff --git a/common/ast_traverse_test.cc b/common/ast_traverse_test.cc
@@ -23,8 +23,8 @@ namespace cel::ast_internal {
 
 namespace {
 
-using testing::_;
-using testing::Ref;
+using ::testing::_;
+using ::testing::Ref;
 
 class MockAstVisitor : public AstVisitor {
  public:

diff --git a/common/casting_test.cc b/common/casting_test.cc
@@ -24,10 +24,10 @@
 namespace cel {
 namespace {
 
-using testing::_;
-using testing::Eq;
-using testing::Ne;
-using testing::Ref;
+using ::testing::_;
+using ::testing::Eq;
+using ::testing::Ne;
+using ::testing::Ref;
 
 enum class AncestryKind {
   kParent,

diff --git a/common/constant_test.cc b/common/constant_test.cc
@@ -27,9 +27,9 @@
 namespace cel {
 namespace {
 
-using testing::IsEmpty;
-using testing::IsFalse;
-using testing::IsTrue;
+using ::testing::IsEmpty;
+using ::testing::IsFalse;
+using ::testing::IsTrue;
 
 TEST(Constant, NullValue) {
   Constant const_expr;

diff --git a/common/data_test.cc b/common/data_test.cc
@@ -27,7 +27,7 @@
 namespace cel {
 namespace {
 
-using testing::IsNull;
+using ::testing::IsNull;
 
 class DataTest final : public Data {
  public:

diff --git a/common/decl_test.cc b/common/decl_test.cc
@@ -23,10 +23,10 @@
 namespace cel {
 namespace {
 
-using testing::ElementsAre;
-using testing::IsEmpty;
-using testing::UnorderedElementsAre;
-using cel::internal::StatusIs;
+using ::absl_testing::StatusIs;
+using ::testing::ElementsAre;
+using ::testing::IsEmpty;
+using ::testing::UnorderedElementsAre;
 
 TEST(VariableDecl, Name) {
   VariableDecl variable_decl;

diff --git a/common/expr_test.cc b/common/expr_test.cc
@@ -22,13 +22,13 @@
 namespace cel {
 namespace {
 
-using testing::_;
-using testing::Eq;
-using testing::IsEmpty;
-using testing::IsFalse;
-using testing::IsTrue;
-using testing::SizeIs;
-using testing::VariantWith;
+using ::testing::_;
+using ::testing::Eq;
+using ::testing::IsEmpty;
+using ::testing::IsFalse;
+using ::testing::IsTrue;
+using ::testing::SizeIs;
+using ::testing::VariantWith;
 
 Expr MakeUnspecifiedExpr(ExprId id) {
   Expr expr;

diff --git a/common/internal/byte_string_test.cc b/common/internal/byte_string_test.cc
@@ -47,12 +47,12 @@ struct ByteStringViewTestFriend {
 
 namespace {
 
-using testing::Eq;
-using testing::IsEmpty;
-using testing::Not;
-using testing::Optional;
-using testing::SizeIs;
-using testing::TestWithParam;
+using ::testing::Eq;
+using ::testing::IsEmpty;
+using ::testing::Not;
+using ::testing::Optional;
+using ::testing::SizeIs;
+using ::testing::TestWithParam;
 
 TEST(ByteStringKind, Ostream) {
   {

diff --git a/common/internal/reference_count_test.cc b/common/internal/reference_count_test.cc
@@ -26,8 +26,8 @@
 namespace cel::common_internal {
 namespace {
 
-using testing::NotNull;
-using testing::WhenDynamicCastTo;
+using ::testing::NotNull;
+using ::testing::WhenDynamicCastTo;
 
 class Object : public virtual ReferenceCountFromThis {
  public:

diff --git a/common/internal/shared_byte_string_test.cc b/common/internal/shared_byte_string_test.cc
@@ -26,10 +26,10 @@
 namespace cel::common_internal {
 namespace {
 
-using testing::Eq;
-using testing::IsEmpty;
-using testing::Ne;
-using testing::Not;
+using ::testing::Eq;
+using ::testing::IsEmpty;
+using ::testing::Ne;
+using ::testing::Not;
 
 class OwningObject final : public ReferenceCounted {
  public:

diff --git a/common/json_test.cc b/common/json_test.cc
@@ -23,12 +23,12 @@
 namespace cel::internal {
 namespace {
 
-using testing::ElementsAre;
-using testing::Eq;
-using testing::IsFalse;
-using testing::IsTrue;
-using testing::UnorderedElementsAre;
-using testing::VariantWith;
+using ::testing::ElementsAre;
+using ::testing::Eq;
+using ::testing::IsFalse;
+using ::testing::IsTrue;
+using ::testing::UnorderedElementsAre;
+using ::testing::VariantWith;
 
 TEST(Json, DefaultConstructor) {
   EXPECT_THAT(Json(), VariantWith<JsonNull>(Eq(kJsonNull)));

diff --git a/common/legacy_type_reflector_test.cc b/common/legacy_type_reflector_test.cc
@@ -26,11 +26,11 @@
 namespace cel {
 namespace {
 
+using ::absl_testing::IsOkAndHolds;
+using ::absl_testing::StatusIs;
 using ::cel::common_internal::LegacyValueManager;
 using ::cel::interop_internal::TestOnly_IsLegacyListBuilder;
 using ::cel::interop_internal::TestOnly_IsLegacyMapBuilder;
-using cel::internal::IsOkAndHolds;
-using cel::internal::StatusIs;
 
 class TypeReflectorLegacyTest
     : public common_internal::ThreadCompatibleValueTest<> {};

diff --git a/common/memory_test.cc b/common/memory_test.cc
@@ -46,13 +46,13 @@ namespace {
 
 // NOLINTBEGIN(bugprone-use-after-move)
 
-using testing::_;
-using testing::IsFalse;
-using testing::IsNull;
-using testing::IsTrue;
-using testing::NotNull;
-using testing::TestParamInfo;
-using testing::TestWithParam;
+using ::testing::_;
+using ::testing::IsFalse;
+using ::testing::IsNull;
+using ::testing::IsTrue;
+using ::testing::NotNull;
+using ::testing::TestParamInfo;
+using ::testing::TestWithParam;
 
 TEST(MemoryManagement, ostream) {
   {

diff --git a/common/native_type_test.cc b/common/native_type_test.cc
@@ -23,9 +23,9 @@
 namespace cel {
 namespace {
 
-using testing::IsEmpty;
-using testing::Not;
-using testing::SizeIs;
+using ::testing::IsEmpty;
+using ::testing::Not;
+using ::testing::SizeIs;
 
 struct Type1 {};
 

diff --git a/common/reference_test.cc b/common/reference_test.cc
@@ -24,11 +24,11 @@
 namespace cel {
 namespace {
 
-using testing::_;
-using testing::ElementsAre;
-using testing::Eq;
-using testing::IsEmpty;
-using testing::VariantWith;
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::Eq;
+using ::testing::IsEmpty;
+using ::testing::VariantWith;
 
 TEST(VariableReference, Value) {
   VariableReference variable_reference;

diff --git a/common/source_test.cc b/common/source_test.cc
@@ -21,10 +21,10 @@
 namespace cel {
 namespace {
 
-using testing::ElementsAre;
-using testing::Eq;
-using testing::Ne;
-using testing::Optional;
+using ::testing::ElementsAre;
+using ::testing::Eq;
+using ::testing::Ne;
+using ::testing::Optional;
 
 TEST(SourceRange, Default) {
   SourceRange range;

diff --git a/common/type_reflector_test.cc b/common/type_reflector_test.cc
@@ -31,10 +31,10 @@
 namespace cel {
 namespace {
 
-using testing::Optional;
-using cel::internal::IsOk;
-using cel::internal::IsOkAndHolds;
-using cel::internal::StatusIs;
+using ::absl_testing::IsOk;
+using ::absl_testing::IsOkAndHolds;
+using ::absl_testing::StatusIs;
+using ::testing::Optional;
 
 using TypeReflectorTest = common_internal::ThreadCompatibleValueTest<>;
 

diff --git a/common/type_test.cc b/common/type_test.cc
@@ -25,10 +25,10 @@ namespace cel {
 namespace {
 
 using ::cel::internal::GetTestingDescriptorPool;
-using testing::An;
-using testing::ElementsAre;
-using testing::IsEmpty;
-using testing::Optional;
+using ::testing::An;
+using ::testing::ElementsAre;
+using ::testing::IsEmpty;
+using ::testing::Optional;
 
 TEST(Type, Default) {
   EXPECT_EQ(Type(), DynType());

diff --git a/common/types/basic_struct_type_test.cc b/common/types/basic_struct_type_test.cc
@@ -19,8 +19,8 @@
 namespace cel::common_internal {
 namespace {
 
-using testing::Eq;
-using testing::IsEmpty;
+using ::testing::Eq;
+using ::testing::IsEmpty;
 
 TEST(BasicStructType, Kind) {
   EXPECT_EQ(BasicStructType::kind(), TypeKind::kStruct);