Merge "system/log: Replace fatal_if => assert_that" into main (6b9f6fe4) · Commits · e / os / android_packages_modules_Bluetooth

system/log/include/bluetooth/log.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -205,20 +205,20 @@ template <typename T0, typename T1, typename T2, typename T3>
		}

		template <typename... T>
		struct fatal_if {
		fatal_if(bool cond, fmt::format_string<T...> fmt, T&&... args,
		struct assert_that {
		assert_that(bool cond, fmt::format_string<T...> fmt, T&&... args,
		log_internal::source_location location =
		log_internal::source_location()) {
		if (cond) {
		if (!cond) {
		vlog(log_internal::kFatal, LOG_TAG, location,
		static_cast<fmt::string_view>(fmt),
		fmt::make_format_args(format_replace(args)...));
		fmt::make_format_args(log_internal::format_replace(args)...));
		}
		}
		};

		template <typename... T>
		fatal_if(fmt::format_string<T...>, T&&...) -> fatal_if<T...>;
		assert_that(bool, fmt::format_string<T...>, T&&...) -> assert_that<T...>;

		} // namespace bluetooth::log

system/log/src/vlog_test.cc

+8 −6

Original line number	Diff line number	Diff line
		@@ -149,13 +149,15 @@ TEST(BluetoothLogDeathTest, fatal) {
		"fatal test 2, 3");
		}

		TEST(BluetoothLogDeathTest, fatal_if) {
		TEST(BluetoothLogDeathTest, assert_that) {
		androidLogMessage.reset();

		log::fatal_if(false, "fatal_if test false");
		log::assert_that(true, "assert_that test true");
		log::assert_that(true, "assert_that test {}", "true");

		ASSERT_DEATH(
		{ log::fatal_if(true, "fatal_if test true"); }, "fatal_if test true");
		{ log::assert_that(false, "assert_that test false"); },
		"assert_that test false");
		}

		TEST(BluetoothLogTest, null_string_parameter) {
		@@ -164,7 +166,7 @@ TEST(BluetoothLogTest, null_string_parameter) {
		char const* const_null_str = nullptr;
		log::info("input: {}", const_null_str);
		EXPECT_STREQ(androidLogMessage->message,
		"packages/modules/Bluetooth/system/log/src/vlog_test.cc:165 "
		"packages/modules/Bluetooth/system/log/src/vlog_test.cc:167 "
		"TestBody: input: (nullptr)");

		androidLogMessage.reset();
		@@ -172,7 +174,7 @@ TEST(BluetoothLogTest, null_string_parameter) {
		char* null_str = nullptr;
		log::info("input: {}", null_str);
		EXPECT_STREQ(androidLogMessage->message,
		"packages/modules/Bluetooth/system/log/src/vlog_test.cc:173 "
		"packages/modules/Bluetooth/system/log/src/vlog_test.cc:175 "
		"TestBody: input: (nullptr)");

		androidLogMessage.reset();
		@@ -180,6 +182,6 @@ TEST(BluetoothLogTest, null_string_parameter) {
		char const* nonnull_str = "hello world";
		log::info("input: {}", nonnull_str);
		EXPECT_STREQ(androidLogMessage->message,
		"packages/modules/Bluetooth/system/log/src/vlog_test.cc:181 "
		"packages/modules/Bluetooth/system/log/src/vlog_test.cc:183 "
		"TestBody: input: hello world");
		}