Add support for type checker type deduction conformance tests.

PiperOrigin-RevId: 703160475

Author: jnthntatum

bazel/deps.bzl

@@ -142,10 +142,10 @@ def cel_spec_deps():
         url = "https://github.com/bazelbuild/rules_python/releases/download/0.33.2/rules_python-0.33.2.tar.gz",
     )
 
-    CEL_SPEC_GIT_SHA = "373994d7e20e582fce56767b01ac5039524cddab"  # Oct 23, 2024
+    CEL_SPEC_GIT_SHA = "afa18f9bd5a83f5960ca06c1f9faea406ab34ccc"  # Dec 2, 2024
     http_archive(
         name = "com_google_cel_spec",
-        sha256 = "b498a768140fc0ed0314eef8b2519a48287661d09ca15b17c8ca34088af6aac3",
+        sha256 = "19b4084ba33cc8da7a640d999e46731efbec585ad2995951dc61a7af24f059cb",
         strip_prefix = "cel-spec-" + CEL_SPEC_GIT_SHA,
         urls = ["https://github.com/google/cel-spec/archive/" + CEL_SPEC_GIT_SHA + ".zip"],
     )

conformance/BUILD

@@ -167,6 +167,7 @@ _ALL_TESTS = [
     "@com_google_cel_spec//tests/simple:testdata/unknowns.textproto",
     "@com_google_cel_spec//tests/simple:testdata/wrappers.textproto",
     "@com_google_cel_spec//tests/simple:testdata/block_ext.textproto",
+    "@com_google_cel_spec//tests/simple:testdata/type_deduction.textproto",
 ]
 
 _TESTS_TO_SKIP_MODERN = [
@@ -301,14 +302,14 @@ gen_conformance_tests(
     name = "conformance_parse_only",
     data = _ALL_TESTS,
     modern = True,
-    skip_tests = _TESTS_TO_SKIP_MODERN,
+    skip_tests = _TESTS_TO_SKIP_MODERN + ["type_deductions"],
 )
 
 gen_conformance_tests(
     name = "conformance_legacy_parse_only",
     data = _ALL_TESTS,
     modern = False,
-    skip_tests = _TESTS_TO_SKIP_LEGACY,
+    skip_tests = _TESTS_TO_SKIP_LEGACY + ["type_deductions"],
 )
 
 gen_conformance_tests(
@@ -330,7 +331,7 @@ gen_conformance_tests(
     dashboard = True,
     data = _ALL_TESTS,
     modern = True,
-    skip_tests = _TESTS_TO_SKIP_MODERN_DASHBOARD,
+    skip_tests = _TESTS_TO_SKIP_MODERN_DASHBOARD + ["type_deductions"],
     tags = [
         "guitar",
         "notap",
@@ -355,7 +356,7 @@ gen_conformance_tests(
     dashboard = True,
     data = _ALL_TESTS,
     modern = False,
-    skip_tests = _TESTS_TO_SKIP_LEGACY_DASHBOARD,
+    skip_tests = _TESTS_TO_SKIP_LEGACY_DASHBOARD + ["type_deductions"],
     tags = [
         "guitar",
         "notap",

conformance/run.cc

@@ -19,6 +19,7 @@
 // conformance tests; as well as integrating better with C++ testing
 // infrastructure.
 
+#include <cstdint>
 #include <cstdlib>
 #include <fstream>
 #include <ios>
@@ -32,6 +33,7 @@
 #include "cel/expr/eval.pb.h"
 #include "google/api/expr/v1alpha1/checked.pb.h"  // IWYU pragma: keep
 #include "google/api/expr/v1alpha1/eval.pb.h"
+#include "google/api/expr/v1alpha1/syntax.pb.h"  // IWYU pragma: keep
 #include "google/api/expr/v1alpha1/value.pb.h"
 #include "cel/expr/value.pb.h"
 #include "google/rpc/code.pb.h"
@@ -126,6 +128,43 @@ MATCHER_P(MatchesConformanceValue, expected, "") {
   return false;
 }
 
+MATCHER_P(ResultTypeMatches, expected, "") {
+  static auto* kDifferencer = []() {
+    auto* differencer = new MessageDifferencer();
+    differencer->set_message_field_comparison(MessageDifferencer::EQUIVALENT);
+    return differencer;
+  }();
+
+  const cel::expr::Type& want = expected;
+  const google::api::expr::v1alpha1::CheckedExpr& checked_expr = arg;
+
+  int64_t root_id = checked_expr.expr().id();
+  auto it = checked_expr.type_map().find(root_id);
+
+  if (it == checked_expr.type_map().end()) {
+    (*result_listener) << "type map does not contain root id: " << root_id;
+    return false;
+  }
+
+  auto got_versioned = it->second;
+  std::string serialized;
+  cel::expr::Type got;
+  if (!got_versioned.SerializeToString(&serialized) ||
+      !got.ParseFromString(serialized)) {
+    (*result_listener) << "type cannot be converted from versioned type: "
+                       << DescribeMessage(got_versioned);
+    return false;
+  }
+
+  if (kDifferencer->Compare(got, want)) {
+    return true;
+  }
+  (*result_listener) << "got: " << DescribeMessage(got);
+  (*result_listener) << "\n";
+  (*result_listener) << "wanted: " << DescribeMessage(want);
+  return false;
+}
+
 bool ShouldSkipTest(absl::Span<const std::string> tests_to_skip,
                     absl::string_view name) {
   for (absl::string_view test_to_skip : tests_to_skip) {
@@ -202,6 +241,14 @@ class ConformanceTest : public testing::Test {
           check_response.release_checked_expr());
     }
 
+    if (test_.check_only()) {
+      ASSERT_TRUE(test_.has_typed_result())
+          << "test must specify a typed result if check_only is set";
+      EXPECT_THAT(eval_request.checked_expr(),
+                  ResultTypeMatches(test_.typed_result().deduced_type()));
+      return;
+    }
+
     EvalResponse eval_response;
     if (auto status = service_->Eval(eval_request, eval_response);
         !status.ok()) {
@@ -219,6 +266,19 @@ class ConformanceTest : public testing::Test {
         EXPECT_THAT(test_value, MatchesConformanceValue(test_.value()));
         break;
       }
+      case SimpleTest::kTypedResult: {
+        ASSERT_TRUE(eval_request.has_checked_expr())
+            << "expression was not type checked";
+        absl::Cord serialized;
+        ABSL_CHECK(eval_response.result().SerializePartialToCord(&serialized));
+        cel::expr::ExprValue test_value;
+        ABSL_CHECK(test_value.ParsePartialFromCord(serialized));
+        EXPECT_THAT(test_value,
+                    MatchesConformanceValue(test_.typed_result().result()));
+        EXPECT_THAT(eval_request.checked_expr(),
+                    ResultTypeMatches(test_.typed_result().deduced_type()));
+        break;
+      }
       case SimpleTest::kEvalError:
         EXPECT_TRUE(eval_response.result().has_error())
             << eval_response.result();