diff --git a/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/LibhilogCPPtest.cpp b/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/LibhilogCPPtest.cpp index a3c0a9e40f09bc2e3f97671b419b72d52e72e34b..612d809f04df23ab685de1b87f82d5ec0cafa2a9 100755 --- a/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/LibhilogCPPtest.cpp +++ b/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/LibhilogCPPtest.cpp @@ -77,6 +77,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INFO_CPP, Function|MediumTest|Level2) "%{private}lf,%{public}.2f,%s,%{private}c", i, 1.00001, 2.333333, "sse", 'a'); std::string expected{"I 03200/HWTEST_Ftag0HWTEST_Ftag0HWTEST: \ 123456789_1234567890_publicandprivatelogHWTEST_Fis:1,,2.33,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); std::cout<<"cmdRunResult = " + cmdRunResult<,2.33,,"}; + sleep(1); CmdRun("hilog -L D -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); std::cout<<"cmdRunResult = " + cmdRunResult<,2.33,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); std::cout<<"cmdRunResult = " + cmdRunResult<,2.33,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); std::cout<<"cmdRunResult = " + cmdRunResult<,2.33,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); std::cout<<"cmdRunResult = " + cmdRunResult<,1,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -225,6 +231,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_LONG_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "INTEGER_long:%{private}ld,%{public}ld,%ld;", 2147483647L, 2147483647L, 2147483647L); std::string expected{"INTEGER_long:,2147483647,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -246,6 +253,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_4_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "INTEGER_4:%{private}4d,%{public}4d,%4d;", 2000, 2000, 2000); std::string expected{"INTEGER_4:,2000,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -267,6 +275,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_SHORT_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "INTEGER_short:%{private}hd,%{public}hd,%hd;", (short)1024, (short)1024, (short)1024); std::string expected{"INTEGER_short:,1024,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -288,6 +297,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_UN_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "INTEGER_un:%{private}u,%{public}u,%u;", 2147483647u, 2147483647u, 2147483647u); std::string expected{"INTEGER_un:,2147483647,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -309,6 +319,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_LONG_UN_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "INTEGER_long_un:%{private}lu,%{public}lu,%lu;", 7483647ul, 2147483647ul, 2147483647ul); std::string expected{"INTEGER_long_un:,2147483647,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -330,6 +341,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_INTEGER_4_UN_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "INTEGER_4_un:%{private}4u,%{public}4u,%4u;", 4000, 4000, 4000); std::string expected{"INTEGER_4_un:,4000,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -352,6 +364,7 @@ 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, (unsigned short)65535, (unsigned short)65535); std::string expected{"INTEGER_short_un:,65535,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -373,6 +386,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "FLOAT:%{private}f,%{public}f,%f;", 1.01, 1.01, 1.01); std::string expected{"FLOAT:,1.010000,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -394,6 +408,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_LONG_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "FLOAT_long:%{private}lf,%{public}lf,%lf;", 2.147483647, 2.147483647, 2.147483647); std::string expected{"FLOAT_long:,2.147484,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -417,6 +432,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_POINT2_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "FLOAT_.2:%{private}.2f,%{public}.2f,%.2f;", 2.147483647, 2.147483647, 2.147483647); std::string expected{"FLOAT_.2:,2.15,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -440,6 +456,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_FLOAT_3POINT2_CPP, Function|MediumTest|Level3) a.tag = tag; 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:,321.1,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -461,6 +478,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_CHAR_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "CHAR:%{private}c,%{public}c,%c;", 'a', 'b', 'c'); std::string expected{"CHAR:,b,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -482,6 +500,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_OCTAL_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "OCTAL:%{private}o,%{public}o,%o;", 15, 16, 17); std::string expected{"OCTAL:,20,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -503,6 +522,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_OCTAL_LONG_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "OCTAL_long:%{private}lo,%{public}lo,%lo;", 18ul, 19ul, 20ul); std::string expected{"OCTAL_long:,23,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -524,6 +544,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "HEX:%{private}x,%{public}x,%x;", 15, 16, 17); std::string expected{"HEX:,10,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -545,6 +566,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_UPPER_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "HEX_#:%{private}#x,%{public}#x,%#x;", 18, 19, 20); std::string expected{"HEX_#:,0x13,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -568,6 +590,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_LONG_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "HEX_long:%{private}lx,%{public}lx,%lx;", 21l, 22l, 23l); std::string expected{"HEX_long:,16,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -591,6 +614,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_X_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "HEX_X:%{private}X,%{public}X,%X;", 24u, 25u, 26u); std::string expected{"HEX_X:,19,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -614,6 +638,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_UPPER_X_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "HEX_#X:%{private}#X,%{public}#X,%#X;", 27, 28, 28); std::string expected{"HEX_#X:,0X1C,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -637,6 +662,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_HEX_LONG_UPPER_X_CPP, Function|MediumTest|Level3 a.tag = tag; HiLog::Fatal(a, "HEX_long_X:%{private}lX,%{public}lX,%lX;", 30ul, 31ul, 32ul); std::string expected{"HEX_long_X:,1F,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -658,6 +684,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "STRING:%{private}s,%{public}s,%s;", "STRING1", "STRING2", "STRING3"); std::string expected{"STRING:,STRING2,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -679,6 +706,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_EMPTY_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "STRING_empty:%{private}s,%{public}s,%s;", "", "", ""); std::string expected{"STRING_empty:,,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -700,6 +728,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_STR_CHINESE_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "STRING_Chinese:%{private}s,%{public}s,%s;", "中文", "中文", "中文"); std::string expected{"STRING_Chinese:,中文,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -721,6 +750,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_DOUBLE_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "DOUBLE_e:%{private}e,%{public}e,%e;", 1e-30, 2.231e10, 3.999e-13); std::string expected{"DOUBLE_e:,2.231000e+10,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -744,6 +774,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_UPPER_DOUBLE_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "DOUBLE_E:%{private}E,%{public}E,%E;", 4.88E2, 5.676767e-2, 6.17E13); std::string expected{"DOUBLE_E:,5.676767E-02,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -767,6 +798,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_AUTO_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "AUTO:%{private}g,%{public}g,%g;", 1e-30, 2.231e10, 3.999e-13); std::string expected{"AUTO:,2.231e+10,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -790,6 +822,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_E_UPPER_AUTO_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "AUTO_E:%{private}G,%{public}G,%G;", 4.88E2, 5.676767e-2, 6.17E13); std::string expected{"AUTO_E:,0.0567677,;"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -812,6 +845,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_PRIVATE_CPP, Function|MediumTest|Level3) HiLog::Fatal(a, "private:%{private}d,%{private}lf,%{private}.2f,%{private}s,%{private}c", 1, 1.00001, 2.333333, "sse", 'a'); std::string expected{"private:,,,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -834,6 +868,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_PUBLIC_CPP, Function|MediumTest|Level3) HiLog::Fatal(a, "public:%{public}d,%{public}lf,%{public}.2f,%{public}s,%{public}c", 1, 1.00001, 2.333333, "sse", 'a'); std::string expected{"public:1,1.000010,2.33,sse,a"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -855,6 +890,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_NO_SIGN_CPP, Function|MediumTest|Level3) a.tag = tag; HiLog::Fatal(a, "no_sign:%d,%lf,%.2f,%s,%c", 1, 1.00001, 2.333333, "sse", 'a'); std::string expected{"no_sign:,,,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -878,6 +914,7 @@ HWTEST_F(LibhilogCPPtest, HILOG_MIX_CPP, Function|MediumTest|Level3) a.tag = tag; 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,,2.33,,"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -899,6 +936,7 @@ HWTEST_F(LibhilogCPPtest, TAG_CHECK_CPP, Function|MediumTest|Level2) a.tag = tagNormal; 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:"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -921,6 +959,7 @@ HWTEST_F(LibhilogCPPtest, TAG_OVER_CHECK_CPP, Function|MediumTest|Level2) a.tag = tagToolong; 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_:"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST_", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -942,6 +981,7 @@ HWTEST_F(LibhilogCPPtest, DOMAIN_CHECK_CPP, Function|MediumTest|Level1) a.tag = tagNormal; 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:"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); } @@ -963,6 +1003,7 @@ HWTEST_F(LibhilogCPPtest, TYPE_APP_CHECK_CPP, Function|MediumTest|Level2) a.tag = tagNormal; 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:"}; + sleep(1); CmdRun("hilog -x | grep HWTEST_Ftag0HWTEST_Ftag0HWTEST", cmdRunResult); ASSERT_TRUE(cmdRunResult.find(expected) != std::string::npos); }