From 53263ffa00b291de92dd4cb399b1cb5218d363f6 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Thu, 10 Mar 2016 15:25:14 -0800 Subject: [PATCH] liblog: test: security buffer is allowed to be denied (cherry pick from commit 29e70a98feee7eb4591fcfcca064e2ba60364a98) Bug: 27405083 Change-Id: I7cbc8fda326a2aea3bef5dabee9d3290cc818b24 --- liblog/tests/liblog_test.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp index 8864ae27f..af3a3b432 100644 --- a/liblog/tests/liblog_test.cpp +++ b/liblog/tests/liblog_test.cpp @@ -1129,11 +1129,20 @@ TEST(liblog, android_logger_get_) { struct logger * logger; EXPECT_TRUE(NULL != (logger = android_logger_open(logger_list, id))); EXPECT_EQ(id, android_logger_get_id(logger)); - EXPECT_LT(0, android_logger_get_log_size(logger)); - /* crash buffer is allowed to be empty, that is actually healthy! */ - if (android_logger_get_log_readable_size(logger) || - (strcmp("crash", name) && strcmp("security", name))) { - EXPECT_LT(0, android_logger_get_log_readable_size(logger)); + ssize_t get_log_size = android_logger_get_log_size(logger); + /* security buffer is allowed to be denied */ + if (strcmp("security", name)) { + EXPECT_LT(0, get_log_size); + /* crash buffer is allowed to be empty, that is actually healthy! */ + EXPECT_LE((strcmp("crash", name)) != 0, + android_logger_get_log_readable_size(logger)); + } else { + EXPECT_NE(0, get_log_size); + if (get_log_size < 0) { + EXPECT_GT(0, android_logger_get_log_readable_size(logger)); + } else { + EXPECT_LE(0, android_logger_get_log_readable_size(logger)); + } } EXPECT_LT(0, android_logger_get_log_version(logger)); }