commit 18567ba84d4e318264ec9fbc195b6827d4ca0e82
author karthik bharadwaj <karthikmb@google.com> Fri Sep 24 16:53:37 2021 -0700
committer Karthik Bharadwaj <karthikmb@google.com> Thu Oct 28 21:46:05 2021 +0000
tree 8b5a61d80638aaa62267afe36edc2c3b8e9c4bc9
parent e8f829e7aaf8537ea0c0c6ac180bc414d0c93564

Use the LogBuffer class' data offset member variable in test.

Use the LogBuffer class' 'kLogDataOffset' instead of defining
another variable for consistency.

Bug: 172654554
Test: Successful run of 'atest --host chre_unit_tests'
Change-Id: Ie4fd0bdafc1d11a9c3a9c336b012e74a7f7e316c

platform/tests/log_buffer_test.cc

diff --git a/platform/tests/log_buffer_test.cc b/platform/tests/log_buffer_test.cc
index 4dba3a9..674fe8f 100644
--- a/platform/tests/log_buffer_test.cc
+++ b/platform/tests/log_buffer_test.cc
@@ -35,7 +35,6 @@
 };
 
 static constexpr size_t kDefaultBufferSize = 1024;
-static constexpr size_t kBytesBeforeLogData = 5;
 
 // Helpers
 void copyStringWithOffset(char *destination, const char *source,
@@ -59,9 +58,8 @@
   size_t bytesCopied =
       logBuffer.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);
 
-  EXPECT_EQ(bytesCopied, strlen(testLogStr) +
-                             kBytesBeforeLogData /*loglevel, timestamp*/ + 1);
-  copyStringWithOffset(testedBuffer, outBuffer, strlen(testLogStr) + 1);
+  EXPECT_EQ(bytesCopied, strlen(testLogStr) + LogBuffer::kLogDataOffset + 1);
+  copyStringWithOffset(testedBuffer, outBuffer, LogBuffer::kLogDataOffset);
   EXPECT_TRUE(strcmp(testedBuffer, testLogStr) == 0);
 }
 
@@ -82,12 +80,11 @@
       logBuffer.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);
 
   EXPECT_EQ(bytesCopied, strlen(testLogStr) + strlen(testLogStr2) +
-                             2 * kBytesBeforeLogData /*loglevel, timestamp*/ +
-                             2);
-  copyStringWithOffset(testedBuffer, outBuffer, kBytesBeforeLogData);
+                             2 * LogBuffer::kLogDataOffset + 2);
+  copyStringWithOffset(testedBuffer, outBuffer, LogBuffer::kLogDataOffset);
   EXPECT_TRUE(strcmp(testedBuffer, testLogStr) == 0);
   copyStringWithOffset(testedBuffer, outBuffer,
-                       2 * kBytesBeforeLogData + strlen(testLogStr) + 1);
+                       2 * LogBuffer::kLogDataOffset + strlen(testLogStr) + 1);
   EXPECT_TRUE(strcmp(testedBuffer, testLogStr2) == 0);
 }
 
@@ -146,12 +143,12 @@
   size_t numLogsDropped;
   size_t bytesCopied =
       logBuffer.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);
-  memcpy(testedBuffer, outBuffer + kBytesBeforeLogData, 101);
+  memcpy(testedBuffer, outBuffer + LogBuffer::kLogDataOffset, 101);
 
   // Should have read out the second from front test log string which is 'a' + 1
   // = 'b'
   EXPECT_TRUE(strcmp(testedBuffer, std::string(100, 'b').c_str()) == 0);
-  EXPECT_EQ(bytesCopied, kBytesBeforeLogData + 100 + 1);
+  EXPECT_EQ(bytesCopied, LogBuffer::kLogDataOffset + 100 + 1);
   // Should have dropped the first log
   EXPECT_EQ(numLogsDropped, 1);
 }
@@ -271,11 +268,11 @@
   // The logs should have the text of each of the logs pushed onto the From
   // buffer in FIFO ordering.
   logBufferTo.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);
-  ASSERT_TRUE(strcmp(outBuffer + kBytesBeforeLogData, str1) == 0);
+  ASSERT_TRUE(strcmp(outBuffer + LogBuffer::kLogDataOffset, str1) == 0);
   logBufferTo.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);
-  ASSERT_TRUE(strcmp(outBuffer + kBytesBeforeLogData, str2) == 0);
+  ASSERT_TRUE(strcmp(outBuffer + LogBuffer::kLogDataOffset, str2) == 0);
   logBufferTo.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);
-  ASSERT_TRUE(strcmp(outBuffer + kBytesBeforeLogData, str3) == 0);
+  ASSERT_TRUE(strcmp(outBuffer + LogBuffer::kLogDataOffset, str3) == 0);
 
   size_t bytesCopied =
       logBufferTo.copyLogs(outBuffer, kOutBufferSize, &numLogsDropped);