Loading liblog/tests/liblog_test.cpp +126 −28 Original line number Original line Diff line number Diff line Loading @@ -866,13 +866,27 @@ TEST(liblog, is_loggable) { continue; continue; } } fprintf(stderr, "i=%zu j=%zu\r", i, j); fprintf(stderr, "i=%zu j=%zu\r", i, j); bool android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, levels[j].level); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1)) { || (levels[j].level == -1)) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { levels[j].level)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, levels[j].level)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { levels[j].level)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, levels[j].level)); } } } } } } } Loading @@ -891,30 +905,58 @@ TEST(liblog, is_loggable) { fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key, buf); i, j, key, buf); property_set(key, buf); property_set(key, buf); bool android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key, ""); property_set(key, ""); fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key + base_offset, buf); i, j, key + base_offset, buf); property_set(key + base_offset, buf); property_set(key + base_offset, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key + base_offset, ""); property_set(key + base_offset, ""); Loading @@ -923,30 +965,58 @@ TEST(liblog, is_loggable) { fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key, buf); i, j, key, buf); property_set(key, buf); property_set(key, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key, ""); property_set(key, ""); fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key + base_offset, buf); i, j, key + base_offset, buf); property_set(key + base_offset, buf); property_set(key + base_offset, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key + base_offset, ""); property_set(key + base_offset, ""); } } Loading @@ -969,30 +1039,58 @@ TEST(liblog, is_loggable) { fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key, buf); i, j, key, buf); property_set(key, buf); property_set(key, buf); bool android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key, ""); property_set(key, ""); fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key + base_offset, buf); i, j, key + base_offset, buf); property_set(key + base_offset, buf); property_set(key + base_offset, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key + base_offset, ""); property_set(key + base_offset, ""); } } Loading Loading
liblog/tests/liblog_test.cpp +126 −28 Original line number Original line Diff line number Diff line Loading @@ -866,13 +866,27 @@ TEST(liblog, is_loggable) { continue; continue; } } fprintf(stderr, "i=%zu j=%zu\r", i, j); fprintf(stderr, "i=%zu j=%zu\r", i, j); bool android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, levels[j].level); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1)) { || (levels[j].level == -1)) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { levels[j].level)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, levels[j].level)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { levels[j].level)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, levels[j].level)); } } } } } } } Loading @@ -891,30 +905,58 @@ TEST(liblog, is_loggable) { fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key, buf); i, j, key, buf); property_set(key, buf); property_set(key, buf); bool android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key, ""); property_set(key, ""); fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key + base_offset, buf); i, j, key + base_offset, buf); property_set(key + base_offset, buf); property_set(key + base_offset, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key + base_offset, ""); property_set(key + base_offset, ""); Loading @@ -923,30 +965,58 @@ TEST(liblog, is_loggable) { fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key, buf); i, j, key, buf); property_set(key, buf); property_set(key, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key, ""); property_set(key, ""); fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key + base_offset, buf); i, j, key + base_offset, buf); property_set(key + base_offset, buf); property_set(key + base_offset, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_DEBUG) || ((levels[i].level < ANDROID_LOG_DEBUG) && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key + base_offset, ""); property_set(key + base_offset, ""); } } Loading @@ -969,30 +1039,58 @@ TEST(liblog, is_loggable) { fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key, buf); i, j, key, buf); property_set(key, buf); property_set(key, buf); bool android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key, ""); property_set(key, ""); fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", fprintf(stderr, "i=%zu j=%zu property_set(\"%s\",\"%s\")\r", i, j, key + base_offset, buf); i, j, key + base_offset, buf); property_set(key + base_offset, buf); property_set(key + base_offset, buf); android_log_is_loggable = __android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG); if ((levels[i].level < levels[j].level) if ((levels[i].level < levels[j].level) || (levels[j].level == -1) || (levels[j].level == -1) || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO || ((levels[i].level < ANDROID_LOG_INFO) // Yes INFO && (levels[j].level == -2))) { && (levels[j].level == -2))) { EXPECT_FALSE(__android_log_is_loggable(levels[i].level, tag, if (android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_FALSE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_FALSE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } else { } else { EXPECT_TRUE(__android_log_is_loggable(levels[i].level, tag, if (!android_log_is_loggable) { ANDROID_LOG_DEBUG)); fprintf(stderr, "\n"); } EXPECT_TRUE(android_log_is_loggable); for(size_t k = 1000; k; --k) { EXPECT_TRUE(__android_log_is_loggable( levels[i].level, tag, ANDROID_LOG_DEBUG)); } } } property_set(key + base_offset, ""); property_set(key + base_offset, ""); } } Loading