From 9fac7b90bdd7d94ce7365280e8e67ad099f1e987 Mon Sep 17 00:00:00 2001 From: XiYuhao Date: Fri, 7 Jan 2022 17:08:41 +0800 Subject: [PATCH] open trace testcase Signed-off-by: XiYuhao --- ipc/native/test/unittest/common/BUILD.gn | 30 +++++++++++++++++++ .../include/dbinder_test_service.h | 2 -- .../include/dbinder_test_service_skeleton.h | 8 ----- .../src/dbinder_distributed_test.cpp | 2 -- .../src/dbinder_test_service.cpp | 2 -- .../src/dbinder_test_service_skeleton.cpp | 6 ---- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ipc/native/test/unittest/common/BUILD.gn b/ipc/native/test/unittest/common/BUILD.gn index 66e753f..ac8e9fd 100755 --- a/ipc/native/test/unittest/common/BUILD.gn +++ b/ipc/native/test/unittest/common/BUILD.gn @@ -69,11 +69,41 @@ ohos_unittest("IPCFileDescOpsTest") { "//foundation/communication/ipc/test/resource/ipc/ohos_test.xml" } +ohos_unittest("IPCHiTraceUnitTest") { + module_out_path = MODULE_OUTPUT_PATH + + include_dirs = [ "//utils/system/safwk/native/include" ] + + sources = [ "ipc_hitrace_unittest.cpp" ] + + configs = [ + "$SUBSYSTEM_DIR:ipc_util_config", + "$IPC_TEST_ROOT:ipc_test_config", + ] + + deps = [ + "$IPC_TEST_ROOT/auxiliary/native:TestAssistance", + "//third_party/googletest:gtest_main", + "//utils/native/base:utils", + ] + + external_deps = [ + "hitrace_native:libhitrace", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr_standard:samgr_proxy", + ] + + resource_config_file = + "//foundation/communication/ipc/test/resource/ipc/ohos_test.xml" +} + ############################################################################### group("unittest") { testonly = true deps = [ ":IPCFileDescOpsTest", + ":IPCHiTraceUnitTest", ":IPCNativeUnitTest", ] } diff --git a/services/dbinder/test/distributedtest/include/dbinder_test_service.h b/services/dbinder/test/distributedtest/include/dbinder_test_service.h index 534ac27..25ba6d7 100755 --- a/services/dbinder/test/distributedtest/include/dbinder_test_service.h +++ b/services/dbinder/test/distributedtest/include/dbinder_test_service.h @@ -37,9 +37,7 @@ public: int TransOversizedPkt(const std::string &dataStr, std::string &repStr) override; int ProxyTransRawData(int length) override; int StubTransRawData(int length) override; -#ifndef CONFIG_STANDARD_SYSTEM int GetChildId(uint64_t &rep) override; -#endif sptr GetRemoteObject(int type) override; int FlushAsyncCommands(int count, int length) override; int GetRemoteDecTimes() override; diff --git a/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h b/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h index 066552d..41fe229 100755 --- a/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h +++ b/services/dbinder/test/distributedtest/include/dbinder_test_service_skeleton.h @@ -23,9 +23,7 @@ #include "iremote_proxy.h" #include "hilog/log.h" #include "log_tags.h" -#ifndef CONFIG_STANDARD_SYSTEM #include "hitrace/trace.h" -#endif namespace OHOS { class IDBinderTestService : public IRemoteBroker { @@ -74,9 +72,7 @@ public: virtual int TransOversizedPkt(const std::string &dataStr, std::string &repStr) = 0; virtual int ProxyTransRawData(int lengths) = 0; virtual int StubTransRawData(int length) = 0; -#ifndef CONFIG_STANDARD_SYSTEM virtual int GetChildId(uint64_t &rep) = 0; -#endif virtual int FlushAsyncCommands(int count, int length) = 0; virtual sptr GetRemoteObject(int type) = 0; virtual int GetRemoteDecTimes() = 0; @@ -108,9 +104,7 @@ private: int OnReceivedStubObject(MessageParcel &data, MessageParcel &reply); int OnReceivedOversizedPkt(MessageParcel &data, MessageParcel &reply); int OnReceivedRawData(MessageParcel &data, MessageParcel &reply); -#ifndef CONFIG_STANDARD_SYSTEM int OnGetChildId(MessageParcel &data, MessageParcel &reply); -#endif int OnSentRawData(MessageParcel &data, MessageParcel &reply); int OnReceivedGetStubObject(MessageParcel &data, MessageParcel &reply); int OnReceivedGetDecTimes(MessageParcel &data, MessageParcel &reply); @@ -137,9 +131,7 @@ public: int TransOversizedPkt(const std::string &dataStr, std::string &repStr) override; int ProxyTransRawData(int length) override; int StubTransRawData(int length) override; -#ifndef CONFIG_STANDARD_SYSTEM int GetChildId(uint64_t &rep) override; -#endif sptr GetRemoteObject(int type) override; int GetRemoteDecTimes() override; void ClearRemoteDecTimes() override; diff --git a/services/dbinder/test/distributedtest/src/dbinder_distributed_test.cpp b/services/dbinder/test/distributedtest/src/dbinder_distributed_test.cpp index 9275bf8..b6fb51a 100755 --- a/services/dbinder/test/distributedtest/src/dbinder_distributed_test.cpp +++ b/services/dbinder/test/distributedtest/src/dbinder_distributed_test.cpp @@ -1083,7 +1083,6 @@ HWTEST_F(DbinderTest, DbinderRemoteCall023, TestSize.Level3) SetCurrentTestCase(DBINDER_TEST_INIT); } -#ifndef CONFIG_STANDARD_SYSTEM /* * @tc.name: DbinderRemoteCall024 * @tc.desc: trace test @@ -1117,7 +1116,6 @@ HWTEST_F(DbinderTest, DbinderRemoteCall024, TestSize.Level3) SetCurrentTestCase(DBINDER_TEST_INIT); } -#endif /* * @tc.name: DbinderRemoteCall025 diff --git a/services/dbinder/test/distributedtest/src/dbinder_test_service.cpp b/services/dbinder/test/distributedtest/src/dbinder_test_service.cpp index 92507ed..0f5a571 100755 --- a/services/dbinder/test/distributedtest/src/dbinder_test_service.cpp +++ b/services/dbinder/test/distributedtest/src/dbinder_test_service.cpp @@ -156,13 +156,11 @@ int DBinderTestService::StubTransRawData(int length) return 0; } -#ifndef CONFIG_STANDARD_SYSTEM int DBinderTestService::GetChildId(uint64_t &rep) { DBINDER_LOGI("enter %{public}s", __func__); return 0; } -#endif int DBinderTestService::FlushAsyncCommands(int count, int length) { diff --git a/services/dbinder/test/distributedtest/src/dbinder_test_service_skeleton.cpp b/services/dbinder/test/distributedtest/src/dbinder_test_service_skeleton.cpp index da104ed..8127e2d 100755 --- a/services/dbinder/test/distributedtest/src/dbinder_test_service_skeleton.cpp +++ b/services/dbinder/test/distributedtest/src/dbinder_test_service_skeleton.cpp @@ -60,7 +60,6 @@ int DBinderTestServiceProxy::ReverseInt(int data, int &rep) return error; } -#ifndef CONFIG_STANDARD_SYSTEM int DBinderTestServiceProxy::GetChildId(uint64_t &rep) { int error; @@ -72,7 +71,6 @@ int DBinderTestServiceProxy::GetChildId(uint64_t &rep) DBINDER_LOGE("rep = %{public}" PRIu64 ", error = %{public}d", rep, error); return error; } -#endif int DBinderTestServiceProxy::TransProxyObject(int data, sptr &transObject, int operation, int &rep, int &withdrawRes) @@ -461,11 +459,9 @@ int DBinderTestServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, case RECEIVE_RAW_DATA: { return OnSentRawData(data, reply); } -#ifndef CONFIG_STANDARD_SYSTEM case TRANS_TRACE_ID: { return OnGetChildId(data, reply); } -#endif case GET_REMOTE_STUB_OBJECT: { return OnReceivedGetStubObject(data, reply); } @@ -501,7 +497,6 @@ int DBinderTestServiceStub::OnReverseInt(MessageParcel &data, MessageParcel &rep return ret; } -#ifndef CONFIG_STANDARD_SYSTEM int DBinderTestServiceStub::OnGetChildId(MessageParcel &data, MessageParcel &reply) { uint64_t reqData = HiTrace::GetId().GetChainId(); @@ -527,7 +522,6 @@ int DBinderTestServiceStub::OnGetChildId(MessageParcel &data, MessageParcel &rep IPCSkeleton::GetLocalDeviceID().c_str(), IPCSkeleton::IsLocalCalling()); return ERR_NONE; } -#endif int DBinderTestServiceStub::OnReverseIntDelay(MessageParcel &data, MessageParcel &reply) { -- GitLab