summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaya Sugiura <ssugiura@jp.adit-jv.com>2021-08-02 14:54:41 +0900
committerSaya Sugiura <ssugiura@jp.adit-jv.com>2021-10-05 11:07:37 +0900
commit34e7b114cc75ec94f06a5eb6c7548aec0dec4384 (patch)
tree1f64789e2f3582e7e3179333747befb676221e51
parent4e8d1b82e4530baf1d4a4d6a56d3868b83f2bf65 (diff)
downloadDLT-daemon-34e7b114cc75ec94f06a5eb6c7548aec0dec4384.tar.gz
gtest: Correct data amount in gtest_dlt_common
gtest_dlt_common was failing when ring buffer size was modified. Amount of data to be written is corrected in the test code. Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>
-rw-r--r--tests/gtest_dlt_common.cpp32
1 files changed, 18 insertions, 14 deletions
diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp
index 4e08d9a..9a375ce 100644
--- a/tests/gtest_dlt_common.cpp
+++ b/tests/gtest_dlt_common.cpp
@@ -329,8 +329,10 @@ TEST(t_dlt_buffer_push, normal)
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
- for (unsigned int i = 0; i <= (DLT_USER_RINGBUFFER_MIN_SIZE / size); i++)
+ for (unsigned int i = 0; i <= (DLT_USER_RINGBUFFER_MIN_SIZE / (size + sizeof(DltBufferBlockHead))); i++)
+ {
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&test, size));
+ }
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
}
@@ -417,7 +419,7 @@ TEST(t_dlt_buffer_push3, normal)
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
- for (int i = 0; i <= (DLT_USER_RINGBUFFER_MIN_SIZE / size); i++)
+ for (unsigned int i = 0; i <= (DLT_USER_RINGBUFFER_MIN_SIZE / (size * 3 + sizeof(DltBufferBlockHead))); i++)
EXPECT_LE(DLT_RETURN_OK,
dlt_buffer_push3(&buf, (unsigned char *)&test, size, (unsigned char *)&test, size,
(unsigned char *)&test,
@@ -1106,27 +1108,27 @@ TEST(t_dlt_buffer_get_message_count, normal)
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
/*printf("##### %i\n", dlt_buffer_get_message_count(&buf)); */
- EXPECT_LE(0, dlt_buffer_get_message_count(&buf));
+ EXPECT_EQ(0, dlt_buffer_get_message_count(&buf));
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
- /* Normal Use-Case, with pushing data, expected > 0 */
+ /* Normal Use-Case, with pushing data, expected 1 */
EXPECT_LE(DLT_RETURN_OK,
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
/*printf("#### %i\n", dlt_buffer_get_message_count(&buf)); */
- EXPECT_LE(0, dlt_buffer_get_message_count(&buf));
+ EXPECT_EQ(1, dlt_buffer_get_message_count(&buf));
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
- /* Pushing 1000 mesages, expected 10000 */
+ /* Pushing DLT_USER_RINGBUFFER_MIN_SIZE / (sizeof(DltUserHeader) + sizeof(DltBufferBlockHead)) mesages */
EXPECT_LE(DLT_RETURN_OK,
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
- for (int i = 1; i <= 10000; i++) {
+ for (unsigned int i = 1; i <= DLT_USER_RINGBUFFER_MIN_SIZE / (sizeof(DltUserHeader) + sizeof(DltBufferBlockHead)); i++) {
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
/*printf("#### %i\n", dlt_buffer_get_message_count(&buf)); */
- EXPECT_LE(i, dlt_buffer_get_message_count(&buf));
+ EXPECT_EQ(i, dlt_buffer_get_message_count(&buf));
}
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
@@ -1193,33 +1195,35 @@ TEST(t_dlt_buffer_get_used_size, normal)
{
DltBuffer buf;
DltUserHeader header;
+ int sum = 0;
/* Normal Use Cas buffer empty, expected 0 */
EXPECT_LE(DLT_RETURN_OK,
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
/*printf("##### %i\n", dlt_buffer_get_used_size(&buf)); */
- EXPECT_LE(0, dlt_buffer_get_used_size(&buf));
+ EXPECT_EQ(0, dlt_buffer_get_used_size(&buf));
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
- /* Normal Use-Case with pushing data, expected > 0 */
+ /* Normal Use-Case with pushing data, expected sum of DltUserHeader and DltBufferBlockHead */
EXPECT_LE(DLT_RETURN_OK,
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
/*printf("##### %i\n", dlt_buffer_get_used_size(&buf)); */
- EXPECT_LE(0, dlt_buffer_get_used_size(&buf));
+ EXPECT_EQ(sizeof(DltUserHeader) + sizeof(DltBufferBlockHead), dlt_buffer_get_used_size(&buf));
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
- /* Normal Use-Case with pushing 10000 data, expected > 0 */
+ /* Normal Use-Case with pushing DLT_USER_RINGBUFFER_MIN_SIZE / (sizeof(DltUserHeader) + sizeof(DltBufferBlockHead)) data */
EXPECT_LE(DLT_RETURN_OK,
dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
DLT_USER_RINGBUFFER_STEP_SIZE));
- for (int i = 1; i <= 10000; i++) {
+ for (unsigned int i = 1; i <= DLT_USER_RINGBUFFER_MIN_SIZE / (sizeof(DltUserHeader) + sizeof(DltBufferBlockHead)); i++) {
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
/*printf("#### %i\n", dlt_buffer_get_used_size(&buf)); */
- EXPECT_LE(1, dlt_buffer_get_used_size(&buf));
+ sum += sizeof(DltUserHeader) + sizeof(DltBufferBlockHead);
+ EXPECT_EQ(sum, dlt_buffer_get_used_size(&buf));
}
EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));