|
 |
eef592 |
--- src/google/protobuf/any_test.cc 2021-10-22 08:52:03.604280348 +0200
|
|
|
eef592 |
+++ src/google/protobuf/any_test.cc.orig 2021-10-22 08:51:46.935156306 +0200
|
|
|
eef592 |
@@ -60,13 +60,6 @@
|
|
|
eef592 |
EXPECT_EQ(12345, submessage.int32_value());
|
|
|
eef592 |
}
|
|
|
eef592 |
|
|
|
eef592 |
-TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {
|
|
|
eef592 |
- protobuf_unittest::TestAny submessage;
|
|
|
eef592 |
- submessage.mutable_text()->resize(INT_MAX, 'a');
|
|
|
eef592 |
- protobuf_unittest::TestAny message;
|
|
|
eef592 |
- EXPECT_FALSE(message.mutable_any_value()->PackFrom(submessage));
|
|
|
eef592 |
-}
|
|
|
eef592 |
-
|
|
|
eef592 |
TEST(AnyTest, TestUnpackWithTypeMismatch) {
|
|
|
eef592 |
protobuf_unittest::TestAny payload;
|
|
|
eef592 |
payload.set_int32_value(13);
|
|
|
eef592 |
--- src/google/protobuf/arena_unittest.cc 2021-10-22 08:52:37.804534886 +0200
|
|
|
eef592 |
+++ src/google/protobuf/arena_unittest.cc.orig 2021-10-22 08:51:55.150217437 +0200
|
|
|
eef592 |
@@ -1341,34 +1341,6 @@
|
|
|
eef592 |
// Align n to next multiple of 8
|
|
|
eef592 |
uint64_t Align8(uint64_t n) { return (n + 7) & -8; }
|
|
|
eef592 |
|
|
|
eef592 |
-TEST(ArenaTest, SpaceAllocated_and_Used) {
|
|
|
eef592 |
- Arena arena_1;
|
|
|
eef592 |
- EXPECT_EQ(0, arena_1.SpaceAllocated());
|
|
|
eef592 |
- EXPECT_EQ(0, arena_1.SpaceUsed());
|
|
|
eef592 |
- EXPECT_EQ(0, arena_1.Reset());
|
|
|
eef592 |
- Arena::CreateArray<char>(&arena_1, 320);
|
|
|
eef592 |
- // Arena will allocate slightly more than 320 for the block headers.
|
|
|
eef592 |
- EXPECT_LE(320, arena_1.SpaceAllocated());
|
|
|
eef592 |
- EXPECT_EQ(Align8(320), arena_1.SpaceUsed());
|
|
|
eef592 |
- EXPECT_LE(320, arena_1.Reset());
|
|
|
eef592 |
-
|
|
|
eef592 |
- // Test with initial block.
|
|
|
eef592 |
- std::vector<char> arena_block(1024);
|
|
|
eef592 |
- ArenaOptions options;
|
|
|
eef592 |
- options.start_block_size = 256;
|
|
|
eef592 |
- options.max_block_size = 8192;
|
|
|
eef592 |
- options.initial_block = &arena_block[0];
|
|
|
eef592 |
- options.initial_block_size = arena_block.size();
|
|
|
eef592 |
- Arena arena_2(options);
|
|
|
eef592 |
- EXPECT_EQ(1024, arena_2.SpaceAllocated());
|
|
|
eef592 |
- EXPECT_EQ(0, arena_2.SpaceUsed());
|
|
|
eef592 |
- EXPECT_EQ(1024, arena_2.Reset());
|
|
|
eef592 |
- Arena::CreateArray<char>(&arena_2, 55);
|
|
|
eef592 |
- EXPECT_EQ(1024, arena_2.SpaceAllocated());
|
|
|
eef592 |
- EXPECT_EQ(Align8(55), arena_2.SpaceUsed());
|
|
|
eef592 |
- EXPECT_EQ(1024, arena_2.Reset());
|
|
|
eef592 |
-}
|
|
|
eef592 |
-
|
|
|
eef592 |
TEST(ArenaTest, BlockSizeDoubling) {
|
|
|
eef592 |
Arena arena;
|
|
|
eef592 |
EXPECT_EQ(0, arena.SpaceUsed());
|
|
|
eef592 |
@@ -1368,22 +1396,6 @@
|
|
|
eef592 |
}
|
|
|
eef592 |
}
|
|
|
eef592 |
|
|
|
eef592 |
-TEST(ArenaTest, BlockSizeSmallerThanAllocation) {
|
|
|
eef592 |
- for (size_t i = 0; i <= 8; ++i) {
|
|
|
eef592 |
- ArenaOptions opt;
|
|
|
eef592 |
- opt.start_block_size = opt.max_block_size = i;
|
|
|
eef592 |
- Arena arena(opt);
|
|
|
eef592 |
-
|
|
|
eef592 |
- *Arena::Create<int64_t>(&arena) = 42;
|
|
|
eef592 |
- EXPECT_GE(arena.SpaceAllocated(), 8);
|
|
|
eef592 |
- EXPECT_EQ(8, arena.SpaceUsed());
|
|
|
eef592 |
-
|
|
|
eef592 |
- *Arena::Create<int64_t>(&arena) = 42;
|
|
|
eef592 |
- EXPECT_GE(arena.SpaceAllocated(), 16);
|
|
|
eef592 |
- EXPECT_EQ(16, arena.SpaceUsed());
|
|
|
eef592 |
- }
|
|
|
eef592 |
-}
|
|
|
eef592 |
-
|
|
|
eef592 |
TEST(ArenaTest, GetArenaShouldReturnTheArenaForArenaAllocatedMessages) {
|
|
|
eef592 |
Arena arena;
|
|
|
eef592 |
ArenaMessage* message = Arena::CreateMessage<ArenaMessage>(&arena);
|