From faeeac5e89a862fc8835774b655415a74de36fe3 Mon Sep 17 00:00:00 2001 From: wenlong12 Date: Sat, 7 Dec 2024 16:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86=20Signed-o?= =?UTF-8?q?ff-by:wenlong12=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wenlong12 --- .../kits/js/napi/hiperf_client_napi.cpp | 18 +- src/perf_events.cpp | 2 +- src/perf_file_format.cpp | 2 +- .../unittest/common/native/callstack_test.cpp | 6 +- test/unittest/common/native/command_test.cpp | 5 +- .../unittest/common/native/cpu_usage_test.cpp | 5 +- .../common/native/debug_logger_test.cpp | 1 - test/unittest/common/native/dwarf_test.cpp | 1 - test/unittest/common/native/hashlist_test.cpp | 1 - .../common/native/hiperf_client_test.cpp | 28 +-- .../common/native/hiperf_libreport_test.cpp | 1 - .../common/native/option_debug_test.cpp | 3 +- test/unittest/common/native/option_test.cpp | 1 - .../common/native/perf_event_record_test.cpp | 1 - .../common/native/perf_file_format_test.cpp | 1 - .../common/native/perf_file_reader_test.cpp | 6 +- .../common/native/perf_file_writer_test.cpp | 1 - test/unittest/common/native/register_test.cpp | 1 - .../common/native/report_json_file_test.cpp | 2 - .../native/report_protobuf_file_test.cpp | 6 +- test/unittest/common/native/report_test.cpp | 38 ++-- .../common/native/ring_buffer_test.cpp | 3 +- .../common/native/spe_decoder_test.cpp | 9 +- .../common/native/subcommand_dump_test.cpp | 5 +- .../common/native/subcommand_help_test.cpp | 1 - .../common/native/subcommand_list_test.cpp | 1 - .../common/native/subcommand_record_test.cpp | 9 +- .../common/native/subcommand_report_test.cpp | 157 +++++++------- .../common/native/subcommand_stat_test.cpp | 197 +++++++++--------- .../common/native/subcommand_test.cpp | 1 - .../common/native/symbols_file_test.cpp | 3 +- .../common/native/tracked_command_test.cpp | 5 +- .../common/native/unique_stack_table_test.cpp | 1 - .../unittest/common/native/utilities_test.cpp | 3 +- .../common/native/virtual_runtime_test.cpp | 3 +- .../common/native/virtual_thread_test.cpp | 3 +- 36 files changed, 255 insertions(+), 276 deletions(-) diff --git a/interfaces/kits/js/napi/hiperf_client_napi.cpp b/interfaces/kits/js/napi/hiperf_client_napi.cpp index 88c7fba..5248c51 100644 --- a/interfaces/kits/js/napi/hiperf_client_napi.cpp +++ b/interfaces/kits/js/napi/hiperf_client_napi.cpp @@ -79,7 +79,11 @@ static std::string GetJsStringFromOption(const napi_env &env, const napi_callbac NAPI_ASSERT_BASE(env, argc == 1, "requires 1 parameter", ""); napi_valuetype inputType = napi_undefined; - napi_typeof(env, args[0], &inputType); + napi_status status = napi_typeof(env, args[0], &inputType); + if (status != napi_ok) { + HILOG_ERROR(LOG_CORE, "GetJsStringFromOption failed to napi_typeof."); + return ""; + } NAPI_ASSERT_BASE(env, inputType == napi_string, "type mismatch for parameter path", ""); char value[PATH_MAX] = {0}; @@ -100,7 +104,11 @@ static bool GetBoolFromOption(const napi_env &env, const napi_callback_info &inf NAPI_ASSERT_BASE(env, argc == 1, "requires 1 parameter", false); napi_valuetype inputType = napi_undefined; - napi_typeof(env, args[0], &inputType); + napi_status status = napi_typeof(env, args[0], &inputType); + if (status != napi_ok) { + HILOG_ERROR(LOG_CORE, "GetBoolFromOption failed to napi_typeof."); + return false; + } NAPI_ASSERT_BASE(env, (inputType == napi_boolean), "type mismatch for parameter path", false); bool result = false; @@ -117,7 +125,11 @@ static uint32_t GetUintFromOption(const napi_env &env, const napi_callback_info NAPI_ASSERT_BASE(env, argc == 1, "requires 1 parameter", 0); napi_valuetype inputType = napi_undefined; - napi_typeof(env, args[0], &inputType); + napi_status status = napi_typeof(env, args[0], &inputType); + if (status != napi_ok) { + HILOG_ERROR(LOG_CORE, "GetUintFromOption failed to napi_typeof."); + return 0; + } NAPI_ASSERT_BASE(env, (inputType == napi_number), "type mismatch for parameter path", false); uint32_t result = 0; diff --git a/src/perf_events.cpp b/src/perf_events.cpp index 8ad0d00..f3a694d 100644 --- a/src/perf_events.cpp +++ b/src/perf_events.cpp @@ -189,7 +189,7 @@ PerfEvents::~PerfEvents() bool PerfEvents::IsEventSupport(perf_type_id type, __u64 config) { std::unique_ptr attr = PerfEvents::CreateDefaultAttr(type, config); - CHECK_TRUE(attr == nullptr, false, 0, ""); + CHECK_TRUE(attr == nullptr, false, 1, "attr is nullptr"); UniqueFd fd = Open(*attr.get()); if (fd < 0) { printf("event not support %s\n", GetStaticConfigName(type, config).c_str()); diff --git a/src/perf_file_format.cpp b/src/perf_file_format.cpp index d94dca4..c5c6901 100644 --- a/src/perf_file_format.cpp +++ b/src/perf_file_format.cpp @@ -380,7 +380,7 @@ bool PerfFileSectionUniStackTable::GetBinary(char *buf, size_t size) size_t PerfFileSectionUniStackTable::GetSize() { - CHECK_TRUE(processStackTable_ == nullptr, 0, 0, ""); + CHECK_TRUE(processStackTable_ == nullptr, 0, 1, "processStackTable_ is nullptr"); size_t size = 0; // section header info size size += sizeof(uint32_t); // how many tables/process diff --git a/test/unittest/common/native/callstack_test.cpp b/test/unittest/common/native/callstack_test.cpp index ad23e40..339f566 100644 --- a/test/unittest/common/native/callstack_test.cpp +++ b/test/unittest/common/native/callstack_test.cpp @@ -16,8 +16,6 @@ #include "callstack_test.h" using namespace testing::ext; -using namespace testing; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -28,7 +26,7 @@ public: static void TearDownTestCase(void); void SetUp(); void TearDown(); - default_random_engine rnd_; + std::default_random_engine rnd_; }; void CallStackTest::SetUpTestCase() @@ -555,7 +553,7 @@ HWTEST_F(CallStackTest, ExpendCallStackLimit, TestSize.Level1) ASSERT_EQ(callStack.ExpandCallStack(0, stack1, 2u), 0u); ASSERT_EQ(callStack.ExpandCallStack(0, stack2, 2u), 0u); ASSERT_EQ(callStack.ExpandCallStack(0, stack3, 2u), 1u); - EXPECT_THAT(stack1, ContainerEq(stack3)); + EXPECT_THAT(stack1, testing::ContainerEq(stack3)); ASSERT_EQ(callStack.ExpandCallStack(0, stack4, 2u), 0u); } diff --git a/test/unittest/common/native/command_test.cpp b/test/unittest/common/native/command_test.cpp index fb723dc..cd9031b 100644 --- a/test/unittest/common/native/command_test.cpp +++ b/test/unittest/common/native/command_test.cpp @@ -16,7 +16,6 @@ #include "command_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -51,8 +50,8 @@ void CommandTest::SetUp() ASSERT_EQ(Option::RegisterMainOption(TEST_OPTION_FALSE, TEST_OPTION_HELP, OptionAlwaysFalse), true); - EXPECT_CALL(*subCommandAlwaysTure, OnSubCommand(_)).WillRepeatedly(Return(true)); - EXPECT_CALL(*subCommandAlwaysFalse, OnSubCommand(_)).WillRepeatedly(Return(false)); + EXPECT_CALL(*subCommandAlwaysTure, OnSubCommand(testing::_)).WillRepeatedly(testing::Return(true)); + EXPECT_CALL(*subCommandAlwaysFalse, OnSubCommand(testing::_)).WillRepeatedly(testing::Return(false)); ASSERT_TRUE(SubCommand::RegisterSubCommand(subCommandAlwaysTure.get()->Name(), std::move(subCommandAlwaysTure))); diff --git a/test/unittest/common/native/cpu_usage_test.cpp b/test/unittest/common/native/cpu_usage_test.cpp index 4ac5146..0d3fcc6 100644 --- a/test/unittest/common/native/cpu_usage_test.cpp +++ b/test/unittest/common/native/cpu_usage_test.cpp @@ -15,7 +15,6 @@ #include "cpu_usage_test.h" #include "test_utilities.h" -using namespace std; using namespace testing::ext; using namespace std::chrono; namespace OHOS { @@ -134,7 +133,7 @@ unsigned long CpuUsageTest::GetCpuTotalUsage() fgets (buff, sizeof(buff), fd); char name[64] = {0}; // get first line cpu time data - stringstream stream; + std::stringstream stream; stream << buff; stream >> name >> userTime >> niceTime >> systemTime >> idleTime; fclose(fd); @@ -160,7 +159,7 @@ unsigned long CpuUsageTest::GetCpuProcUsage(int pid) return 0; } fgets(lineBuff, sizeof(lineBuff), fd); - stringstream stream; + std::stringstream stream; stream << lineBuff; stream >> tmpPid; const char* q = GetItems(lineBuff, PROCESS_ITEM); diff --git a/test/unittest/common/native/debug_logger_test.cpp b/test/unittest/common/native/debug_logger_test.cpp index d3178c2..6ccc7bf 100644 --- a/test/unittest/common/native/debug_logger_test.cpp +++ b/test/unittest/common/native/debug_logger_test.cpp @@ -20,7 +20,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/dwarf_test.cpp b/test/unittest/common/native/dwarf_test.cpp index e5d149b..3f62ed4 100644 --- a/test/unittest/common/native/dwarf_test.cpp +++ b/test/unittest/common/native/dwarf_test.cpp @@ -20,7 +20,6 @@ #include "dwarf_test.h" using namespace testing::ext; -using namespace std; // using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/hashlist_test.cpp b/test/unittest/common/native/hashlist_test.cpp index 697e3f7..854cc91 100644 --- a/test/unittest/common/native/hashlist_test.cpp +++ b/test/unittest/common/native/hashlist_test.cpp @@ -17,7 +17,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { diff --git a/test/unittest/common/native/hiperf_client_test.cpp b/test/unittest/common/native/hiperf_client_test.cpp index ab85ef1..a7e862c 100644 --- a/test/unittest/common/native/hiperf_client_test.cpp +++ b/test/unittest/common/native/hiperf_client_test.cpp @@ -67,10 +67,10 @@ HWTEST_F(HiperfClientTest, NoPara, TestSize.Level1) ASSERT_TRUE(myHiperf.Start()); ASSERT_TRUE(myHiperf.Pause()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Resume()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Stop()); @@ -88,10 +88,10 @@ HWTEST_F(HiperfClientTest, OutDir, TestSize.Level1) ASSERT_TRUE(myHiperf.Start()); ASSERT_TRUE(myHiperf.Pause()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Resume()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Stop()); @@ -108,10 +108,10 @@ HWTEST_F(HiperfClientTest, DebugMuchMode, TestSize.Level1) ASSERT_TRUE(myHiperf.Start()); ASSERT_TRUE(myHiperf.Pause()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Resume()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Stop()); @@ -129,10 +129,10 @@ HWTEST_F(HiperfClientTest, EnableHilog, TestSize.Level1) ASSERT_TRUE(myHiperf.Start()); ASSERT_TRUE(myHiperf.Pause()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Resume()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Stop()); @@ -148,10 +148,10 @@ HWTEST_F(HiperfClientTest, Prepare, TestSize.Level1) HiperfClient::Client myHiperf("/data/local/tmp/"); ASSERT_TRUE(myHiperf.PrePare(opt)); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.StartRun()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Stop()); @@ -185,12 +185,12 @@ void HiperfClientTest::TestCaseOption(const HiperfClient::RecordOption &opt) if (!myHiperf.Pause()) { retPause = false; } - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); if (!myHiperf.Resume()) { retResume = false; } - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); if (!myHiperf.Stop()) { retStop = false; @@ -484,10 +484,10 @@ HWTEST_F(HiperfClientTest, SetVecBranchSampleTypes, TestSize.Level1) #else ASSERT_TRUE(myHiperf.Start(opt)); ASSERT_TRUE(myHiperf.Pause()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Resume()); - this_thread::sleep_for(1s); + std::this_thread::sleep_for(1s); ASSERT_TRUE(myHiperf.Stop()); #endif diff --git a/test/unittest/common/native/hiperf_libreport_test.cpp b/test/unittest/common/native/hiperf_libreport_test.cpp index 6060187..7316019 100644 --- a/test/unittest/common/native/hiperf_libreport_test.cpp +++ b/test/unittest/common/native/hiperf_libreport_test.cpp @@ -21,7 +21,6 @@ #include "utilities.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { diff --git a/test/unittest/common/native/option_debug_test.cpp b/test/unittest/common/native/option_debug_test.cpp index 648b97b..59b0785 100644 --- a/test/unittest/common/native/option_debug_test.cpp +++ b/test/unittest/common/native/option_debug_test.cpp @@ -22,7 +22,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -35,7 +34,7 @@ public: void TearDown(); const std::string TEST_LOG_MESSAGE = ""; void LogLevelTest(std::vector args, DebugLevel level, bool result = true); - default_random_engine rnd_; + std::default_random_engine rnd_; }; void OptionDebugTest::SetUpTestCase() diff --git a/test/unittest/common/native/option_test.cpp b/test/unittest/common/native/option_test.cpp index 99615a2..30065b8 100644 --- a/test/unittest/common/native/option_test.cpp +++ b/test/unittest/common/native/option_test.cpp @@ -22,7 +22,6 @@ #include "option.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/perf_event_record_test.cpp b/test/unittest/common/native/perf_event_record_test.cpp index 6062da6..b5b2b7c 100644 --- a/test/unittest/common/native/perf_event_record_test.cpp +++ b/test/unittest/common/native/perf_event_record_test.cpp @@ -19,7 +19,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { diff --git a/test/unittest/common/native/perf_file_format_test.cpp b/test/unittest/common/native/perf_file_format_test.cpp index 1b97e06..c227cc4 100644 --- a/test/unittest/common/native/perf_file_format_test.cpp +++ b/test/unittest/common/native/perf_file_format_test.cpp @@ -16,7 +16,6 @@ #include "perf_file_format_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { diff --git a/test/unittest/common/native/perf_file_reader_test.cpp b/test/unittest/common/native/perf_file_reader_test.cpp index 5207d22..a07bdb2 100644 --- a/test/unittest/common/native/perf_file_reader_test.cpp +++ b/test/unittest/common/native/perf_file_reader_test.cpp @@ -21,7 +21,6 @@ #include "perf_file_reader_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -76,6 +75,7 @@ HWTEST_F(PerfFileReaderTest, Test_ReadFetureSection_success, TestSize.Level1) PerfFileReader *hiperfFileReader = new PerfFileReader(filename, fp); bool ret = hiperfFileReader->ReadFeatureSection(); EXPECT_EQ(ret, true); + delete hiperfFileReader; } HWTEST_F(PerfFileReaderTest, Test_ReadFetureSection, TestSize.Level1) @@ -127,7 +127,7 @@ HWTEST_F(PerfFileReaderTest, ReadIdsForAttr2, TestSize.Level1) { perf_file_attr attr; attr.ids.size = 1; - std::string fileName = "/proc/" + to_string(getpid()) + "/cmdline"; + std::string fileName = "/proc/" + std::to_string(getpid()) + "/cmdline"; FILE* fp = fopen(fileName.c_str(), "r"); EXPECT_NE(fp, nullptr); std::vector v; @@ -141,7 +141,7 @@ HWTEST_F(PerfFileReaderTest, ReadIdsForAttr3, TestSize.Level1) perf_file_attr attr; attr.ids.size = 4; attr.ids.offset = 0; - std::string fileName = "/proc/" + to_string(getpid()) + "/cmdline"; + std::string fileName = "/proc/" + std::to_string(getpid()) + "/cmdline"; FILE* fp = fopen(fileName.c_str(), "r"); EXPECT_NE(fp, nullptr); std::vector v; diff --git a/test/unittest/common/native/perf_file_writer_test.cpp b/test/unittest/common/native/perf_file_writer_test.cpp index 5f6df2e..297c587 100644 --- a/test/unittest/common/native/perf_file_writer_test.cpp +++ b/test/unittest/common/native/perf_file_writer_test.cpp @@ -18,7 +18,6 @@ #include "virtual_runtime.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { diff --git a/test/unittest/common/native/register_test.cpp b/test/unittest/common/native/register_test.cpp index 85b1778..899e0c1 100644 --- a/test/unittest/common/native/register_test.cpp +++ b/test/unittest/common/native/register_test.cpp @@ -18,7 +18,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/report_json_file_test.cpp b/test/unittest/common/native/report_json_file_test.cpp index 8f18442..65cc03b 100644 --- a/test/unittest/common/native/report_json_file_test.cpp +++ b/test/unittest/common/native/report_json_file_test.cpp @@ -19,9 +19,7 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; -using namespace ::testing; namespace OHOS { namespace Developtools { namespace HiPerf { diff --git a/test/unittest/common/native/report_protobuf_file_test.cpp b/test/unittest/common/native/report_protobuf_file_test.cpp index 2b02495..0a09d70 100644 --- a/test/unittest/common/native/report_protobuf_file_test.cpp +++ b/test/unittest/common/native/report_protobuf_file_test.cpp @@ -21,9 +21,7 @@ using namespace Proto; using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; -using namespace ::testing; namespace OHOS { namespace Developtools { namespace HiPerf { @@ -118,11 +116,11 @@ HWTEST_F(ReportProtobufFileTest, ProcessRecord, TestSize.Level1) const PerfRecordComm comm(false, 2, 3, "dummy"); const PerfRecordLost lost(false, 1, 99); - EXPECT_CALL(protobufOutputFileWriter, ProcessRecord(Matcher(_))) + EXPECT_CALL(protobufOutputFileWriter, ProcessRecord(testing::Matcher(testing::_))) .Times(1); protobufOutputFileWriter.ProcessRecord(comm); - EXPECT_CALL(protobufOutputFileWriter, ProcessRecord(Matcher(_))) + EXPECT_CALL(protobufOutputFileWriter, ProcessRecord(testing::Matcher(testing::_))) .Times(2); protobufOutputFileWriter.ProcessRecord(lost); protobufOutputFileWriter.ProcessRecord(lost); diff --git a/test/unittest/common/native/report_test.cpp b/test/unittest/common/native/report_test.cpp index 2fe1a7f..5f0ca99 100644 --- a/test/unittest/common/native/report_test.cpp +++ b/test/unittest/common/native/report_test.cpp @@ -19,9 +19,7 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; -using namespace ::testing; namespace OHOS { namespace Developtools { namespace HiPerf { @@ -517,13 +515,13 @@ HWTEST_F(ReportTest, MultiLevelSame, TestSize.Level1) } report; ReportItem dummy(0, 0, "comm", "", "", 0, 0); - EXPECT_CALL(report, MultiLevelCompare(_, _)).WillOnce(Return(0)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)).WillOnce(testing::Return(0)); EXPECT_EQ(report.MultiLevelSame(dummy, dummy), true); - EXPECT_CALL(report, MultiLevelCompare(_, _)).WillOnce(Return(1)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)).WillOnce(testing::Return(1)); EXPECT_EQ(report.MultiLevelSame(dummy, dummy), false); - EXPECT_CALL(report, MultiLevelCompare(_, _)).WillOnce(Return(-1)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)).WillOnce(testing::Return(-1)); EXPECT_EQ(report.MultiLevelSame(dummy, dummy), false); } @@ -540,24 +538,24 @@ HWTEST_F(ReportTest, MultiLevelSorting, TestSize.Level1) } report; ReportItem dummy(0, 0, "comm", "", "", 0, 0); - EXPECT_CALL(report, MultiLevelCompare(_, _)) - .WillOnce(Return(0)) - .WillOnce(Return(0)) - .WillOnce(Return(0)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)) + .WillOnce(testing::Return(0)) + .WillOnce(testing::Return(0)) + .WillOnce(testing::Return(0)); EXPECT_EQ(report.MultiLevelCompare(dummy, dummy), 0); // 1st EXPECT_EQ(report.MultiLevelSorting(dummy, dummy), false); // 2nd 3rd and > 0? - EXPECT_CALL(report, MultiLevelCompare(_, _)) - .WillOnce(Return(1)) - .WillOnce(Return(1)) - .WillOnce(Return(-1)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)) + .WillOnce(testing::Return(1)) + .WillOnce(testing::Return(1)) + .WillOnce(testing::Return(-1)); EXPECT_EQ(report.MultiLevelCompare(dummy, dummy), 1); EXPECT_EQ(report.MultiLevelSorting(dummy, dummy), true); // > 0? - EXPECT_CALL(report, MultiLevelCompare(_, _)) - .WillOnce(Return(-1)) - .WillOnce(Return(-1)) - .WillOnce(Return(1)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)) + .WillOnce(testing::Return(-1)) + .WillOnce(testing::Return(-1)) + .WillOnce(testing::Return(1)); EXPECT_EQ(report.MultiLevelCompare(dummy, dummy), -1); EXPECT_EQ(report.MultiLevelSorting(dummy, dummy), false); // > 0? } @@ -579,17 +577,17 @@ HWTEST_F(ReportTest, MultiLevelSameAndUpdateCount, TestSize.Level1) EXPECT_EQ(dummy100.eventCount_, 100u); - EXPECT_CALL(report, MultiLevelCompare(_, _)).WillOnce(Return(0)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)).WillOnce(testing::Return(0)); EXPECT_EQ(report.MultiLevelSameAndUpdateCount(dummy100, dummy200), true); // if true , 100 + 200 EXPECT_EQ(dummy100.eventCount_, 300u); - EXPECT_CALL(report, MultiLevelCompare(_, _)).WillOnce(Return(1)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)).WillOnce(testing::Return(1)); EXPECT_EQ(report.MultiLevelSameAndUpdateCount(dummy200, dummy200), false); EXPECT_EQ(dummy200.eventCount_, 200u); EXPECT_EQ(dummy300.eventCount_, 300u); - EXPECT_CALL(report, MultiLevelCompare(_, _)).WillOnce(Return(-1)); + EXPECT_CALL(report, MultiLevelCompare(testing::_, testing::_)).WillOnce(testing::Return(-1)); EXPECT_EQ(report.MultiLevelSameAndUpdateCount(dummy200, dummy200), false); EXPECT_EQ(dummy200.eventCount_, 200u); EXPECT_EQ(dummy300.eventCount_, 300u); diff --git a/test/unittest/common/native/ring_buffer_test.cpp b/test/unittest/common/native/ring_buffer_test.cpp index fbb813e..ec46bb2 100644 --- a/test/unittest/common/native/ring_buffer_test.cpp +++ b/test/unittest/common/native/ring_buffer_test.cpp @@ -24,7 +24,6 @@ #include "utilities.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -65,7 +64,7 @@ void RingBufferTest::ReadBufferAndCheck(RingBuffer &buf) p += sizeof(perf_event_header); uint8_t data = static_cast(checkSize & U8MASK); for (size_t i = 0; i < (checkSize - sizeof(perf_event_header)); i++) { - ASSERT_EQ(*p, data) << "checkSize = " << hex << checkSize; + ASSERT_EQ(*p, data) << "checkSize = " << std::hex << checkSize; p++; } checkSize++; diff --git a/test/unittest/common/native/spe_decoder_test.cpp b/test/unittest/common/native/spe_decoder_test.cpp index bde7dcc..5712797 100644 --- a/test/unittest/common/native/spe_decoder_test.cpp +++ b/test/unittest/common/native/spe_decoder_test.cpp @@ -20,7 +20,6 @@ #include "test_utilities.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -105,10 +104,10 @@ HWTEST_F(SpeDecoderTest, TestRecord, TestSize.Level1) // it need load some symbols and much more log stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); bool ret = Command::DispatchCommand(cmdString); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); std::string stringOut = stdoutRecord.Stop(); printf("run %" PRId64 " ms return %d\n", (uint64_t)costMs.count(), static_cast(ret)); EXPECT_EQ(true, ret); @@ -130,10 +129,10 @@ HWTEST_F(SpeDecoderTest, TestDump, TestSize.Level1) ScopeDebugLevel tempLogLevel {LEVEL_DEBUG}; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); bool ret = Command::DispatchCommand(cmdString); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); std::string stringOut = stdoutRecord.Stop(); printf("command : %s(run %" PRId64 " ms) return %d\n", cmdString.c_str(), diff --git a/test/unittest/common/native/subcommand_dump_test.cpp b/test/unittest/common/native/subcommand_dump_test.cpp index 562df06..7aefa8c 100644 --- a/test/unittest/common/native/subcommand_dump_test.cpp +++ b/test/unittest/common/native/subcommand_dump_test.cpp @@ -28,7 +28,6 @@ using namespace std::literals::chrono_literals; using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -78,10 +77,10 @@ void SubCommandDumpTest::TestDumpCommand(const std::string &option, bool expect) ScopeDebugLevel tempLogLevel {LEVEL_DEBUG}; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); bool ret = Command::DispatchCommand(cmdString); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); std::string stringOut = stdoutRecord.Stop(); printf("command : %s(run %" PRId64 " ms) return %s(expect %s)\n", cmdString.c_str(), diff --git a/test/unittest/common/native/subcommand_help_test.cpp b/test/unittest/common/native/subcommand_help_test.cpp index 8ef2e68..93c5f59 100644 --- a/test/unittest/common/native/subcommand_help_test.cpp +++ b/test/unittest/common/native/subcommand_help_test.cpp @@ -21,7 +21,6 @@ #include "utilities.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/subcommand_list_test.cpp b/test/unittest/common/native/subcommand_list_test.cpp index ef0b0b4..2179a31 100644 --- a/test/unittest/common/native/subcommand_list_test.cpp +++ b/test/unittest/common/native/subcommand_list_test.cpp @@ -19,7 +19,6 @@ #include "subcommand.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/subcommand_record_test.cpp b/test/unittest/common/native/subcommand_record_test.cpp index e1ecfe4..e5552f5 100644 --- a/test/unittest/common/native/subcommand_record_test.cpp +++ b/test/unittest/common/native/subcommand_record_test.cpp @@ -35,7 +35,6 @@ using namespace std::literals::chrono_literals; using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -145,10 +144,10 @@ void SubCommandRecordTest::TestRecordCommand(const std::string &option, bool exp // it need load some symbols and much more log stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); bool ret = Command::DispatchCommand(cmdString); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); std::string stringOut = stdoutRecord.Stop(); if (expect) { EXPECT_EQ(stringOut.find("Sample records:") != std::string::npos, true); @@ -164,7 +163,9 @@ size_t SubCommandRecordTest::GetFileSize(const char* fileName) return 0; } struct stat statbuf; - stat(fileName, &statbuf); + if (stat(fileName, &statbuf) == -1) { + return 0; + } size_t fileSize = statbuf.st_size; return fileSize; } diff --git a/test/unittest/common/native/subcommand_report_test.cpp b/test/unittest/common/native/subcommand_report_test.cpp index 0efd35d..da3b04c 100644 --- a/test/unittest/common/native/subcommand_report_test.cpp +++ b/test/unittest/common/native/subcommand_report_test.cpp @@ -20,7 +20,6 @@ #include "subcommand_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -191,10 +190,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_i, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -214,12 +213,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_gzip_fail, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string cmd = "tar -czvf " + RESOURCE_PATH + "report_test.data.tar.gz " + RESOURCE_PATH + "report_test.data"; std::system(cmd.c_str()); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data.tar.gz"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -237,10 +236,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_gzip, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i /data/local/tmp/perf.data.tar.gz"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -258,10 +257,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_i1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "perf1.data --debug"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -282,10 +281,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_i2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report " + RESOURCE_PATH + "report_test.data -i"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -305,12 +304,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_diff, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "perf1.data --diff " + RESOURCE_PATH + "report_test.data"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -331,13 +330,13 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_Diff_Same, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --diff " + RESOURCE_PATH + "report_test.data"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -357,12 +356,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_sort, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --sort pid"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -382,12 +381,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_sort1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --sort pid,tid"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -407,12 +406,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_sort2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --sort func"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -432,11 +431,11 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_sort3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "perf1.data --sort pid"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -457,12 +456,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_sort4, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --sort pids"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -482,12 +481,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_symbol, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --symbol-dir ./"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -507,12 +506,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_limit, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --limit-percent 5"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -532,12 +531,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_limit1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --limit-percent 1"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -557,12 +556,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_limit2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --limit-percent 99"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -582,12 +581,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_limit3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --limit-percent -1"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -607,12 +606,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_limit4, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --limit-percent 101"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -632,12 +631,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_callstack, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --call-stack"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -657,12 +656,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_comms, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --comms hiperf"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -682,12 +681,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_pids, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --pids 1204"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -707,12 +706,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_pids1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --pids 485"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -732,12 +731,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_pids2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --pids 11111"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -757,12 +756,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_pids3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --pids -106"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -782,12 +781,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_tids, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --tids 1205"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -807,12 +806,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_tids1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --tids 905"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -832,12 +831,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_tids2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --tids 11111"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -857,12 +856,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_tids3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ( Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --tids -109"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -882,12 +881,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_dsos, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --dsos [kernel.kallsyms]"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -907,12 +906,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_dsos1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --dsos /system/lib/libcamera.so"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -932,11 +931,11 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_dsos2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --dso"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -956,12 +955,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_funcs, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --funcs finish_task_switch"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -981,11 +980,11 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_funcs1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --func"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -1005,11 +1004,11 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_json, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --json"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -1029,10 +1028,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_json1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "perf1.data --json"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -1053,11 +1052,11 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_proto, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --proto"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -1077,10 +1076,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_proto1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "perf1.data --proto"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); @@ -1260,12 +1259,12 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_from_funcs_fail, TestSize.Level1 { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i " + RESOURCE_PATH + "report_test.data --from_funcs"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); if (HasFailure()) { @@ -1282,10 +1281,10 @@ HWTEST_F(SubCommandReportTest, TestOnSubCommand_offcpu, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("report -i /data/local/tmp/offcpu_perf.data"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), DEFAULT_RUN_TIMEOUT_MS); std::string stringOut = stdoutRecord.Stop(); if (HasFailure()) { diff --git a/test/unittest/common/native/subcommand_stat_test.cpp b/test/unittest/common/native/subcommand_stat_test.cpp index 4f5eec5..1796f44 100644 --- a/test/unittest/common/native/subcommand_stat_test.cpp +++ b/test/unittest/common/native/subcommand_stat_test.cpp @@ -31,7 +31,6 @@ #include "tracked_command.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -237,10 +236,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_a, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a -c 0 -d 3 --dumpoptions"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -263,10 +262,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_a1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a -d 3 --dumpoptions"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -290,10 +289,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_a2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a -d 3"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -316,10 +315,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_a3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a -c 0 -d 3"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -342,10 +341,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_a4, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a test"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -387,7 +386,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -396,7 +395,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -437,7 +436,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -446,7 +445,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c1, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -480,7 +479,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c2, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -489,7 +488,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c2, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -513,10 +512,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a -c 0,1 -d 3"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -549,10 +548,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c4, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -585,10 +584,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_c5, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -621,7 +620,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -630,7 +629,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -661,10 +660,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -695,10 +694,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -729,10 +728,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p2, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -763,10 +762,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_ch, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -797,10 +796,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_aa, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -823,10 +822,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d1, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat -a -d 3 --dumpoptions"), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -858,10 +857,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d2, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -893,10 +892,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d3, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -928,7 +927,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d4, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -937,7 +936,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d4, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -971,7 +970,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d5, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -980,7 +979,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d5, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1009,7 +1008,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d6, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1018,7 +1017,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_d6, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1047,7 +1046,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1056,7 +1055,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1093,7 +1092,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1102,7 +1101,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i1, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1137,10 +1136,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i2, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1172,10 +1171,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i3, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1207,7 +1206,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i4, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1216,7 +1215,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_i4, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1251,7 +1250,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1260,7 +1259,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1292,7 +1291,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1301,7 +1300,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e1, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1333,7 +1332,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e2, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1342,7 +1341,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e2, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1374,7 +1373,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e3, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1383,7 +1382,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e3, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1415,10 +1414,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_e4, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1451,7 +1450,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1460,7 +1459,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); const std::string stringOut = stdoutRecord.Stop(); @@ -1498,7 +1497,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1507,7 +1506,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g1, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); const std::string stringOut = stdoutRecord.Stop(); @@ -1544,7 +1543,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g2, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1553,7 +1552,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g2, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); const std::string stringOut = stdoutRecord.Stop(); @@ -1590,10 +1589,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g3, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); const std::string stringOut = stdoutRecord.Stop(); @@ -1627,7 +1626,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g_uk, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); g_wait = true; EXPECT_EQ(Command::DispatchCommand(cmdstr), true); g_wait = false; @@ -1636,7 +1635,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_g_uk, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1675,7 +1674,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += std::to_string(tid1) + ","; @@ -1692,7 +1691,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1723,7 +1722,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += std::to_string(tid1); @@ -1739,7 +1738,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t1, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1762,7 +1761,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t2, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += "-1"; @@ -1773,7 +1772,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t2, TestSize.Level1) EXPECT_EQ(Command::DispatchCommand(cmdString), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1794,7 +1793,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t3, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += "test"; @@ -1805,7 +1804,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t3, TestSize.Level1) EXPECT_EQ(Command::DispatchCommand(cmdString), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1834,7 +1833,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t4, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += std::to_string(tid1); @@ -1850,7 +1849,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_p_t4, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1881,7 +1880,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_verbose, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += std::to_string(tid1); @@ -1897,7 +1896,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_verbose, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1927,7 +1926,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_verbose1, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string tidString = " -t "; tidString += std::to_string(tid1); @@ -1943,7 +1942,7 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_verbose1, TestSize.Level1) cv.notify_all(); } const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -1967,10 +1966,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_cmd, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand(cmdstr), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -2139,7 +2138,7 @@ HWTEST_F(SubCommandStatTest, TestReport_Piling, TestSize.Level1) stdoutRecord.Start(); std::map> countEvents; for (int i = 0; i < 8; i++) { - auto countEvent = make_unique(PerfEvents::CountEvent {}); + auto countEvent = std::make_unique(PerfEvents::CountEvent {}); std::string configName = eventNames[i]; countEvents[configName] = std::move(countEvent); countEvents[configName]->userOnly = false; @@ -2209,10 +2208,10 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_restart_fail, TestSize.Level1) { StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); EXPECT_EQ(Command::DispatchCommand("stat --restart"), false); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); @@ -2253,18 +2252,18 @@ HWTEST_F(SubCommandStatTest, CheckPidAndApp, TestSize.Level1) continue; } pid_t pid = std::stoll(subDir); - existPid = max(existPid, pid); + existPid = std::max(existPid, pid); } std::string cmd = "stat -p " + std::to_string(existPid + rand() % 100 + 1) + " -d 2"; EXPECT_EQ(Command::DispatchCommand(cmd), false); StdoutRecord stdoutRecord; stdoutRecord.Start(); - const auto startTime = chrono::steady_clock::now(); + const auto startTime = std::chrono::steady_clock::now(); std::string existCmd = "stat -p " + std::to_string(existPid) + " -d 2"; EXPECT_EQ(Command::DispatchCommand(existCmd), true); const auto costMs = std::chrono::duration_cast( - chrono::steady_clock::now() - startTime); + std::chrono::steady_clock::now() - startTime); EXPECT_LE(costMs.count(), defaultRunTimeoutMs); std::string stringOut = stdoutRecord.Stop(); diff --git a/test/unittest/common/native/subcommand_test.cpp b/test/unittest/common/native/subcommand_test.cpp index f264817..3e1a551 100644 --- a/test/unittest/common/native/subcommand_test.cpp +++ b/test/unittest/common/native/subcommand_test.cpp @@ -19,7 +19,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/symbols_file_test.cpp b/test/unittest/common/native/symbols_file_test.cpp index 170f348..3a36e0b 100644 --- a/test/unittest/common/native/symbols_file_test.cpp +++ b/test/unittest/common/native/symbols_file_test.cpp @@ -22,7 +22,6 @@ #include using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { @@ -51,7 +50,7 @@ public: EXPECT_EQ(symbolsFile->setSymbolsFilePath(PATH_RESOURCE_TEST_DATA), true); return symbolsFile->LoadSymbols(nullptr, path); } - default_random_engine rnd_; + std::default_random_engine rnd_; }; void SymbolsFileTest::SetUpTestCase() {} diff --git a/test/unittest/common/native/tracked_command_test.cpp b/test/unittest/common/native/tracked_command_test.cpp index 1b7f94d..44dfbb7 100644 --- a/test/unittest/common/native/tracked_command_test.cpp +++ b/test/unittest/common/native/tracked_command_test.cpp @@ -20,7 +20,6 @@ #include "tracked_command_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -46,7 +45,7 @@ void TrackedCommandTest::TearDown() {} HWTEST_F(TrackedCommandTest, CommandExisted, TestSize.Level1) { - unique_ptr trackedCMD = TrackedCommand::CreateInstance(cmd_); + std::unique_ptr trackedCMD = TrackedCommand::CreateInstance(cmd_); ASSERT_NE(trackedCMD, nullptr); auto cmdName = trackedCMD->GetCommandName(); EXPECT_EQ(cmdName, cmd_[0]); @@ -70,7 +69,7 @@ HWTEST_F(TrackedCommandTest, CommandExisted, TestSize.Level1) HWTEST_F(TrackedCommandTest, CommandNotExisted, TestSize.Level1) { - unique_ptr trackedCMD = TrackedCommand::CreateInstance(cmdNotExist_); + std::unique_ptr trackedCMD = TrackedCommand::CreateInstance(cmdNotExist_); ASSERT_NE(trackedCMD, nullptr); auto cmdName = trackedCMD->GetCommandName(); EXPECT_EQ(cmdName, cmdNotExist_[0]); diff --git a/test/unittest/common/native/unique_stack_table_test.cpp b/test/unittest/common/native/unique_stack_table_test.cpp index 6fa60ae..62b165e 100644 --- a/test/unittest/common/native/unique_stack_table_test.cpp +++ b/test/unittest/common/native/unique_stack_table_test.cpp @@ -28,7 +28,6 @@ using namespace std::literals::chrono_literals; using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { diff --git a/test/unittest/common/native/utilities_test.cpp b/test/unittest/common/native/utilities_test.cpp index c60e521..2007a60 100644 --- a/test/unittest/common/native/utilities_test.cpp +++ b/test/unittest/common/native/utilities_test.cpp @@ -19,7 +19,6 @@ #include "utilities.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -76,7 +75,7 @@ void UtilitiesTest::StartThreads(const size_t count) exitThreads_ = false; size_t created = 0; - while (created < count) { + while (created < count && created < 32) { // 32: max threads threads_.emplace_back(std::thread(&UtilitiesTest::TestThread, this)); created++; } diff --git a/test/unittest/common/native/virtual_runtime_test.cpp b/test/unittest/common/native/virtual_runtime_test.cpp index bca726a..80c3286 100644 --- a/test/unittest/common/native/virtual_runtime_test.cpp +++ b/test/unittest/common/native/virtual_runtime_test.cpp @@ -26,7 +26,6 @@ #include "symbols_file_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -39,7 +38,7 @@ public: void TearDown(); const std::string TEST_LOG_MESSAGE = ""; void LogLevelTest(std::vector args, DebugLevel level); - default_random_engine rnd_; + std::default_random_engine rnd_; std::unique_ptr runtime_; bool RecordCallBack(PerfEventRecord& record); size_t callbackCount_ = 0; diff --git a/test/unittest/common/native/virtual_thread_test.cpp b/test/unittest/common/native/virtual_thread_test.cpp index 34ec81c..2b0d2bc 100644 --- a/test/unittest/common/native/virtual_thread_test.cpp +++ b/test/unittest/common/native/virtual_thread_test.cpp @@ -25,7 +25,6 @@ #include "symbols_file_test.h" using namespace testing::ext; -using namespace std; using namespace OHOS::HiviewDFX; namespace OHOS { namespace Developtools { @@ -38,7 +37,7 @@ public: void TearDown(); const std::string TEST_LOG_MESSAGE = ""; void LogLevelTest(std::vector args, DebugLevel level); - default_random_engine rnd_; + std::default_random_engine rnd_; static std::string myFilePath_; static std::string GetFullPath() { -- Gitee