Merge "liblog: cleanup TODOs in tests" (ac0cee53) · Commits · e / os / android_system_core

liblog/tests/liblog_test.cpp

+3 −10

Original line number	Original line	Diff line number	Diff line
	@@ -97,10 +97,7 @@ static void RunLogTests(log_id_t log_buffer, FWrite write_messages, FCheck check
	ASSERT_EQ(log_buffer, log_msg.id());		ASSERT_EQ(log_buffer, log_msg.id());
	ASSERT_EQ(pid, log_msg.entry.pid);		ASSERT_EQ(pid, log_msg.entry.pid);

	// TODO: Should this be an assert?		ASSERT_NE(nullptr, log_msg.msg());
	if (log_msg.msg() == nullptr) {
	continue;
	}

	check_message(log_msg, &found);		check_message(log_msg, &found);
	}		}
	@@ -121,10 +118,7 @@ static void RunLogTests(log_id_t log_buffer, FWrite write_messages, FCheck check
	ASSERT_EQ(log_buffer, log_msg.id());		ASSERT_EQ(log_buffer, log_msg.id());
	ASSERT_EQ(pid, log_msg.entry.pid);		ASSERT_EQ(pid, log_msg.entry.pid);

	// TODO: Should this be an assert?		ASSERT_NE(nullptr, log_msg.msg());
	if (log_msg.msg() == nullptr) {
	continue;
	}

	found = false;		found = false;
	check_message(log_msg, &found);		check_message(log_msg, &found);
	@@ -1031,7 +1025,7 @@ TEST(liblog, __android_log_buf_print__maxtag) {
	#endif		#endif
	}		}

	// TODO: This test is tautological. android_logger_list_read() calls recv() with		// Note: This test is tautological. android_logger_list_read() calls recv() with
	// LOGGER_ENTRY_MAX_PAYLOAD as its size argument, so it's not possible for this test to read a		// LOGGER_ENTRY_MAX_PAYLOAD as its size argument, so it's not possible for this test to read a
	// payload larger than that size.		// payload larger than that size.
	TEST(liblog, too_big_payload) {		TEST(liblog, too_big_payload) {
	@@ -1982,7 +1976,6 @@ TEST(liblog,
	#endif		#endif
	}		}

	// TODO: Do we need to check that we didn't actually write anything if we return a failure here?
	TEST(liblog,		TEST(liblog,
	android_errorWriteWithInfoLog__android_logger_list_read__null_data) {		android_errorWriteWithInfoLog__android_logger_list_read__null_data) {
	#ifdef __ANDROID__		#ifdef __ANDROID__