Skip to content

Commit

Permalink
Check for Status explicitly when calling IsOk. (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcsnfkx
tcsnfkx authored Jan 14, 2022
1 parent ed17b00 commit 9e4ece1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
40 changes: 20 additions & 20 deletions src/test/cc/wfa/virtual_people/common/field_filter/utils/field_util_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,49 +79,49 @@ TEST(FieldUtilTest, GetFieldAndValue) {
absl::StatusOr<std::vector<const google::protobuf::FieldDescriptor*>>
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.int32_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<int32_t>(test_proto_2, *field_descriptors),
FieldsAre(true, 2));
// Test int64.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.int64_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<int64_t>(test_proto_2, *field_descriptors),
FieldsAre(true, 2));
// Test uint32.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.uint32_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<uint32_t>(test_proto_2, *field_descriptors),
FieldsAre(true, 2));
// Test uint64.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.uint64_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<uint64_t>(test_proto_2, *field_descriptors),
FieldsAre(true, 2));
// Test float.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.float_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<float>(test_proto_2, *field_descriptors),
FieldsAre(true, 2.0));
// Test double.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.double_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<double>(test_proto_2, *field_descriptors),
FieldsAre(true, 2.0));
// Test bool.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.bool_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<bool>(test_proto_2, *field_descriptors),
FieldsAre(true, false));
// Test enum.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.enum_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
ProtoFieldValue<const google::protobuf::EnumValueDescriptor*> enum_value =
GetValueFromProto<const google::protobuf::EnumValueDescriptor*>(
test_proto_2, *field_descriptors);
Expand All @@ -130,13 +130,13 @@ TEST(FieldUtilTest, GetFieldAndValue) {
// Test string.
field_descriptors =
GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b.string_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(
GetValueFromProto<const std::string&>(test_proto_2, *field_descriptors),
FieldsAre(true, "string2"));
// Test Message.
field_descriptors = GetFieldFromProto(test_proto_1.GetDescriptor(), "a.b");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<const google::protobuf::Message&>(
test_proto_2, *field_descriptors),
FieldsAre(true, EqualsProto(test_proto_2.a().b())));
Expand All @@ -148,49 +148,49 @@ TEST(FieldUtilTest, GetValueForUnsetField) {
absl::StatusOr<std::vector<const google::protobuf::FieldDescriptor*>>
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.int32_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<int32_t>(test_proto, *field_descriptors),
FieldsAre(false, 0));
// Test int64.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.int64_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<int64_t>(test_proto, *field_descriptors),
FieldsAre(false, 0));
// Test uint32.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.uint32_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<uint32_t>(test_proto, *field_descriptors),
FieldsAre(false, 0));
// Test uint64.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.uint64_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<uint64_t>(test_proto, *field_descriptors),
FieldsAre(false, 0));
// Test float.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.float_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<float>(test_proto, *field_descriptors),
FieldsAre(false, 0));
// Test double.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.double_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<double>(test_proto, *field_descriptors),
FieldsAre(false, 0));
// Test bool.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.bool_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<bool>(test_proto, *field_descriptors),
FieldsAre(false, false));
// Test enum.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.enum_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
ProtoFieldValue<const google::protobuf::EnumValueDescriptor*> enum_value =
GetValueFromProto<const google::protobuf::EnumValueDescriptor*>(
test_proto, *field_descriptors);
Expand All @@ -199,13 +199,13 @@ TEST(FieldUtilTest, GetValueForUnsetField) {
// Test string.
field_descriptors =
GetFieldFromProto(TestProto().GetDescriptor(), "a.b.string_value");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(
GetValueFromProto<const std::string&>(test_proto, *field_descriptors),
FieldsAre(false, ""));
// Test Message.
field_descriptors = GetFieldFromProto(TestProto().GetDescriptor(), "a.b");
EXPECT_THAT(field_descriptors, IsOk());
EXPECT_THAT(field_descriptors.status(), IsOk());
EXPECT_THAT(GetValueFromProto<const google::protobuf::Message&>(
test_proto, *field_descriptors),
FieldsAre(false, EqualsProto(TestProtoB())));
Expand Down
4 changes: 2 additions & 2 deletions src/test/cc/wfa/virtual_people/common/field_filter/utils/type_convert_util_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ TEST(ConvertToEnumTest, TestEnumName) {
const google::protobuf::FieldDescriptor* field_descriptor =
TestProtoB().GetDescriptor()->FindFieldByName("enum_value");
auto output = ConvertToEnum(field_descriptor->enum_type(), "TEST_ENUM_1");
EXPECT_THAT(output, IsOk());
EXPECT_THAT(output.status(), IsOk());
EXPECT_EQ((*output)->number(), 1);
}

TEST(ConvertToEnumTest, TestEnumNumber) {
const google::protobuf::FieldDescriptor* field_descriptor =
TestProtoB().GetDescriptor()->FindFieldByName("enum_value");
auto output = ConvertToEnum(field_descriptor->enum_type(), "1");
EXPECT_THAT(output, IsOk());
EXPECT_THAT(output.status(), IsOk());
EXPECT_EQ((*output)->number(), 1);
}

Expand Down

0 comments on commit 9e4ece1

Please sign in to comment.