Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 06d31107 编写于 作者: J jiyong 提交者： Gitee
浏览文件
操作

Merge branch 'master' of gitee.com:openharmony/xts_acts into branch_0602

上级 c837d9bd d1636b96
显示空白变更内容
内联 并排
Showing with 196 addition and 183 deletion
build_lite/BUILD.gn
浏览文件 @ 06d31107
...@@ -53,7 +53,7 @@ lite_component("acts_component") { ...@@ -53,7 +53,7 @@ lite_component("acts_component") {
"//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest", "//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest",
"//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest", "//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest",
"//test/xts/acts/startup_lite/bootstrap_posix:ActsBootstrapTest", "//test/xts/acts/startup_lite/bootstrap_posix:ActsBootstrapTest",
"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest", #"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest",
"//test/xts/acts/open_posix_testsuite/conformance/interfaces:ActsOpenPosixTest", "//test/xts/acts/open_posix_testsuite/conformance/interfaces:ActsOpenPosixTest",
#"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest", #"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest",
"//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest", "//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest",
...@@ -61,7 +61,8 @@ lite_component("acts_component") { ...@@ -61,7 +61,8 @@ lite_component("acts_component") {
#"//test/xts/acts/distributedschedule_lite/distributed_schedule_posix:ActsDMSTest", #"//test/xts/acts/distributedschedule_lite/distributed_schedule_posix:ActsDMSTest",
"//test/xts/acts/security_lite/permission_posix/pms:ActsPMSTest", "//test/xts/acts/security_lite/permission_posix/pms:ActsPMSTest",
"//test/xts/acts/hiviewdfx_lite/hilog_posix:ActsHilogTest", "//test/xts/acts/hiviewdfx_lite/hilog_posix:ActsHilogTest",
#"//test/xts/acts/multimedia_lite/media_lite_posix/recorder_native:ActsMediaRecorderTest",
"//test/xts/acts/multimedia_lite/media_lite_posix/recorder_native:ActsMediaRecorderTest",
"//test/xts/acts/graphic_lite/graphic_utils:uikit_test1", "//test/xts/acts/graphic_lite/graphic_utils:uikit_test1",
"//test/xts/acts/graphic_lite/surface:uikit_test2", "//test/xts/acts/graphic_lite/surface:uikit_test2",
...@@ -81,9 +82,9 @@ lite_component("acts_component") { ...@@ -81,9 +82,9 @@ lite_component("acts_component") {
"//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest", "//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest",
"//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest", "//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest",
"//test/xts/acts/security_lite/huks_posix:ActsSecurityDataTest", "//test/xts/acts/security_lite/huks_posix:ActsSecurityDataTest",
"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest", #"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest",
#"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest", #"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest",
#"//test/xts/acts/multimedia_lite/media_lite_posix/recorder_native:ActsMediaRecorderTest", "//test/xts/acts/multimedia_lite/media_lite_posix/recorder_native:ActsMediaRecorderTest",
"//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest", "//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest",
"//test/xts/acts/appexecfwk_lite/bundle_mgr_posix:ActsBundleMgrTest", "//test/xts/acts/appexecfwk_lite/bundle_mgr_posix:ActsBundleMgrTest",
"//test/xts/acts/aafwk_lite/ability_posix:ActsAbilityMgrTest", "//test/xts/acts/aafwk_lite/ability_posix:ActsAbilityMgrTest",
......
hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/LibhilogCPPtest.cpp
浏览文件 @ 06d31107
...@@ -75,12 +75,13 @@ HWTEST_F(LibhilogCPPtest, HILOG_INFO_CPP, Function|MediumTest|Level2) ...@@ -75,12 +75,13 @@ HWTEST_F(LibhilogCPPtest, HILOG_INFO_CPP, Function|MediumTest|Level2)
int i = 1; int i = 1;
HiLog::Info(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d," HiLog::Info(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d,"
"%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"I 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"}; std::string expected{"I 03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST: \
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl; std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl;
std::cout<<"expected = " + expected<<std::endl; std::cout<<"expected = " + expected<<std::endl;
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
* @tc.name Provides user-mode interfaces（CPP）debug * @tc.name Provides user-mode interfaces（CPP）debug
...@@ -100,11 +101,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_DEBUG_CPP, Function|MediumTest|Level0) ...@@ -100,11 +101,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_DEBUG_CPP, Function|MediumTest|Level0)
a.tag = tag; a.tag = tag;
HiLog::Debug(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d," HiLog::Debug(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d,"
"%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"D 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"}; std::string expected{"D 03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST: \
CmdRun("hilog -L D -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -L D -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl; std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl;
std::cout<<"expected = " + expected<<std::endl; std::cout<<"expected = " + expected<<std::endl;
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -125,11 +127,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_WARNING_CPP, Function|MediumTest|Level2) ...@@ -125,11 +127,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_WARNING_CPP, Function|MediumTest|Level2)
a.tag = tag; a.tag = tag;
HiLog::Warn(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d,%{private}lf," HiLog::Warn(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d,%{private}lf,"
"%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"W 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"}; std::string expected{"W 03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST: \
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl; std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl;
std::cout<<"expected = " + expected<<std::endl; std::cout<<"expected = " + expected<<std::endl;
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -150,11 +153,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_ERROR_CPP, Function|MediumTest|Level2) ...@@ -150,11 +153,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_ERROR_CPP, Function|MediumTest|Level2)
a.tag = tag; a.tag = tag;
HiLog::Error(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d," HiLog::Error(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d,"
"%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"E 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"}; std::string expected{"E 03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST: \
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl; std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl;
std::cout<<"expected = " + expected<<std::endl; std::cout<<"expected = " + expected<<std::endl;
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -175,11 +179,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_FATAL_CPP, Function|MediumTest|Level2) ...@@ -175,11 +179,12 @@ HWTEST_F(LibhilogCPPtest, HILOG_FATAL_CPP, Function|MediumTest|Level2)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d," HiLog::Fatal(a, "123456789_1234567890_publicandprivatelogHWTEST_Fis:%{public}d,"
"%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"F 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"}; std::string expected{"F 03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST: \
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl; std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl;
std::cout<<"expected = " + expected<<std::endl; std::cout<<"expected = " + expected<<std::endl;
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -199,8 +204,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_CPP, Function|MediumTest|Level3) ...@@ -199,8 +204,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER:%{private}d,%{public}d,%d;", 1, 1, 1); HiLog::Fatal(a, "INTEGER:%{private}d,%{public}d,%d;", 1, 1, 1);
std::string expected{"INTEGER:<private>,1,<private>;"}; std::string expected{"INTEGER:<private>,1,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -220,8 +225,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_LONG_CPP, Function|MediumTest|Level3) ...@@ -220,8 +225,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_LONG_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER_long:%{private}ld,%{public}ld,%ld;", 2147483647L, 2147483647L, 2147483647L); HiLog::Fatal(a, "INTEGER_long:%{private}ld,%{public}ld,%ld;", 2147483647L, 2147483647L, 2147483647L);
std::string expected{"INTEGER_long:<private>,2147483647,<private>;"}; std::string expected{"INTEGER_long:<private>,2147483647,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -241,8 +246,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_4_CPP, Function|MediumTest|Level3) ...@@ -241,8 +246,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_4_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER_4:%{private}4d,%{public}4d,%4d;", 2000, 2000, 2000); HiLog::Fatal(a, "INTEGER_4:%{private}4d,%{public}4d,%4d;", 2000, 2000, 2000);
std::string expected{"INTEGER_4:<private>,2000,<private>;"}; std::string expected{"INTEGER_4:<private>,2000,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -262,8 +267,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_SHORT_CPP, Function|MediumTest|Level3) ...@@ -262,8 +267,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_SHORT_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER_short:%{private}hd,%{public}hd,%hd;", (short)1024, (short)1024, (short)1024); HiLog::Fatal(a, "INTEGER_short:%{private}hd,%{public}hd,%hd;", (short)1024, (short)1024, (short)1024);
std::string expected{"INTEGER_short:<private>,1024,<private>;"}; std::string expected{"INTEGER_short:<private>,1024,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -283,8 +288,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_UN_CPP, Function|MediumTest|Level3) ...@@ -283,8 +288,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_UN_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER_un:%{private}u,%{public}u,%u;", 2147483647u, 2147483647u, 2147483647u); HiLog::Fatal(a, "INTEGER_un:%{private}u,%{public}u,%u;", 2147483647u, 2147483647u, 2147483647u);
std::string expected{"INTEGER_un:<private>,2147483647,<private>;"}; std::string expected{"INTEGER_un:<private>,2147483647,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -304,8 +309,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_LONG_UN_CPP, Function|MediumTest|Level3) ...@@ -304,8 +309,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_LONG_UN_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER_long_un:%{private}lu,%{public}lu,%lu;", 7483647ul, 2147483647ul, 2147483647ul); HiLog::Fatal(a, "INTEGER_long_un:%{private}lu,%{public}lu,%lu;", 7483647ul, 2147483647ul, 2147483647ul);
std::string expected{"INTEGER_long_un:<private>,2147483647,<private>;"}; std::string expected{"INTEGER_long_un:<private>,2147483647,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -325,8 +330,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_4_UN_CPP, Function|MediumTest|Level3) ...@@ -325,8 +330,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_4_UN_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "INTEGER_4_un:%{private}4u,%{public}4u,%4u;", 4000, 4000, 4000); HiLog::Fatal(a, "INTEGER_4_un:%{private}4u,%{public}4u,%4u;", 4000, 4000, 4000);
std::string expected{"INTEGER_4_un:<private>,4000,<private>;"}; std::string expected{"INTEGER_4_un:<private>,4000,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -347,8 +352,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_SHORT_UN_CPP, Function|MediumTest|Level3 ...@@ -347,8 +352,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_SHORT_UN_CPP, Function|MediumTest|Level3
HiLog::Fatal(a, "INTEGER_short_un:%{private}hu,%{public}hu,%hu;", (unsigned short)65535, HiLog::Fatal(a, "INTEGER_short_un:%{private}hu,%{public}hu,%hu;", (unsigned short)65535,
(unsigned short)65535, (unsigned short)65535); (unsigned short)65535, (unsigned short)65535);
std::string expected{"INTEGER_short_un:<private>,65535,<private>;"}; std::string expected{"INTEGER_short_un:<private>,65535,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -368,8 +373,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_CPP, Function|MediumTest|Level3) ...@@ -368,8 +373,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "FLOAT:%{private}f,%{public}f,%f;", 1.01, 1.01, 1.01); HiLog::Fatal(a, "FLOAT:%{private}f,%{public}f,%f;", 1.01, 1.01, 1.01);
std::string expected{"FLOAT:<private>,1.010000,<private>;"}; std::string expected{"FLOAT:<private>,1.010000,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -389,8 +394,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_LONG_CPP, Function|MediumTest|Level3) ...@@ -389,8 +394,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_LONG_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "FLOAT_long:%{private}lf,%{public}lf,%lf;", 2.147483647, 2.147483647, 2.147483647); HiLog::Fatal(a, "FLOAT_long:%{private}lf,%{public}lf,%lf;", 2.147483647, 2.147483647, 2.147483647);
std::string expected{"FLOAT_long:<private>,2.147484,<private>;"}; std::string expected{"FLOAT_long:<private>,2.147484,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -412,8 +417,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_POINT2_CPP, Function|MediumTest|Level3) ...@@ -412,8 +417,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_POINT2_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "FLOAT_.2:%{private}.2f,%{public}.2f,%.2f;", 2.147483647, 2.147483647, 2.147483647); HiLog::Fatal(a, "FLOAT_.2:%{private}.2f,%{public}.2f,%.2f;", 2.147483647, 2.147483647, 2.147483647);
std::string expected{"FLOAT_.2:<private>,2.15,<private>;"}; std::string expected{"FLOAT_.2:<private>,2.15,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -435,8 +440,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_3POINT2_CPP, Function|MediumTest|Level3) ...@@ -435,8 +440,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_3POINT2_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "FLOAT_3.2:%{private}3.2f,%{public}4.1f,%2.6f;", 32.147483647, 321.147483647, 23.147483647); HiLog::Fatal(a, "FLOAT_3.2:%{private}3.2f,%{public}4.1f,%2.6f;", 32.147483647, 321.147483647, 23.147483647);
std::string expected{"FLOAT_3.2:<private>,321.1,<private>;"}; std::string expected{"FLOAT_3.2:<private>,321.1,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -456,8 +461,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_CHAR_CPP, Function|MediumTest|Level3) ...@@ -456,8 +461,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_CHAR_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "CHAR:%{private}c,%{public}c,%c;", 'a', 'b', 'c'); HiLog::Fatal(a, "CHAR:%{private}c,%{public}c,%c;", 'a', 'b', 'c');
std::string expected{"CHAR:<private>,b,<private>;"}; std::string expected{"CHAR:<private>,b,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -477,8 +482,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_OCTAL_CPP, Function|MediumTest|Level3) ...@@ -477,8 +482,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_OCTAL_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "OCTAL:%{private}o,%{public}o,%o;", 15, 16, 17); HiLog::Fatal(a, "OCTAL:%{private}o,%{public}o,%o;", 15, 16, 17);
std::string expected{"OCTAL:<private>,20,<private>;"}; std::string expected{"OCTAL:<private>,20,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -498,8 +503,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_OCTAL_LONG_CPP, Function|MediumTest|Level3) ...@@ -498,8 +503,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_OCTAL_LONG_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "OCTAL_long:%{private}lo,%{public}lo,%lo;", 18ul, 19ul, 20ul); HiLog::Fatal(a, "OCTAL_long:%{private}lo,%{public}lo,%lo;", 18ul, 19ul, 20ul);
std::string expected{"OCTAL_long:<private>,23,<private>;"}; std::string expected{"OCTAL_long:<private>,23,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -519,8 +524,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_CPP, Function|MediumTest|Level3) ...@@ -519,8 +524,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "HEX:%{private}x,%{public}x,%x;", 15, 16, 17); HiLog::Fatal(a, "HEX:%{private}x,%{public}x,%x;", 15, 16, 17);
std::string expected{"HEX:<private>,10,<private>;"}; std::string expected{"HEX:<private>,10,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -540,8 +545,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_UPPER_CPP, Function|MediumTest|Level3) ...@@ -540,8 +545,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_UPPER_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "HEX_#:%{private}#x,%{public}#x,%#x;", 18, 19, 20); HiLog::Fatal(a, "HEX_#:%{private}#x,%{public}#x,%#x;", 18, 19, 20);
std::string expected{"HEX_#:<private>,0x13,<private>;"}; std::string expected{"HEX_#:<private>,0x13,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -563,8 +568,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_LONG_CPP, Function|MediumTest|Level3) ...@@ -563,8 +568,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_LONG_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "HEX_long:%{private}lx,%{public}lx,%lx;", 21l, 22l, 23l); HiLog::Fatal(a, "HEX_long:%{private}lx,%{public}lx,%lx;", 21l, 22l, 23l);
std::string expected{"HEX_long:<private>,16,<private>;"}; std::string expected{"HEX_long:<private>,16,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -586,8 +591,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_X_CPP, Function|MediumTest|Level3) ...@@ -586,8 +591,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_X_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "HEX_X:%{private}X,%{public}X,%X;", 24u, 25u, 26u); HiLog::Fatal(a, "HEX_X:%{private}X,%{public}X,%X;", 24u, 25u, 26u);
std::string expected{"HEX_X:<private>,19,<private>;"}; std::string expected{"HEX_X:<private>,19,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -609,8 +614,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_UPPER_X_CPP, Function|MediumTest|Level3) ...@@ -609,8 +614,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_UPPER_X_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "HEX_#X:%{private}#X,%{public}#X,%#X;", 27, 28, 28); HiLog::Fatal(a, "HEX_#X:%{private}#X,%{public}#X,%#X;", 27, 28, 28);
std::string expected{"HEX_#X:<private>,0X1C,<private>;"}; std::string expected{"HEX_#X:<private>,0X1C,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -632,8 +637,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_LONG_UPPER_X_CPP, Function|MediumTest|Level3 ...@@ -632,8 +637,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_LONG_UPPER_X_CPP, Function|MediumTest|Level3
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "HEX_long_X:%{private}lX,%{public}lX,%lX;", 30ul, 31ul, 32ul); HiLog::Fatal(a, "HEX_long_X:%{private}lX,%{public}lX,%lX;", 30ul, 31ul, 32ul);
std::string expected{"HEX_long_X:<private>,1F,<private>;"}; std::string expected{"HEX_long_X:<private>,1F,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -653,8 +658,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_CPP, Function|MediumTest|Level3) ...@@ -653,8 +658,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "STRING:%{private}s,%{public}s,%s;", "STRING1", "STRING2", "STRING3"); HiLog::Fatal(a, "STRING:%{private}s,%{public}s,%s;", "STRING1", "STRING2", "STRING3");
std::string expected{"STRING:<private>,STRING2,<private>;"}; std::string expected{"STRING:<private>,STRING2,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -674,8 +679,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_EMPTY_CPP, Function|MediumTest|Level3) ...@@ -674,8 +679,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_EMPTY_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "STRING_empty:%{private}s,%{public}s,%s;", "", "", ""); HiLog::Fatal(a, "STRING_empty:%{private}s,%{public}s,%s;", "", "", "");
std::string expected{"STRING_empty:<private>,,<private>;"}; std::string expected{"STRING_empty:<private>,,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -695,8 +700,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_CHINESE_CPP, Function|MediumTest|Level3) ...@@ -695,8 +700,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_CHINESE_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "STRING_Chinese:%{private}s,%{public}s,%s;", "中文", "中文", "中文"); HiLog::Fatal(a, "STRING_Chinese:%{private}s,%{public}s,%s;", "中文", "中文", "中文");
std::string expected{"STRING_Chinese:<private>,中文,<private>;"}; std::string expected{"STRING_Chinese:<private>,中文,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -716,8 +721,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_DOUBLE_CPP, Function|MediumTest|Level3) ...@@ -716,8 +721,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_DOUBLE_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "DOUBLE_e:%{private}e,%{public}e,%e;", 1e-30, 2.231e10, 3.999e-13); HiLog::Fatal(a, "DOUBLE_e:%{private}e,%{public}e,%e;", 1e-30, 2.231e10, 3.999e-13);
std::string expected{"DOUBLE_e:<private>,2.231000e+10,<private>;"}; std::string expected{"DOUBLE_e:<private>,2.231000e+10,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -739,8 +744,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_UPPER_DOUBLE_CPP, Function|MediumTest|Level3) ...@@ -739,8 +744,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_UPPER_DOUBLE_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "DOUBLE_E:%{private}E,%{public}E,%E;", 4.88E2, 5.676767e-2, 6.17E13); HiLog::Fatal(a, "DOUBLE_E:%{private}E,%{public}E,%E;", 4.88E2, 5.676767e-2, 6.17E13);
std::string expected{"DOUBLE_E:<private>,5.676767E-02,<private>;"}; std::string expected{"DOUBLE_E:<private>,5.676767E-02,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -762,8 +767,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_AUTO_CPP, Function|MediumTest|Level3) ...@@ -762,8 +767,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_AUTO_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "AUTO:%{private}g,%{public}g,%g;", 1e-30, 2.231e10, 3.999e-13); HiLog::Fatal(a, "AUTO:%{private}g,%{public}g,%g;", 1e-30, 2.231e10, 3.999e-13);
std::string expected{"AUTO:<private>,2.231e+10,<private>;"}; std::string expected{"AUTO:<private>,2.231e+10,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -785,8 +790,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_UPPER_AUTO_CPP, Function|MediumTest|Level3) ...@@ -785,8 +790,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_UPPER_AUTO_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "AUTO_E:%{private}G,%{public}G,%G;", 4.88E2, 5.676767e-2, 6.17E13); HiLog::Fatal(a, "AUTO_E:%{private}G,%{public}G,%G;", 4.88E2, 5.676767e-2, 6.17E13);
std::string expected{"AUTO_E:<private>,0.0567677,<private>;"}; std::string expected{"AUTO_E:<private>,0.0567677,<private>;"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -807,8 +812,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_PRIVATE_CPP, Function|MediumTest|Level3) ...@@ -807,8 +812,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_PRIVATE_CPP, Function|MediumTest|Level3)
HiLog::Fatal(a, "private:%{private}d,%{private}lf,%{private}.2f,%{private}s,%{private}c", HiLog::Fatal(a, "private:%{private}d,%{private}lf,%{private}.2f,%{private}s,%{private}c",
1, 1.00001, 2.333333, "sse", 'a'); 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"private:<private>,<private>,<private>,<private>,<private>"}; std::string expected{"private:<private>,<private>,<private>,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -829,8 +834,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_PUBLIC_CPP, Function|MediumTest|Level3) ...@@ -829,8 +834,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_PUBLIC_CPP, Function|MediumTest|Level3)
HiLog::Fatal(a, "public:%{public}d,%{public}lf,%{public}.2f,%{public}s,%{public}c", HiLog::Fatal(a, "public:%{public}d,%{public}lf,%{public}.2f,%{public}s,%{public}c",
1, 1.00001, 2.333333, "sse", 'a'); 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"public:1,1.000010,2.33,sse,a"}; std::string expected{"public:1,1.000010,2.33,sse,a"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -850,8 +855,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_NO_SIGN_CPP, Function|MediumTest|Level3) ...@@ -850,8 +855,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_NO_SIGN_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "no_sign:%d,%lf,%.2f,%s,%c", 1, 1.00001, 2.333333, "sse", 'a'); HiLog::Fatal(a, "no_sign:%d,%lf,%.2f,%s,%c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"no_sign:<private>,<private>,<private>,<private>,<private>"}; std::string expected{"no_sign:<private>,<private>,<private>,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -873,8 +878,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_MIX_CPP, Function|MediumTest|Level3) ...@@ -873,8 +878,8 @@ HWTEST_F(LibhilogCPPtest, HILOG_MIX_CPP, Function|MediumTest|Level3)
a.tag = tag; a.tag = tag;
HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"MIX:1,<private>,2.33,<private>,<private>"}; std::string expected{"MIX:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -894,8 +899,8 @@ HWTEST_F(LibhilogCPPtest, TAG_CHECK_CPP, Function|MediumTest|Level2) ...@@ -894,8 +899,8 @@ HWTEST_F(LibhilogCPPtest, TAG_CHECK_CPP, Function|MediumTest|Level2)
a.tag = tagNormal; a.tag = tagNormal;
HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST:"}; std::string expected{"03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST:"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -916,8 +921,8 @@ HWTEST_F(LibhilogCPPtest, TAG_OVER_CHECK_CPP, Function|MediumTest|Level2) ...@@ -916,8 +921,8 @@ HWTEST_F(LibhilogCPPtest, TAG_OVER_CHECK_CPP, Function|MediumTest|Level2)
a.tag = tagToolong; a.tag = tagToolong;
HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST_:"}; std::string expected{"03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST_:"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST_/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST_/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -937,8 +942,8 @@ HWTEST_F(LibhilogCPPtest, DOMAIN_CHECK_CPP, Function|MediumTest|Level1) ...@@ -937,8 +942,8 @@ HWTEST_F(LibhilogCPPtest, DOMAIN_CHECK_CPP, Function|MediumTest|Level1)
a.tag = tagNormal; a.tag = tagNormal;
HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"01111/HWTEST_Ftag0HWTEST_Ftag0HWTEST:"}; std::string expected{"01111/HWTEST_Ftag0HWTEST_Ftag0HWTEST:"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -958,6 +963,6 @@ HWTEST_F(LibhilogCPPtest, TYPE_APP_CHECK_CPP, Function|MediumTest|Level2) ...@@ -958,6 +963,6 @@ HWTEST_F(LibhilogCPPtest, TYPE_APP_CHECK_CPP, Function|MediumTest|Level2)
a.tag = tagNormal; a.tag = tagNormal;
HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HiLog::Fatal(a, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST:"}; std::string expected{"03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST:"};
CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///HWTEST_Ftag0HWTEST_Ftag0HWTEST/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
hiviewdfx/hilogtest/libhilogtest/libhilogCtest/libhilogCtest.cpp
浏览文件 @ 06d31107
...@@ -72,9 +72,12 @@ HWTEST_F(LibhilogCtest, HILOG_INFO, Function|MediumTest|Level2) ...@@ -72,9 +72,12 @@ HWTEST_F(LibhilogCtest, HILOG_INFO, Function|MediumTest|Level2)
int i = 1; int i = 1;
HILOG_INFO(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d," HILOG_INFO(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,"
"%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"I 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"}; std::string expected{"I 03e00/testtag0testtag0testtag0testta: \
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"};
EXPECT_EQ(cmdRunResult, expected); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
std::cout<<"cmdRunResult = " + cmdRunResult<<std::endl;
std::cout<<"expected = " + expected<<std::endl;
ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -89,9 +92,10 @@ HWTEST_F(LibhilogCtest, HILOG_DEBUG, Function|MediumTest|Level1) ...@@ -89,9 +92,10 @@ HWTEST_F(LibhilogCtest, HILOG_DEBUG, Function|MediumTest|Level1)
int i = 1; int i = 1;
HILOG_DEBUG(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,%{private}lf," HILOG_DEBUG(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,%{private}lf,"
"%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"D 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"}; std::string expected{"D 03e00/testtag0testtag0testtag0testta: \
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"};
EXPECT_EQ(cmdRunResult, expected); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -106,9 +110,10 @@ HWTEST_F(LibhilogCtest, HILOG_WARNING, Function|MediumTest|Level2) ...@@ -106,9 +110,10 @@ HWTEST_F(LibhilogCtest, HILOG_WARNING, Function|MediumTest|Level2)
int i = 1; int i = 1;
HILOG_WARN(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d," HILOG_WARN(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,"
"%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"W 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"}; std::string expected{"W 03e00/testtag0testtag0testtag0testta: \
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"};
EXPECT_EQ(cmdRunResult, expected); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -123,9 +128,10 @@ HWTEST_F(LibhilogCtest, HILOG_ERROR, Function|MediumTest|Level2) ...@@ -123,9 +128,10 @@ HWTEST_F(LibhilogCtest, HILOG_ERROR, Function|MediumTest|Level2)
int i = 1; int i = 1;
HILOG_ERROR(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,%{private}lf," HILOG_ERROR(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,%{private}lf,"
"%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"E 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"}; std::string expected{"E 03e00/testtag0testtag0testtag0testta: \
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"};
EXPECT_EQ(cmdRunResult, expected); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -140,9 +146,10 @@ HWTEST_F(LibhilogCtest, HILOG_FATAL, Function|MediumTest|Level2) ...@@ -140,9 +146,10 @@ HWTEST_F(LibhilogCtest, HILOG_FATAL, Function|MediumTest|Level2)
int i = 1; int i = 1;
HILOG_FATAL(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,%{private}lf," HILOG_FATAL(type, "123456789_1234567890_publicandprivatelogtestis:%{public}d,%{private}lf,"
"%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); "%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a');
std::string expected{"F 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"}; std::string expected{"F 03e00/testtag0testtag0testtag0testta: \
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $5, $7}'", cmdRunResult); 123456789_1234567890_publicandprivatelogtestis:1,<private>,2.33,<private>,<private>"};
EXPECT_EQ(cmdRunResult, expected); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -156,8 +163,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER, Function|MediumTest|Level3) ...@@ -156,8 +163,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER:%{private}d,%{public}d,%d;", 1, 1, 1); HILOG_FATAL(type, "INTEGER:%{private}d,%{public}d,%d;", 1, 1, 1);
std::string expected{"INTEGER:<private>,1,<private>;"}; std::string expected{"INTEGER:<private>,1,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -171,8 +178,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_LONG, Function|MediumTest|Level3) ...@@ -171,8 +178,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_LONG, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER_long:%{private}ld,%{public}ld,%ld;", 2147483647L, 2147483647L, 2147483647L); HILOG_FATAL(type, "INTEGER_long:%{private}ld,%{public}ld,%ld;", 2147483647L, 2147483647L, 2147483647L);
std::string expected{"INTEGER_long:<private>,2147483647,<private>;"}; std::string expected{"INTEGER_long:<private>,2147483647,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -186,8 +193,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_4, Function|MediumTest|Level3) ...@@ -186,8 +193,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_4, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER_4:%{private}4d,%{public}4d,%4d;", 2000, 2000, 2000); HILOG_FATAL(type, "INTEGER_4:%{private}4d,%{public}4d,%4d;", 2000, 2000, 2000);
std::string expected{"INTEGER_4:<private>,2000,<private>;"}; std::string expected{"INTEGER_4:<private>,2000,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -201,8 +208,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_SHORT, Function|MediumTest|Level3) ...@@ -201,8 +208,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_SHORT, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER_short:%{private}hd,%{public}hd,%hd;", (short)1024, (short)1024, (short)1024); HILOG_FATAL(type, "INTEGER_short:%{private}hd,%{public}hd,%hd;", (short)1024, (short)1024, (short)1024);
std::string expected{"INTEGER_short:<private>,1024,<private>;"}; std::string expected{"INTEGER_short:<private>,1024,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -216,8 +223,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_UN, Function|MediumTest|Level3) ...@@ -216,8 +223,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_UN, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER_un:%{private}u,%{public}u,%u;", 2147483647u, 2147483647u, 2147483647u); HILOG_FATAL(type, "INTEGER_un:%{private}u,%{public}u,%u;", 2147483647u, 2147483647u, 2147483647u);
std::string expected{"INTEGER_un:<private>,2147483647,<private>;"}; std::string expected{"INTEGER_un:<private>,2147483647,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -231,8 +238,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_LONG_UN, Function|MediumTest|Level3) ...@@ -231,8 +238,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_LONG_UN, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER_long_un:%{private}lu,%{public}lu,%lu;", 7483647lu, 2147483647lu, 2147483647lu); HILOG_FATAL(type, "INTEGER_long_un:%{private}lu,%{public}lu,%lu;", 7483647lu, 2147483647lu, 2147483647lu);
std::string expected{"INTEGER_long_un:<private>,2147483647,<private>;"}; std::string expected{"INTEGER_long_un:<private>,2147483647,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -246,8 +253,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_4_UN, Function|MediumTest|Level3) ...@@ -246,8 +253,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_4_UN, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "INTEGER_4_un:%{private}4u,%{public}4u,%4u;", 4000u, 4000u, 4000u); HILOG_FATAL(type, "INTEGER_4_un:%{private}4u,%{public}4u,%4u;", 4000u, 4000u, 4000u);
std::string expected{"INTEGER_4_un:<private>,4000,<private>;"}; std::string expected{"INTEGER_4_un:<private>,4000,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -262,8 +269,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_SHORT_UN, Function|MediumTest|Level3) ...@@ -262,8 +269,8 @@ HWTEST_F(LibhilogCtest, HILOG_INTEGER_SHORT_UN, Function|MediumTest|Level3)
HILOG_FATAL(type, "INTEGER_short_un:%{private}hu,%{public}hu,%hu;", HILOG_FATAL(type, "INTEGER_short_un:%{private}hu,%{public}hu,%hu;",
(unsigned short)65535, (unsigned short)65535, (unsigned short)65535); (unsigned short)65535, (unsigned short)65535, (unsigned short)65535);
std::string expected{"INTEGER_short_un:<private>,65535,<private>;"}; std::string expected{"INTEGER_short_un:<private>,65535,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -277,8 +284,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT, Function|MediumTest|Level3) ...@@ -277,8 +284,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "FLOAT:%{private}f,%{public}f,%f;", 1.01, 1.01, 1.01); HILOG_FATAL(type, "FLOAT:%{private}f,%{public}f,%f;", 1.01, 1.01, 1.01);
std::string expected{"FLOAT:<private>,1.010000,<private>;"}; std::string expected{"FLOAT:<private>,1.010000,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -292,8 +299,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT_LONG, Function|MediumTest|Level3) ...@@ -292,8 +299,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT_LONG, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "FLOAT_long:%{private}lf,%{public}lf,%lf;", 2.147483647, 2.147483647, 2.147483647); HILOG_FATAL(type, "FLOAT_long:%{private}lf,%{public}lf,%lf;", 2.147483647, 2.147483647, 2.147483647);
std::string expected{"FLOAT_long:<private>,2.147484,<private>;"}; std::string expected{"FLOAT_long:<private>,2.147484,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -309,8 +316,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT_POINT2, Function|MediumTest|Level3) ...@@ -309,8 +316,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT_POINT2, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "FLOAT_.2:%{private}.2f,%{public}.2f,%.2f;", 2.147483647, 2.147483647, 2.147483647); HILOG_FATAL(type, "FLOAT_.2:%{private}.2f,%{public}.2f,%.2f;", 2.147483647, 2.147483647, 2.147483647);
std::string expected{"FLOAT_.2:<private>,2.15,<private>;"}; std::string expected{"FLOAT_.2:<private>,2.15,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -326,8 +333,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT_3POINT2, Function|MediumTest|Level3) ...@@ -326,8 +333,8 @@ HWTEST_F(LibhilogCtest, HILOG_FLOAT_3POINT2, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "FLOAT_3.2:%{private}3.2f,%{public}4.1f,%2.6f;", 32.147483647, 321.147483647, 23.147483647); HILOG_FATAL(type, "FLOAT_3.2:%{private}3.2f,%{public}4.1f,%2.6f;", 32.147483647, 321.147483647, 23.147483647);
std::string expected{"FLOAT_3.2:<private>,321.1,<private>;"}; std::string expected{"FLOAT_3.2:<private>,321.1,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -341,8 +348,8 @@ HWTEST_F(LibhilogCtest, HILOG_CHAR, Function|MediumTest|Level3) ...@@ -341,8 +348,8 @@ HWTEST_F(LibhilogCtest, HILOG_CHAR, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "CHAR:%{private}c,%{public}c,%c;", 'a', 'b', 'c'); HILOG_FATAL(type, "CHAR:%{private}c,%{public}c,%c;", 'a', 'b', 'c');
std::string expected{"CHAR:<private>,b,<private>;"}; std::string expected{"CHAR:<private>,b,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -356,8 +363,8 @@ HWTEST_F(LibhilogCtest, HILOG_OCTAL, Function|MediumTest|Level3) ...@@ -356,8 +363,8 @@ HWTEST_F(LibhilogCtest, HILOG_OCTAL, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "OCTAL:%{private}o,%{public}o,%o;", 15, 16, 17); HILOG_FATAL(type, "OCTAL:%{private}o,%{public}o,%o;", 15, 16, 17);
std::string expected{"OCTAL:<private>,20,<private>;"}; std::string expected{"OCTAL:<private>,20,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -371,8 +378,8 @@ HWTEST_F(LibhilogCtest, HILOG_OCTAL_LONG, Function|MediumTest|Level3) ...@@ -371,8 +378,8 @@ HWTEST_F(LibhilogCtest, HILOG_OCTAL_LONG, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "OCTAL_long:%{private}lo,%{public}lo,%lo;", 022l, 023l, 024l); HILOG_FATAL(type, "OCTAL_long:%{private}lo,%{public}lo,%lo;", 022l, 023l, 024l);
std::string expected{"OCTAL_long:<private>,23,<private>;"}; std::string expected{"OCTAL_long:<private>,23,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -386,8 +393,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX, Function|MediumTest|Level3) ...@@ -386,8 +393,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "HEX:%{private}x,%{public}x,%x;", 0x0F, 0x10, 0x11); HILOG_FATAL(type, "HEX:%{private}x,%{public}x,%x;", 0x0F, 0x10, 0x11);
std::string expected{"HEX:<private>,10,<private>;"}; std::string expected{"HEX:<private>,10,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -401,8 +408,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_UPPER, Function|MediumTest|Level3) ...@@ -401,8 +408,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_UPPER, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "HEX_#:%{private}#x,%{public}#x,%#x;", 0x12, 0x13, 0x14); HILOG_FATAL(type, "HEX_#:%{private}#x,%{public}#x,%#x;", 0x12, 0x13, 0x14);
std::string expected{"HEX_#:<private>,0x13,<private>;"}; std::string expected{"HEX_#:<private>,0x13,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -418,8 +425,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_LONG, Function|MediumTest|Level3) ...@@ -418,8 +425,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_LONG, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "HEX_long:%{private}lx,%{public}lx,%lx;", 0x15l, 0x16l, 0x17l); HILOG_FATAL(type, "HEX_long:%{private}lx,%{public}lx,%lx;", 0x15l, 0x16l, 0x17l);
std::string expected{"HEX_long:<private>,16,<private>;"}; std::string expected{"HEX_long:<private>,16,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -435,8 +442,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_X, Function|MediumTest|Level3) ...@@ -435,8 +442,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_X, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "HEX_X:%{private}X,%{public}X,%X;", 0x18, 0x19, 0x1A); HILOG_FATAL(type, "HEX_X:%{private}X,%{public}X,%X;", 0x18, 0x19, 0x1A);
std::string expected{"HEX_X:<private>,19,<private>;"}; std::string expected{"HEX_X:<private>,19,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -452,8 +459,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_UPPER_X, Function|MediumTest|Level3) ...@@ -452,8 +459,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_UPPER_X, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "HEX_#X:%{private}#X,%{public}#X,%#X;", 0x1B, 0x1C, 0x1C); HILOG_FATAL(type, "HEX_#X:%{private}#X,%{public}#X,%#X;", 0x1B, 0x1C, 0x1C);
std::string expected{"HEX_#X:<private>,0X1C,<private>;"}; std::string expected{"HEX_#X:<private>,0X1C,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -469,8 +476,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_LONG_UPPER_X, Function|MediumTest|Level3) ...@@ -469,8 +476,8 @@ HWTEST_F(LibhilogCtest, HILOG_HEX_LONG_UPPER_X, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "HEX_long_X:%{private}lX,%{public}lX,%lX;", 0x1El, 0x1Fl, 0x20l); HILOG_FATAL(type, "HEX_long_X:%{private}lX,%{public}lX,%lX;", 0x1El, 0x1Fl, 0x20l);
std::string expected{"HEX_long_X:<private>,1F,<private>;"}; std::string expected{"HEX_long_X:<private>,1F,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -484,8 +491,8 @@ HWTEST_F(LibhilogCtest, HILOG_STR, Function|MediumTest|Level3) ...@@ -484,8 +491,8 @@ HWTEST_F(LibhilogCtest, HILOG_STR, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "STRING:%{private}s,%{public}s,%s;", "STRING1", "STRING2", "STRING3"); HILOG_FATAL(type, "STRING:%{private}s,%{public}s,%s;", "STRING1", "STRING2", "STRING3");
std::string expected{"STRING:<private>,STRING2,<private>;"}; std::string expected{"STRING:<private>,STRING2,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -499,8 +506,8 @@ HWTEST_F(LibhilogCtest, HILOG_STR_EMPTY, Function|MediumTest|Level3) ...@@ -499,8 +506,8 @@ HWTEST_F(LibhilogCtest, HILOG_STR_EMPTY, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "STRING_empty:%{private}s,%{public}s,%s;", "", "", ""); HILOG_FATAL(type, "STRING_empty:%{private}s,%{public}s,%s;", "", "", "");
std::string expected{"STRING_empty:<private>,,<private>;"}; std::string expected{"STRING_empty:<private>,,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -515,8 +522,8 @@ HWTEST_F(LibhilogCtest, HILOG_STR_CHINESE, Function|MediumTest|Level3) ...@@ -515,8 +522,8 @@ HWTEST_F(LibhilogCtest, HILOG_STR_CHINESE, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "STRING_Chinese:%{private}s,%{public}s,%s;", "中文", "中文", "中文"); HILOG_FATAL(type, "STRING_Chinese:%{private}s,%{public}s,%s;", "中文", "中文", "中文");
std::string expected{"STRING_Chinese:<private>,中文,<private>;"}; std::string expected{"STRING_Chinese:<private>,中文,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -530,8 +537,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_DOUBLE, Function|MediumTest|Level3) ...@@ -530,8 +537,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_DOUBLE, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "DOUBLE_e:%{private}e,%{public}e,%e;", 1e-30, 2.231e10, 3.999e-13); HILOG_FATAL(type, "DOUBLE_e:%{private}e,%{public}e,%e;", 1e-30, 2.231e10, 3.999e-13);
std::string expected{"DOUBLE_e:<private>,2.231000e+10,<private>;"}; std::string expected{"DOUBLE_e:<private>,2.231000e+10,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -547,8 +554,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_UPPER_DOUBLE, Function|MediumTest|Level3) ...@@ -547,8 +554,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_UPPER_DOUBLE, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "DOUBLE_E:%{private}E,%{public}E,%E;", 4.88E2, 5.676767e-2, 6.17E13); HILOG_FATAL(type, "DOUBLE_E:%{private}E,%{public}E,%E;", 4.88E2, 5.676767e-2, 6.17E13);
std::string expected{"DOUBLE_E:<private>,5.676767E-02,<private>;"}; std::string expected{"DOUBLE_E:<private>,5.676767E-02,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -564,8 +571,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_AUTO, Function|MediumTest|Level3) ...@@ -564,8 +571,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_AUTO, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "AUTO:%{private}g,%{public}g,%g;", 1e-30, 2.231e10, 3.999e-13); HILOG_FATAL(type, "AUTO:%{private}g,%{public}g,%g;", 1e-30, 2.231e10, 3.999e-13);
std::string expected{"AUTO:<private>,2.231e+10,<private>;"}; std::string expected{"AUTO:<private>,2.231e+10,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -581,8 +588,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_UPPER_AUTO, Function|MediumTest|Level3) ...@@ -581,8 +588,8 @@ HWTEST_F(LibhilogCtest, HILOG_E_UPPER_AUTO, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "AUTO_E:%{private}G,%{public}G,%G;", 4.88E2, 5.676767e-2, 6.17E13); HILOG_FATAL(type, "AUTO_E:%{private}G,%{public}G,%G;", 4.88E2, 5.676767e-2, 6.17E13);
std::string expected{"AUTO_E:<private>,0.0567677,<private>;"}; std::string expected{"AUTO_E:<private>,0.0567677,<private>;"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -597,8 +604,8 @@ HWTEST_F(LibhilogCtest, HILOG_PRIVATE, Function|MediumTest|Level3) ...@@ -597,8 +604,8 @@ HWTEST_F(LibhilogCtest, HILOG_PRIVATE, Function|MediumTest|Level3)
HILOG_FATAL(type, "private:%{private}d,%{private}lf,%{private}.2f," HILOG_FATAL(type, "private:%{private}d,%{private}lf,%{private}.2f,"
"%{private}s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); "%{private}s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"private:<private>,<private>,<private>,<private>,<private>"}; std::string expected{"private:<private>,<private>,<private>,<private>,<private>"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -613,8 +620,8 @@ HWTEST_F(LibhilogCtest, HILOG_PUBLIC, Function|MediumTest|Level3) ...@@ -613,8 +620,8 @@ HWTEST_F(LibhilogCtest, HILOG_PUBLIC, Function|MediumTest|Level3)
HILOG_FATAL(type, "public:%{public}d,%{public}lf,%{public}.2f,%{public}s,%{public}c", HILOG_FATAL(type, "public:%{public}d,%{public}lf,%{public}.2f,%{public}s,%{public}c",
1, 1.00001, 2.333333, "sse", 'a'); 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"public:1,1.000010,2.33,sse,a"}; std::string expected{"public:1,1.000010,2.33,sse,a"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -628,8 +635,8 @@ HWTEST_F(LibhilogCtest, HILOG_NO_SIGN, Function|MediumTest|Level3) ...@@ -628,8 +635,8 @@ HWTEST_F(LibhilogCtest, HILOG_NO_SIGN, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "no_sign:%d,%lf,%.2f,%s,%c", 1, 1.00001, 2.333333, "sse", 'a'); HILOG_FATAL(type, "no_sign:%d,%lf,%.2f,%s,%c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"no_sign:<private>,<private>,<private>,<private>,<private>"}; std::string expected{"no_sign:<private>,<private>,<private>,<private>,<private>"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -645,8 +652,8 @@ HWTEST_F(LibhilogCtest, HILOG_MIX, Function|MediumTest|Level3) ...@@ -645,8 +652,8 @@ HWTEST_F(LibhilogCtest, HILOG_MIX, Function|MediumTest|Level3)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"MIX:1,<private>,2.33,<private>,<private>"}; std::string expected{"MIX:1,<private>,2.33,<private>,<private>"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $7}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -660,8 +667,8 @@ HWTEST_F(LibhilogCtest, TAG_CHECK, Function|MediumTest|Level2) ...@@ -660,8 +667,8 @@ HWTEST_F(LibhilogCtest, TAG_CHECK, Function|MediumTest|Level2)
LogType type = LOG_CORE; LogType type = LOG_CORE;
HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"03e00/testtag0testtag0testtag0testta:"}; std::string expected{"03e00/testtag0testtag0testtag0testta:"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -675,8 +682,8 @@ HWTEST_F(LibhilogCtest, TYPE_APP_CHECK, Function|MediumTest|Level2) ...@@ -675,8 +682,8 @@ HWTEST_F(LibhilogCtest, TYPE_APP_CHECK, Function|MediumTest|Level2)
LogType type = LOG_APP; LogType type = LOG_APP;
HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"03e00/testtag0testtag0testtag0testta:"}; std::string expected{"03e00/testtag0testtag0testtag0testta:"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testta/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -692,8 +699,8 @@ HWTEST_F(LibhilogCtest, TAG_OVER_CHECK, Function|MediumTest|Level2) ...@@ -692,8 +699,8 @@ HWTEST_F(LibhilogCtest, TAG_OVER_CHECK, Function|MediumTest|Level2)
#define LOG_TAG "testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0" #define LOG_TAG "testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0testtag0"
HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"03e00/testtag0testtag0testtag0testtag:"}; std::string expected{"03e00/testtag0testtag0testtag0testtag:"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testtag/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testtag/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
/** /**
...@@ -709,6 +716,6 @@ HWTEST_F(LibhilogCtest, DOMAIN_CHECK, Function|MediumTest|Level1) ...@@ -709,6 +716,6 @@ HWTEST_F(LibhilogCtest, DOMAIN_CHECK, Function|MediumTest|Level1)
#define LOG_DOMAIN 0xD001111 #define LOG_DOMAIN 0xD001111
HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); HILOG_FATAL(type, "MIX:%{public}d,%{private}lf,%{public}.2f,%s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a');
std::string expected{"01111/testtag0testtag0testtag0testtag:"}; std::string expected{"01111/testtag0testtag0testtag0testtag:"};
CmdRun("hilog -x -M ///testtag0testtag0testtag0testtag/ | awk '{print $6}'", cmdRunResult); CmdRun("hilog -x -M ///testtag0testtag0testtag0testtag/", cmdRunResult);
EXPECT_EQ(cmdRunResult, expected); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos);
} }
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或