pw_status: Update Status::CODE to Status::Code()
- Update Status::CODE style to Status::Code() using
pw_status/update_style.py.
- Make minor adjustments to the pw_assert tests to get them passing.
Change-Id: Ie54c3c605178fd1e42c7cedbcff324115f3ed279
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/19165
Commit-Queue: Wyatt Hepler <hepler@google.com>
Reviewed-by: Ewout van Bekkum <ewout@google.com>
diff --git a/pw_protobuf/decoder_test.cc b/pw_protobuf/decoder_test.cc
index 7dad4b2..0b4f6ff 100644
--- a/pw_protobuf/decoder_test.cc
+++ b/pw_protobuf/decoder_test.cc
@@ -50,7 +50,7 @@
}
called = true;
- return Status::OK;
+ return Status::Ok();
}
bool called = false;
@@ -83,45 +83,45 @@
Decoder decoder(std::as_bytes(std::span(encoded_proto)));
int32_t v1 = 0;
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 1u);
- EXPECT_EQ(decoder.ReadInt32(&v1), Status::OK);
+ EXPECT_EQ(decoder.ReadInt32(&v1), Status::Ok());
EXPECT_EQ(v1, 42);
int32_t v2 = 0;
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 2u);
- EXPECT_EQ(decoder.ReadSint32(&v2), Status::OK);
+ EXPECT_EQ(decoder.ReadSint32(&v2), Status::Ok());
EXPECT_EQ(v2, -13);
bool v3 = true;
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 3u);
- EXPECT_EQ(decoder.ReadBool(&v3), Status::OK);
+ EXPECT_EQ(decoder.ReadBool(&v3), Status::Ok());
EXPECT_FALSE(v3);
double v4 = 0;
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 4u);
- EXPECT_EQ(decoder.ReadDouble(&v4), Status::OK);
+ EXPECT_EQ(decoder.ReadDouble(&v4), Status::Ok());
EXPECT_EQ(v4, 3.14159);
uint32_t v5 = 0;
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 5u);
- EXPECT_EQ(decoder.ReadFixed32(&v5), Status::OK);
+ EXPECT_EQ(decoder.ReadFixed32(&v5), Status::Ok());
EXPECT_EQ(v5, 0xdeadbeef);
std::string_view v6;
char buffer[16];
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 6u);
- EXPECT_EQ(decoder.ReadString(&v6), Status::OK);
+ EXPECT_EQ(decoder.ReadString(&v6), Status::Ok());
std::memcpy(buffer, v6.data(), v6.size());
buffer[v6.size()] = '\0';
EXPECT_STREQ(buffer, "Hello world");
- EXPECT_EQ(decoder.Next(), Status::OUT_OF_RANGE);
+ EXPECT_EQ(decoder.Next(), Status::OutOfRange());
}
TEST(Decoder, Decode_SkipsUnusedFields) {
@@ -146,14 +146,14 @@
// Don't process any fields except for the fourth. Next should still iterate
// correctly despite field values not being consumed.
- EXPECT_EQ(decoder.Next(), Status::OK);
- EXPECT_EQ(decoder.Next(), Status::OK);
- EXPECT_EQ(decoder.Next(), Status::OK);
- EXPECT_EQ(decoder.Next(), Status::OK);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
+ EXPECT_EQ(decoder.Next(), Status::Ok());
+ EXPECT_EQ(decoder.Next(), Status::Ok());
+ EXPECT_EQ(decoder.Next(), Status::Ok());
ASSERT_EQ(decoder.FieldNumber(), 4u);
- EXPECT_EQ(decoder.Next(), Status::OK);
- EXPECT_EQ(decoder.Next(), Status::OK);
- EXPECT_EQ(decoder.Next(), Status::OUT_OF_RANGE);
+ EXPECT_EQ(decoder.Next(), Status::Ok());
+ EXPECT_EQ(decoder.Next(), Status::Ok());
+ EXPECT_EQ(decoder.Next(), Status::OutOfRange());
}
TEST(CallbackDecoder, Decode) {
@@ -179,7 +179,7 @@
decoder.set_handler(&handler);
EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
- Status::OK);
+ Status::Ok());
EXPECT_TRUE(handler.called);
EXPECT_EQ(handler.test_int32, 42);
EXPECT_EQ(handler.test_sint32, -13);
@@ -206,7 +206,7 @@
decoder.set_handler(&handler);
EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
- Status::OK);
+ Status::Ok());
EXPECT_TRUE(handler.called);
EXPECT_EQ(handler.test_int32, 44);
}
@@ -216,7 +216,7 @@
TestDecodeHandler handler;
decoder.set_handler(&handler);
- EXPECT_EQ(decoder.Decode(std::span<std::byte>()), Status::OK);
+ EXPECT_EQ(decoder.Decode(std::span<std::byte>()), Status::Ok());
EXPECT_FALSE(handler.called);
EXPECT_EQ(handler.test_int32, 0);
EXPECT_EQ(handler.test_sint32, 0);
@@ -231,7 +231,7 @@
decoder.set_handler(&handler);
EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
- Status::DATA_LOSS);
+ Status::DataLoss());
}
// Only processes fields numbered 1 or 3.
@@ -241,10 +241,10 @@
uint32_t field_number) override {
switch (field_number) {
case 1:
- EXPECT_EQ(decoder.ReadInt32(&field_one), Status::OK);
+ EXPECT_EQ(decoder.ReadInt32(&field_one), Status::Ok());
break;
case 3:
- EXPECT_EQ(decoder.ReadInt32(&field_three), Status::OK);
+ EXPECT_EQ(decoder.ReadInt32(&field_three), Status::Ok());
break;
default:
// Do nothing.
@@ -252,7 +252,7 @@
}
called = true;
- return Status::OK;
+ return Status::Ok();
}
bool called = false;
@@ -286,7 +286,7 @@
decoder.set_handler(&handler);
EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
- Status::OK);
+ Status::Ok());
EXPECT_TRUE(handler.called);
EXPECT_EQ(handler.field_one, 42);
EXPECT_EQ(handler.field_three, 99);
@@ -299,17 +299,17 @@
uint32_t field_number) override {
switch (field_number) {
case 1:
- EXPECT_EQ(decoder.ReadInt32(&field_one), Status::OK);
- return Status::CANCELLED;
+ EXPECT_EQ(decoder.ReadInt32(&field_one), Status::Ok());
+ return Status::Cancelled();
case 3:
- EXPECT_EQ(decoder.ReadInt32(&field_three), Status::OK);
+ EXPECT_EQ(decoder.ReadInt32(&field_three), Status::Ok());
break;
default:
// Do nothing.
break;
}
- return Status::OK;
+ return Status::Ok();
}
int32_t field_one = 0;
@@ -336,7 +336,7 @@
decoder.set_handler(&handler);
EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
- Status::CANCELLED);
+ Status::Cancelled());
EXPECT_EQ(handler.field_one, 42);
EXPECT_EQ(handler.field_three, 1111);
}