Add CompilerLibraries for lists and strings extensions. by copybara-service[bot] · Pull Request #1579 · google/cel-cpp
Expand Up
@@ -22,13 +22,14 @@
#include "cel/expr/syntax.pb.h"
#include "absl/status/status.h"
#include "absl/status/status_matchers.h"
#include "checker/standard_library.h"
#include "absl/strings/string_view.h"
#include "checker/validation_result.h"
#include "common/source.h"
#include "common/value.h"
#include "common/value_testing.h"
#include "compiler/compiler.h"
#include "compiler/compiler_factory.h"
#include "compiler/standard_library.h"
#include "extensions/protobuf/runtime_adapter.h"
#include "internal/testing.h"
#include "internal/testing_descriptor_pool.h"
Expand All
@@ -43,7 +44,6 @@
#include "runtime/runtime_options.h"
#include "runtime/standard_runtime_builder_factory.h"
#include "google/protobuf/arena.h"
#include "google/protobuf/descriptor.h"
namespace cel::extensions { namespace { Expand Down Expand Up @@ -281,8 +281,8 @@ TEST(ListsFunctionsTest, ListSortByMacroParseError) { }
struct ListCheckerTestCase { const std::string expr; bool is_valid; std::string expr; std::string error_substr; };
class ListsCheckerLibraryTest Expand All @@ -291,64 +291,86 @@ class ListsCheckerLibraryTest void SetUp() override { // Arrange: Configure the compiler. // Add the lists checker library to the compiler builder. ASSERT_OK_AND_ASSIGN(std::unique_ptr<CompilerBuilder> compiler_builder, NewCompilerBuilder(descriptor_pool_)); ASSERT_THAT(compiler_builder->AddLibrary(StandardCheckerLibrary()), IsOk()); ASSERT_THAT(compiler_builder->AddLibrary(ListsCheckerLibrary()), IsOk()); ASSERT_OK_AND_ASSIGN( std::unique_ptr<CompilerBuilder> compiler_builder, NewCompilerBuilder(internal::GetTestingDescriptorPool())); ASSERT_THAT(compiler_builder->AddLibrary(StandardCompilerLibrary()), IsOk()); ASSERT_THAT(compiler_builder->AddLibrary(ListsCompilerLibrary()), IsOk()); compiler_builder->GetCheckerBuilder().set_container( "cel.expr.conformance.proto3"); ASSERT_OK_AND_ASSIGN(compiler_, std::move(*compiler_builder).Build()); }
const google::protobuf::DescriptorPool* descriptor_pool_ = internal::GetTestingDescriptorPool(); std::unique_ptr<Compiler> compiler_; };
TEST_P(ListsCheckerLibraryTest, ListsFunctionsTypeCheckerSuccess) { // Act & Assert: Compile the expression and validate the result. ASSERT_OK_AND_ASSIGN(ValidationResult result, compiler_->Compile(GetParam().expr)); EXPECT_EQ(result.IsValid(), GetParam().is_valid); absl::string_view error_substr = GetParam().error_substr; EXPECT_EQ(result.IsValid(), error_substr.empty());
if (!error_substr.empty()) { EXPECT_THAT(result.FormatError(), HasSubstr(error_substr)); } }
// Returns a vector of test cases for the ListsCheckerLibraryTest. // Returns both positive and negative test cases for the lists functions. std::vector<ListCheckerTestCase> createListsCheckerParams() { return { // lists.distinct() {R"([1,2,3,4,4].distinct() == [1,2,3,4])", true}, {R"('abc'.distinct() == [1,2,3,4])", false}, {R"([1,2,3,4,4].distinct() == 'abc')", false}, {R"([1,2,3,4,4].distinct(1) == [1,2,3,4])", false}, {R"([1,2,3,4,4].distinct() == [1,2,3,4])"}, {R"('abc'.distinct() == [1,2,3,4])", "no matching overload for 'distinct'"}, {R"([1,2,3,4,4].distinct() == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4,4].distinct(1) == [1,2,3,4])", "undeclared reference"}, // lists.flatten() {R"([1,2,3,4].flatten() == [1,2,3,4])", true}, {R"([1,2,3,4].flatten(1) == [1,2,3,4])", true}, {R"('abc'.flatten() == [1,2,3,4])", false}, {R"([1,2,3,4].flatten() == 'abc')", false}, {R"('abc'.flatten(1) == [1,2,3,4])", false}, {R"([1,2,3,4].flatten('abc') == [1,2,3,4])", false}, {R"([1,2,3,4].flatten(1) == 'abc')", false}, {R"([1,2,3,4].flatten() == [1,2,3,4])"}, {R"([1,2,3,4].flatten(1) == [1,2,3,4])"}, {R"('abc'.flatten() == [1,2,3,4])", "no matching overload for 'flatten'"}, {R"([1,2,3,4].flatten() == 'abc')", "no matching overload for '_==_'"}, {R"('abc'.flatten(1) == [1,2,3,4])", "no matching overload for 'flatten'"}, {R"([1,2,3,4].flatten('abc') == [1,2,3,4])", "no matching overload for 'flatten'"}, {R"([1,2,3,4].flatten(1) == 'abc')", "no matching overload"}, // lists.range() {R"(lists.range(4) == [0,1,2,3])", true}, {R"(lists.range('abc') == [])", false}, {R"(lists.range(4) == 'abc')", false}, {R"(lists.range(4, 4) == [0,1,2,3])", false}, {R"(lists.range(4) == [0,1,2,3])"}, {R"(lists.range('abc') == [])", "no matching overload for 'lists.range'"}, {R"(lists.range(4) == 'abc')", "no matching overload for '_==_'"}, {R"(lists.range(4, 4) == [0,1,2,3])", "undeclared reference"}, // lists.reverse() {R"([1,2,3,4].reverse() == [4,3,2,1])", true}, {R"('abc'.reverse() == [])", false}, {R"([1,2,3,4].reverse() == 'abc')", false}, {R"([1,2,3,4].reverse(1) == [4,3,2,1])", false}, {R"([1,2,3,4].reverse() == [4,3,2,1])"}, {R"('abc'.reverse() == [])", "no matching overload for 'reverse'"}, {R"([1,2,3,4].reverse() == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4].reverse(1) == [4,3,2,1])", "undeclared reference"}, // lists.slice() {R"([1,2,3,4].slice(0, 4) == [1,2,3,4])", true}, {R"('abc'.slice(0, 4) == [1,2,3,4])", false}, {R"([1,2,3,4].slice('abc', 4) == [1,2,3,4])", false}, {R"([1,2,3,4].slice(0, 'abc') == [1,2,3,4])", false}, {R"([1,2,3,4].slice(0, 4) == 'abc')", false}, {R"([1,2,3,4].slice(0, 2, 3) == [1,2,3,4])", false}, {R"([1,2,3,4].slice(0, 4) == [1,2,3,4])"}, {R"('abc'.slice(0, 4) == [1,2,3,4])", "no matching overload for 'slice'"}, {R"([1,2,3,4].slice('abc', 4) == [1,2,3,4])", "no matching overload for 'slice'"}, {R"([1,2,3,4].slice(0, 'abc') == [1,2,3,4])", "no matching overload for 'slice'"}, {R"([1,2,3,4].slice(0, 4) == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4].slice(0, 2, 3) == [1,2,3,4])", "undeclared reference"}, // lists.sort() {R"([1,2,3,4].sort() == [1,2,3,4])", true}, {R"('abc'.sort() == [])", false}, {R"([1,2,3,4].sort() == 'abc')", false}, {R"([1,2,3,4].sort(2) == [1,2,3,4])", false}, {R"([1,2,3,4].sort() == [1,2,3,4])"}, {R"([TestAllTypes{}, TestAllTypes{}].sort() == [])", "no matching overload for 'sort'"}, {R"('abc'.sort() == [])", "no matching overload for 'sort'"}, {R"([1,2,3,4].sort() == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4].sort(2) == [1,2,3,4])", "undeclared reference"}, // sortBy macro {R"([1,2,3,4].sortBy(x, -x) == [4,3,2,1])"}, {R"([TestAllTypes{}, TestAllTypes{}].sortBy(x, x) == [])", "no matching overload for '@sortByAssociatedKeys'"}, {R"( [TestAllTypes{single_int64: 2}, TestAllTypes{single_int64: 1}] .sortBy(x, x.single_int64) == [TestAllTypes{single_int64: 1}, TestAllTypes{single_int64: 2}])"}, }; }
Expand Down
namespace cel::extensions { namespace { Expand Down Expand Up @@ -281,8 +281,8 @@ TEST(ListsFunctionsTest, ListSortByMacroParseError) { }
struct ListCheckerTestCase { const std::string expr; bool is_valid; std::string expr; std::string error_substr; };
class ListsCheckerLibraryTest Expand All @@ -291,64 +291,86 @@ class ListsCheckerLibraryTest void SetUp() override { // Arrange: Configure the compiler. // Add the lists checker library to the compiler builder. ASSERT_OK_AND_ASSIGN(std::unique_ptr<CompilerBuilder> compiler_builder, NewCompilerBuilder(descriptor_pool_)); ASSERT_THAT(compiler_builder->AddLibrary(StandardCheckerLibrary()), IsOk()); ASSERT_THAT(compiler_builder->AddLibrary(ListsCheckerLibrary()), IsOk()); ASSERT_OK_AND_ASSIGN( std::unique_ptr<CompilerBuilder> compiler_builder, NewCompilerBuilder(internal::GetTestingDescriptorPool())); ASSERT_THAT(compiler_builder->AddLibrary(StandardCompilerLibrary()), IsOk()); ASSERT_THAT(compiler_builder->AddLibrary(ListsCompilerLibrary()), IsOk()); compiler_builder->GetCheckerBuilder().set_container( "cel.expr.conformance.proto3"); ASSERT_OK_AND_ASSIGN(compiler_, std::move(*compiler_builder).Build()); }
const google::protobuf::DescriptorPool* descriptor_pool_ = internal::GetTestingDescriptorPool(); std::unique_ptr<Compiler> compiler_; };
TEST_P(ListsCheckerLibraryTest, ListsFunctionsTypeCheckerSuccess) { // Act & Assert: Compile the expression and validate the result. ASSERT_OK_AND_ASSIGN(ValidationResult result, compiler_->Compile(GetParam().expr)); EXPECT_EQ(result.IsValid(), GetParam().is_valid); absl::string_view error_substr = GetParam().error_substr; EXPECT_EQ(result.IsValid(), error_substr.empty());
if (!error_substr.empty()) { EXPECT_THAT(result.FormatError(), HasSubstr(error_substr)); } }
// Returns a vector of test cases for the ListsCheckerLibraryTest. // Returns both positive and negative test cases for the lists functions. std::vector<ListCheckerTestCase> createListsCheckerParams() { return { // lists.distinct() {R"([1,2,3,4,4].distinct() == [1,2,3,4])", true}, {R"('abc'.distinct() == [1,2,3,4])", false}, {R"([1,2,3,4,4].distinct() == 'abc')", false}, {R"([1,2,3,4,4].distinct(1) == [1,2,3,4])", false}, {R"([1,2,3,4,4].distinct() == [1,2,3,4])"}, {R"('abc'.distinct() == [1,2,3,4])", "no matching overload for 'distinct'"}, {R"([1,2,3,4,4].distinct() == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4,4].distinct(1) == [1,2,3,4])", "undeclared reference"}, // lists.flatten() {R"([1,2,3,4].flatten() == [1,2,3,4])", true}, {R"([1,2,3,4].flatten(1) == [1,2,3,4])", true}, {R"('abc'.flatten() == [1,2,3,4])", false}, {R"([1,2,3,4].flatten() == 'abc')", false}, {R"('abc'.flatten(1) == [1,2,3,4])", false}, {R"([1,2,3,4].flatten('abc') == [1,2,3,4])", false}, {R"([1,2,3,4].flatten(1) == 'abc')", false}, {R"([1,2,3,4].flatten() == [1,2,3,4])"}, {R"([1,2,3,4].flatten(1) == [1,2,3,4])"}, {R"('abc'.flatten() == [1,2,3,4])", "no matching overload for 'flatten'"}, {R"([1,2,3,4].flatten() == 'abc')", "no matching overload for '_==_'"}, {R"('abc'.flatten(1) == [1,2,3,4])", "no matching overload for 'flatten'"}, {R"([1,2,3,4].flatten('abc') == [1,2,3,4])", "no matching overload for 'flatten'"}, {R"([1,2,3,4].flatten(1) == 'abc')", "no matching overload"}, // lists.range() {R"(lists.range(4) == [0,1,2,3])", true}, {R"(lists.range('abc') == [])", false}, {R"(lists.range(4) == 'abc')", false}, {R"(lists.range(4, 4) == [0,1,2,3])", false}, {R"(lists.range(4) == [0,1,2,3])"}, {R"(lists.range('abc') == [])", "no matching overload for 'lists.range'"}, {R"(lists.range(4) == 'abc')", "no matching overload for '_==_'"}, {R"(lists.range(4, 4) == [0,1,2,3])", "undeclared reference"}, // lists.reverse() {R"([1,2,3,4].reverse() == [4,3,2,1])", true}, {R"('abc'.reverse() == [])", false}, {R"([1,2,3,4].reverse() == 'abc')", false}, {R"([1,2,3,4].reverse(1) == [4,3,2,1])", false}, {R"([1,2,3,4].reverse() == [4,3,2,1])"}, {R"('abc'.reverse() == [])", "no matching overload for 'reverse'"}, {R"([1,2,3,4].reverse() == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4].reverse(1) == [4,3,2,1])", "undeclared reference"}, // lists.slice() {R"([1,2,3,4].slice(0, 4) == [1,2,3,4])", true}, {R"('abc'.slice(0, 4) == [1,2,3,4])", false}, {R"([1,2,3,4].slice('abc', 4) == [1,2,3,4])", false}, {R"([1,2,3,4].slice(0, 'abc') == [1,2,3,4])", false}, {R"([1,2,3,4].slice(0, 4) == 'abc')", false}, {R"([1,2,3,4].slice(0, 2, 3) == [1,2,3,4])", false}, {R"([1,2,3,4].slice(0, 4) == [1,2,3,4])"}, {R"('abc'.slice(0, 4) == [1,2,3,4])", "no matching overload for 'slice'"}, {R"([1,2,3,4].slice('abc', 4) == [1,2,3,4])", "no matching overload for 'slice'"}, {R"([1,2,3,4].slice(0, 'abc') == [1,2,3,4])", "no matching overload for 'slice'"}, {R"([1,2,3,4].slice(0, 4) == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4].slice(0, 2, 3) == [1,2,3,4])", "undeclared reference"}, // lists.sort() {R"([1,2,3,4].sort() == [1,2,3,4])", true}, {R"('abc'.sort() == [])", false}, {R"([1,2,3,4].sort() == 'abc')", false}, {R"([1,2,3,4].sort(2) == [1,2,3,4])", false}, {R"([1,2,3,4].sort() == [1,2,3,4])"}, {R"([TestAllTypes{}, TestAllTypes{}].sort() == [])", "no matching overload for 'sort'"}, {R"('abc'.sort() == [])", "no matching overload for 'sort'"}, {R"([1,2,3,4].sort() == 'abc')", "no matching overload for '_==_'"}, {R"([1,2,3,4].sort(2) == [1,2,3,4])", "undeclared reference"}, // sortBy macro {R"([1,2,3,4].sortBy(x, -x) == [4,3,2,1])"}, {R"([TestAllTypes{}, TestAllTypes{}].sortBy(x, x) == [])", "no matching overload for '@sortByAssociatedKeys'"}, {R"( [TestAllTypes{single_int64: 2}, TestAllTypes{single_int64: 1}] .sortBy(x, x.single_int64) == [TestAllTypes{single_int64: 1}, TestAllTypes{single_int64: 2}])"}, }; }
Expand Down