commit f5a3b8a848ef1c3f72d2fa960437ca9b66ead654
author Kalesh Singh <kaleshsingh@google.com> Thu Aug 10 13:38:17 2023 -0700
committer Kalesh Singh <kaleshsingh@google.com> Fri Aug 11 01:29:45 2023 -0700
tree 8d4da7f62fdc22e82d8ffec2a3ce03969fbc3a58
parent 24c9102d0facd739aa2af7ae3db462f05409740e

protoutil: Fix EncodedBuffer test

Commit ag/10780537 ("Optimize memory usage in incidentd")
broke the libprotoutil_test since it page aligns the chunk
size but didn't update the tests.

Fix the tests by page aligning TEST_CHUNK_SIZE; and add a
test mapping.

Test: atest -c libprotoutil_test
Bug: 295228590
Change-Id: I85d828a10cc67334751c3c3a451a75c4dbe3eb76
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>

libs/protoutil/tests/EncodedBuffer_test.cpp

diff --git a/libs/protoutil/tests/EncodedBuffer_test.cpp b/libs/protoutil/tests/EncodedBuffer_test.cpp
index f895154..8a7becf 100644
--- a/libs/protoutil/tests/EncodedBuffer_test.cpp
+++ b/libs/protoutil/tests/EncodedBuffer_test.cpp
@@ -18,7 +18,8 @@
 using namespace android::util;
 using android::sp;
 
-constexpr size_t TEST_CHUNK_SIZE = 16UL;
+constexpr size_t __TEST_CHUNK_SIZE = 16UL;
+constexpr size_t TEST_CHUNK_SIZE = (__TEST_CHUNK_SIZE + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
 constexpr size_t TEST_CHUNK_HALF_SIZE = TEST_CHUNK_SIZE / 2;
 constexpr size_t TEST_CHUNK_3X_SIZE = 3 * TEST_CHUNK_SIZE;
 
@@ -34,13 +35,13 @@
     expectPointer(buffer->wp(), 0);
     EXPECT_EQ(buffer->currentToWrite(), TEST_CHUNK_SIZE);
     for (size_t i = 0; i < TEST_CHUNK_HALF_SIZE; i++) {
-        buffer->writeRawByte(50 + i);
+        buffer->writeRawByte(static_cast<uint8_t>(50 + i));
     }
     EXPECT_EQ(buffer->size(), TEST_CHUNK_HALF_SIZE);
     expectPointer(buffer->wp(), TEST_CHUNK_HALF_SIZE);
     EXPECT_EQ(buffer->currentToWrite(), TEST_CHUNK_HALF_SIZE);
     for (size_t i = 0; i < TEST_CHUNK_SIZE; i++) {
-        buffer->writeRawByte(80 + i);
+        buffer->writeRawByte(static_cast<uint8_t>(80 + i));
     }
     EXPECT_EQ(buffer->size(), TEST_CHUNK_SIZE + TEST_CHUNK_HALF_SIZE);
     expectPointer(buffer->wp(), TEST_CHUNK_SIZE + TEST_CHUNK_HALF_SIZE);
@@ -49,10 +50,10 @@
     // verifies the buffer's data
     expectPointer(buffer->ep(), 0);
     for (size_t i = 0; i < TEST_CHUNK_HALF_SIZE; i++) {
-        EXPECT_EQ(buffer->readRawByte(), 50 + i);
+        EXPECT_EQ(buffer->readRawByte(), static_cast<uint8_t>(50 + i));
     }
     for (size_t i = 0; i < TEST_CHUNK_SIZE; i++) {
-        EXPECT_EQ(buffer->readRawByte(), 80 + i);
+        EXPECT_EQ(buffer->readRawByte(), static_cast<uint8_t>(80 + i));
     }
 
     // clears the buffer