@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")
+load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "RUNTIME", "conformance_test")
 
 package(default_applicable_licenses = [
     "//:license",
@@ -26,17 +26,35 @@ java_library(
         "//common/ast:cel_block",
         "//common/types",
         "//common/types:cel_proto_types",
+        "//common/types:message_type_provider",
+        "//common/types:type_providers",
+        "//common/values:cel_value_provider",
+        "//common/values:proto_message_lite_value_provider",
         "//compiler",
         "//compiler:compiler_builder",
         "//extensions",
         "//extensions:bindings",
+        "//extensions:comprehensions_runtime_library",
+        "//extensions:encoders_runtime_library",
+        "//extensions:lists_runtime_library",
+        "//extensions:math_runtime_library",
         "//extensions:optional_library",
+        "//extensions:sets_runtime_library",
+        "//extensions:strings_runtime_library",
+        "//optimizer",
+        "//optimizer/optimizers:select_optimizer",
         "//parser:macro",
         "//parser:parser_builder",
         "//parser:parser_factory",
         "//runtime",
+        "//runtime:lite_runtime",
+        "//runtime:lite_runtime_factory",
+        "//runtime:program",
         "//runtime:runtime_planner_impl",
+        "//runtime:standard_functions",
         "//testing:expr_value_utils",
+        "//testing/protos:test_all_types_cel_java_proto2",
+        "//testing/protos:test_all_types_cel_java_proto3",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
@@ -63,10 +81,17 @@ java_library(
     tags = ["conformance_maven"],
     deps = MAVEN_JAR_DEPS + [
         "//:java_truth",
+        "//common/values:proto_message_lite_value_provider",
         "//compiler:compiler_builder",
+        "//optimizer",
+        "//optimizer/optimizers:select_optimizer",
         "//parser:parser_factory",
+        "//runtime:lite_runtime",
+        "//runtime:lite_runtime_factory",
         "//runtime:runtime_planner_impl",
         "//testing:expr_value_utils",
+        "//testing/protos:test_all_types_cel_java_proto2",
+        "//testing/protos:test_all_types_cel_java_proto3",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
@@ -168,6 +193,103 @@ _TESTS_TO_SKIP_PLANNER = [
     "enums/strong_proto3",
 ]
 
+_TESTS_TO_SKIP_PLANNER_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
+    # TODO: Optional field selection on proto messages is not yet supported by
+    # SelectOptimizer.
+    "optionals/optionals/empty_struct_optindex_hasValue,optional_empty_struct_optindex_hasValue,struct_optindex_value,optional_struct_optindex_value,optional_struct_optindex_index_value",
+
+    # TODO: google.protobuf.Any field selection is not yet supported by
+    # SelectOptimizer.
+    "dynamic/any/field_read_proto2,field_read_proto3",
+    "dynamic/complex/any_list_map",
+    "proto2/set_null/single_any,repeated_field_anytype_null_retained",
+    "proto3/set_null/single_any,repeated_field_anytype_null_retained",
+    "wrappers/bool/to_any",
+    "wrappers/int32/to_any",
+    "wrappers/int64/to_any",
+    "wrappers/uint32/to_any",
+    "wrappers/uint64/to_any",
+    "wrappers/float/to_any",
+    "wrappers/double/to_any",
+    "wrappers/bytes/to_any",
+    "wrappers/string/to_any",
+    "wrappers/value/default_to_json",
+    "wrappers/list_value/literal_to_any",
+    "wrappers/struct/literal_to_any",
+]
+
+_TESTS_TO_SKIP_LITE_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
+    # Optionals are not supported in CelLiteRuntime.
+    "optionals",
+    "block_ext/basic/optional_list,optional_map,optional_map_chained,optional_message",
+
+    # Proto2 extensions are not supported in CelLiteRuntime.
+    "proto2_ext",
+    "proto2/extensions_has",
+    "proto2/extensions_get",
+
+    # TODO: Proto equality after dyn() unwrapping is not yet supported in
+    # CelLiteRuntime.
+    "comparisons/eq_literal/not_eq_dyn_proto2_msg_null,not_eq_dyn_proto3_msg_null",
+    "comparisons/eq_wrapper/eq_proto_different_types",
+    "comparisons/ne_literal/ne_proto_different_types",
+
+    # TODO: google.protobuf.Any unpacking is not yet supported in CelLiteRuntime.
+    "dynamic/any/literal_empty,var",
+
+    # TODO: Message creation with prepopulated fields is not yet supported in
+    # CelLiteRuntime.
+    "comparisons/eq_wrapper/eq_bool,eq_bytes,eq_double,eq_float,eq_int32,eq_int64,eq_string,eq_uint32,eq_uint64",
+    "comparisons/eq_wrapper/eq_proto2,eq_proto3,eq_proto2_missing_fields_neq,eq_proto3_missing_fields_neq,eq_proto_nan_equal",
+    "comparisons/eq_wrapper/eq_proto2_any_unpack_equal,eq_proto2_any_unpack_not_equal,eq_proto2_any_unpack_bytewise_fallback_not_equal,eq_proto2_any_unpack_bytewise_fallback_equal,eq_proto3_any_unpack_equal,eq_proto3_any_unpack_not_equal,eq_proto3_any_unpack_bytewise_fallback_not_equal,eq_proto3_any_unpack_bytewise_fallback_equal",
+    "comparisons/ne_literal/ne_proto2,ne_proto3,ne_proto2_missing_fields_neq,ne_proto3_missing_fields_neq,ne_proto_nan_not_equal",
+    "comparisons/ne_literal/ne_proto2_any_unpack,ne_proto2_any_unpack_bytewise_fallback,ne_proto3_any_unpack,ne_proto3_any_unpack_bytewise_fallback",
+    "dynamic/int32/literal,literal_no_field_access,field_assign_proto2,field_assign_proto2_zero,field_assign_proto2_max,field_assign_proto2_min,field_assign_proto2_range,field_read_proto2,field_read_proto2_zero,field_assign_proto3,field_assign_proto3_zero,field_assign_proto3_max,field_assign_proto3_min,field_assign_proto3_range,field_read_proto3,field_read_proto3_zero",
+    "dynamic/int64/literal,literal_no_field_access,field_assign_proto2,field_assign_proto2_zero,field_assign_proto3,field_assign_proto3_zero",
+    "dynamic/uint32/literal,literal_no_field_access,field_assign_proto2,field_assign_proto2_zero,field_assign_proto2_max,field_assign_proto2_range,field_assign_proto3,field_assign_proto3_zero,field_assign_proto3_max,field_assign_proto3_range,field_read_proto2,field_read_proto2_zero",
+    "dynamic/uint64/literal,literal_no_field_access,field_assign_proto2,field_assign_proto2_zero,field_assign_proto3,field_assign_proto3_zero,field_read_proto2,field_read_proto2_zero",
+    "dynamic/float/literal,literal_not_double,literal_no_field_access,field_assign_proto2,field_assign_proto2_zero,field_assign_proto2_subnorm,field_assign_proto2_round_to_zero,field_assign_proto2_range,field_read_proto2,field_read_proto2_zero,field_assign_proto3,field_assign_proto3_zero,field_assign_proto3_subnorm,field_assign_proto3_round_to_zero,field_assign_proto3_range,field_read_proto3,field_read_proto3_zero",
+    "dynamic/double/literal,literal_no_field_access,field_assign_proto2,field_assign_proto2_zero,field_assign_proto2_range,field_read_proto2,field_read_proto2_zero,field_assign_proto3,field_assign_proto3_zero,field_assign_proto3_range,field_read_proto3,field_read_proto3_zero",
+    "dynamic/bool/literal,literal_no_field_access,field_assign_proto2,field_assign_proto2_false,field_assign_proto3,field_assign_proto3_false",
+    "dynamic/string/literal,literal_no_field_access,literal_unicode,field_assign_proto2,field_assign_proto2_empty,field_assign_proto3,field_assign_proto3_empty",
+    "dynamic/bytes/literal,literal_no_field_access,literal_unicode,field_assign_proto2,field_assign_proto2_empty,field_assign_proto3,field_assign_proto3_empty",
+    "dynamic/list/literal,literal_no_field_access,literal_empty,field_assign_proto2,field_assign_proto2_empty,field_read_proto2,field_read_proto2_empty,field_assign_proto3,field_assign_proto3_empty,field_read_proto3,field_read_proto3_empty",
+    "dynamic/struct/literal,literal_no_field_access,literal_empty,field_assign_proto2,field_assign_proto2_empty,field_assign_proto2_bad,field_read_proto2,field_read_proto2_empty,field_assign_proto3,field_assign_proto3_empty,field_assign_proto3_bad,field_read_proto3,field_read_proto3_empty",
+    "dynamic/value_null/literal,literal_no_field_access,field_assign_proto2,field_read_proto2,field_assign_proto3,field_read_proto3",
+    "dynamic/value_number/literal,literal_no_field_access,literal_zero,field_assign_proto2,field_assign_proto2_zero,field_read_proto2,field_read_proto2_zero,field_assign_proto3,field_assign_proto3_zero,field_read_proto3,field_read_proto3_zero",
+    "dynamic/value_string/literal,literal_no_field_access,literal_empty,field_assign_proto2,field_assign_proto2_empty,field_read_proto2,field_read_proto2_zero,field_assign_proto3,field_assign_proto3_empty,field_read_proto3,field_read_proto3_zero",
+    "dynamic/value_bool/literal,literal_no_field_access,literal_false,field_assign_proto2,field_assign_proto2_false,field_read_proto2,field_read_proto2_false,field_assign_proto3,field_assign_proto3_false,field_read_proto3,field_read_proto3_false",
+    "dynamic/value_struct/literal,literal_no_field_access,literal_empty,field_assign_proto2,field_assign_proto2_empty,field_read_proto2,field_read_proto2_empty,field_assign_proto3,field_assign_proto3_empty,field_read_proto3,field_read_proto3_empty",
+    "dynamic/value_list/literal,literal_no_field_access,literal_empty,field_assign_proto2,field_assign_proto2_empty,field_read_proto2,field_read_proto2_empty,field_assign_proto3,field_assign_proto3_empty,field_read_proto3,field_read_proto3_empty",
+    "dynamic/any/literal,literal_no_field_access,field_assign_proto2,field_read_proto2,field_assign_proto3,field_read_proto3",
+    "dynamic/complex",
+    "enums/legacy_proto2/assign_standalone_name,assign_standalone_int,assign_standalone_int_too_big,assign_standalone_int_too_neg,assign_repeated_enum,list_enum_as_list_int,enum_as_int",
+    "enums/legacy_proto3/assign_standalone_name,assign_standalone_int,assign_standalone_int_big,assign_standalone_int_neg,assign_standalone_int_too_big,assign_standalone_int_too_neg,assign_repeated_enum,list_enum_as_list_int,enum_as_int",
+    "parse/nest/message_literal",
+    "parse/repeat/message_literal",
+    "parse/whitespace",
+    "parse/comments",
+    "parse/struct_field_names",
+    "proto2/literal_singular",
+    "proto2/literal_wellknown",
+    "proto2/set_null",
+    "proto2/quoted_fields",
+    "proto2/has/repeated_none_explicit,repeated_one,repeated_many,map_none_explicit,map_one_default,map_one,map_many,required,optional_set_no_default,optional_set_with_default,optional_set_to_default,optional_message_set,optional_enum_set,optional_enum_set_zero,oneof_other_set,oneof_set,oneof_set_default",
+    "proto3/literal_singular",
+    "proto3/literal_wellknown",
+    "proto3/set_null",
+    "proto3/quoted_fields",
+    "proto3/has/repeated_none_explicit,repeated_one,repeated_many,map_none_explicit,map_one_default,map_one,map_many,single_set,single_set_to_default,single_message_set,single_message_set_to_default,single_enum_set,single_enum_set_zero,oneof_other_set,oneof_set,oneof_set_default",
+    "type_deductions/complex_initializers/struct",
+    "type_deductions/field_access/int_field",
+    "wrappers",
+]
+
+_TESTS_TO_SKIP_LITE = _TESTS_TO_SKIP_LITE_SELECT_OPT + [
+    # Custom proto2 default values on unset fields require SelectOptimization in CelLiteRuntime.
+    "proto2/empty_field/scalar_with_default",
+]
+
 conformance_test(
     name = "conformance",
     data = _ALL_TESTS,
@@ -190,6 +312,29 @@ conformance_test(
 conformance_test(
     name = "conformance_planner",
     data = _ALL_TESTS,
+    runtime = RUNTIME.PLANNER,
     skip_tests = _TESTS_TO_SKIP_PLANNER,
-    use_planner = True,
+)
+
+conformance_test(
+    name = "conformance_planner_select_opt",
+    data = _ALL_TESTS,
+    enable_select_optimization = True,
+    runtime = RUNTIME.PLANNER,
+    skip_tests = _TESTS_TO_SKIP_PLANNER_SELECT_OPT,
+)
+
+conformance_test(
+    name = "conformance_lite",
+    data = _ALL_TESTS,
+    runtime = RUNTIME.LITE,
+    skip_tests = _TESTS_TO_SKIP_LITE,
+)
+
+conformance_test(
+    name = "conformance_lite_select_opt",
+    data = _ALL_TESTS,
+    enable_select_optimization = True,
+    runtime = RUNTIME.LITE,
+    skip_tests = _TESTS_TO_SKIP_LITE_SELECT_OPT,
 )