Skip to content

No public description #2103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jun 21, 2026
+11 −13
Merged

No public description #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions eval/public/message_wrapper_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include "eval/public/structs/trivial_legacy_type_info.h"
#include "eval/testutil/test_message.pb.h"
#include "internal/casts.h"
#include "internal/testing.h"
#include "google/protobuf/message.h"
#include "google/protobuf/message_lite.h"
Expand Down Expand Up @@ -60,7 +59,7 @@ TEST(MessageWrapperBuilder, Builder) {
static_cast<google::protobuf::MessageLite*>(&test_message));

auto mutable_message =
cel::internal::down_cast<TestMessage*>(builder.message_ptr());
google::protobuf::DownCastMessage<TestMessage>(builder.message_ptr());
mutable_message->set_int64_value(20);
mutable_message->set_double_value(12.3);

Expand Down
4 changes: 3 additions & 1 deletion eval/public/structs/proto_message_type_adapter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "google/protobuf/arena.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/message.h"
#include "google/protobuf/message_lite.h"

namespace google::api::expr::runtime {
namespace {
Expand Down Expand Up @@ -725,7 +726,8 @@ TEST(ProtoMesssageTypeAdapter, TypeInfoMutator) {

ASSERT_OK_AND_ASSIGN(MessageWrapper::Builder builder,
api->NewInstance(manager));
EXPECT_NE(dynamic_cast<TestMessage*>(builder.message_ptr()), nullptr);
EXPECT_NE(google::protobuf::DynamicCastMessage<TestMessage>(builder.message_ptr()),
nullptr);
}

TEST(ProtoMesssageTypeAdapter, TypeInfoAccesor) {
Expand Down
4 changes: 1 addition & 3 deletions eval/public/testing/matchers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "absl/strings/string_view.h"
#include "eval/public/cel_value.h"
#include "eval/public/set_util.h"
#include "internal/casts.h"
#include "internal/testing.h"
#include "google/protobuf/message.h"

Expand Down Expand Up @@ -76,8 +75,7 @@ class CelValueMatcherImpl<const google::protobuf::Message*>
CelValue::MessageWrapper arg;
return v.GetValue(&arg) && arg.HasFullProto() &&
underlying_type_matcher_.Matches(
cel::internal::down_cast<const google::protobuf::Message*>(
arg.message_ptr()));
google::protobuf::DownCastMessage<google::protobuf::Message>(arg.message_ptr()));
}

void DescribeTo(std::ostream* os) const override {
Expand Down
13 changes: 6 additions & 7 deletions internal/proto_matchers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

#include "absl/log/absl_check.h"
#include "absl/memory/memory.h"
#include "internal/casts.h"
#include "internal/testing.h"
#include "google/protobuf/message.h"
#include "google/protobuf/message_lite.h"
Expand All @@ -43,13 +42,13 @@ class TextProtoMatcher {

bool MatchAndExplain(const google::protobuf::MessageLite& p,
::testing::MatchResultListener* listener) const {
return MatchAndExplain(cel::internal::down_cast<const google::protobuf::Message&>(p),
return MatchAndExplain(google::protobuf::DownCastMessage<google::protobuf::Message>(p),
listener);
}

bool MatchAndExplain(const google::protobuf::MessageLite* p,
::testing::MatchResultListener* listener) const {
return MatchAndExplain(cel::internal::down_cast<const google::protobuf::Message*>(p),
return MatchAndExplain(google::protobuf::DownCastMessage<google::protobuf::Message>(p),
listener);
}

Expand All @@ -58,15 +57,15 @@ class TextProtoMatcher {
auto message = absl::WrapUnique(p.New());
ABSL_CHECK(google::protobuf::TextFormat::ParseFromString(expected_, message.get()));
return google::protobuf::util::MessageDifferencer::Equals(
*message, cel::internal::down_cast<const google::protobuf::Message&>(p));
*message, google::protobuf::DownCastMessage<google::protobuf::Message>(p));
}

bool MatchAndExplain(const google::protobuf::Message* p,
::testing::MatchResultListener* listener) const {
auto message = absl::WrapUnique(p->New());
ABSL_CHECK(google::protobuf::TextFormat::ParseFromString(expected_, message.get()));
return google::protobuf::util::MessageDifferencer::Equals(
*message, cel::internal::down_cast<const google::protobuf::Message&>(*p));
*message, google::protobuf::DownCastMessage<google::protobuf::Message>(*p));
}

inline void DescribeTo(::std::ostream* os) const { *os << expected_; }
Expand All @@ -93,13 +92,13 @@ class ProtoMatcher {

bool MatchAndExplain(const google::protobuf::MessageLite& p,
::testing::MatchResultListener* listener) const {
return MatchAndExplain(cel::internal::down_cast<const google::protobuf::Message&>(p),
return MatchAndExplain(google::protobuf::DownCastMessage<google::protobuf::Message>(p),
listener);
}

bool MatchAndExplain(const google::protobuf::MessageLite* p,
::testing::MatchResultListener* listener) const {
return MatchAndExplain(cel::internal::down_cast<const google::protobuf::Message*>(p),
return MatchAndExplain(google::protobuf::DownCastMessage<google::protobuf::Message>(p),
listener);
}

Expand Down
Loading