openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-20 21:41:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Description:amend error code

Browse Source 
Match-id-7da8cabd9c6b2dbbba9a8f268393b84446fc50f6
This commit is contained in:
xxxx
2022-07-27 16:46:20 +08:00
parent abaa7bb19e
commit fb68cc3455
116 changed files with 513 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sourcehandler/include/distributed_input_source_handler.h
+4 -4
View File
@@ -83,8 +83,8 @@ __attribute__((visibility("default"))) IDistributedHardwareSource *GetSourceHard
#ifdef __cplusplus
}
#endif // __cplusplus
} // namespace DistributedInput
} // namespace DistributedHardware
} // namespace OHOS
} // namespace DistributedInput
} // namespace DistributedHardware
} // namespace OHOS
#endif // DISTRIBUTED_INPUT_SOURCE_HANDLER_H
#endif // DISTRIBUTED_INPUT_SOURCE_HANDLER_H
sourcehandler/include/load_d_input_source_callback.h
+5 -4
View File
@@ -29,7 +29,8 @@ public:
private:
std::string params_;
};
}
}
}
#endif
} // namespace DistributedInput
} // namespace DistributedHardware
} // namespace OHOS
#endif // LOAD_D_INPUT_SOURCE_CALLBACK_H
sourcehandler/src/load_d_input_source_callback.cpp
+3 -3
View File
@@ -43,6 +43,6 @@ void LoadDInputSourceCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId)
HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_INIT_FAIL,
"dinput source LoadSystemAbility call failed.");
}
}
}
}
} // namespace DistributedInput
} // namespace DistributedHardware
} // namespace OHOS
sourcehandler/test/unittest/distributed_input_sourcehandler_test.cpp
+16 -16
View File
@@ -14,6 +14,7 @@
*/
#include "distributed_input_sourcehandler_test.h"
#include "dinput_errcode.h"
using namespace testing::ext;
using namespace OHOS::DistributedHardware::DistributedInput;
@@ -41,32 +42,32 @@ void DistributedInputSourceHandlerTest::TearDownTestCase()
int32_t DistributedInputSourceHandlerTest::TestRegisterDInputCallback::OnRegisterResult(const std::string &devId,
const std::string &dhId, int32_t status, const std::string &data)
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputSourceHandlerTest::TestUnregisterDInputCallback::OnUnregisterResult(const std::string &devId,
const std::string &dhId, int32_t status, const std::string &data)
{
return SUCCESS;
return DH_SUCCESS;
}
HWTEST_F(DistributedInputSourceHandlerTest, InitSource01, testing::ext::TestSize.Level0)
{
int32_t ret = DistributedInputSourceHandler::GetInstance().InitSource("");
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, InitSource02, testing::ext::TestSize.Level0)
{
std::string dhId = "test";
int32_t ret = DistributedInputSourceHandler::GetInstance().InitSource(dhId);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, ReleaseSource01, testing::ext::TestSize.Level0)
{
int32_t ret = DistributedInputSourceHandler::GetInstance().ReleaseSource();
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, RegisterDistributedHardware01, testing::ext::TestSize.Level0)
@@ -79,7 +80,7 @@ HWTEST_F(DistributedInputSourceHandlerTest, RegisterDistributedHardware01, testi
"version", "attrs"
},
registerCallback);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, RegisterDistributedHardware02, testing::ext::TestSize.Level0)
@@ -89,7 +90,7 @@ HWTEST_F(DistributedInputSourceHandlerTest, RegisterDistributedHardware02, testi
std::string dhId = "";
int32_t ret = DistributedInputSourceHandler::GetInstance().RegisterDistributedHardware(
devId, dhId, OHOS::DistributedHardware::EnableParam {"version", "attrs" }, registerCallback);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, RegisterDistributedHardware03, testing::ext::TestSize.Level0)
@@ -102,7 +103,7 @@ HWTEST_F(DistributedInputSourceHandlerTest, RegisterDistributedHardware03, testi
"version", "attrs"
},
registerCallback);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, UnregisterDistributedHardware01, testing::ext::TestSize.Level0)
{
@@ -110,7 +111,7 @@ HWTEST_F(DistributedInputSourceHandlerTest, UnregisterDistributedHardware01, tes
std::make_shared<TestUnregisterDInputCallback>();
int32_t ret = DistributedInputSourceHandler::GetInstance().UnregisterDistributedHardware("devId",
"dhId", unregisterDInputCallback);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, UnregisterDistributedHardware02, testing::ext::TestSize.Level0)
@@ -120,25 +121,24 @@ HWTEST_F(DistributedInputSourceHandlerTest, UnregisterDistributedHardware02, tes
std::string dhId = "";
int32_t ret = DistributedInputSourceHandler::GetInstance().UnregisterDistributedHardware("devId",
"dhId", unregisterDInputCallback);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, UnregisterDistributedHardware03, testing::ext::TestSize.Level0)
{
std::shared_ptr<TestUnregisterDInputCallback> unregisterDInputCallback =
std::make_shared<TestUnregisterDInputCallback>();
int32_t ret = DistributedInputSourceHandler::GetInstance().UnregisterDistributedHardware("devId",
"dhId", unregisterDInputCallback);
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
HWTEST_F(DistributedInputSourceHandlerTest, ConfigDistributedHardware01, testing::ext::TestSize.Level0)
{
int32_t ret = DistributedInputSourceHandler::GetInstance().ConfigDistributedHardware("devId",
"dhId", "key", "value");
EXPECT_EQ(SUCCESS, ret);
EXPECT_EQ(DH_SUCCESS, ret);
}
}
}
}
} // namespace DistributedInput
} // namespace DistributedHardware
} // namespace OHOS
sourcehandler/test/unittest/distributed_input_sourcehandler_test.h
+1
View File
@@ -63,4 +63,5 @@ public:
} // namespace DistributedInput
} // namespace DistributedHardware
} // namespace OHOS
#endif // DISRIBUTED_INPUT_SOURCEHANDLER_TEST_H
sourcehandler/test/unittest/mock/mock_distributed_input_client.cpp
+11 -10
View File
@@ -18,6 +18,7 @@
#include "constants_dinput.h"
#include "distributed_input_client.h"
#include "dinput_errcode.h"
#include "white_list_util.h"
namespace OHOS {
@@ -90,58 +91,58 @@ void DistributedInputClient::DelWhiteListInfosCb::OnResult(const std::string& de
int32_t DistributedInputClient::InitSource()
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::InitSink()
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::ReleaseSource()
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::ReleaseSink()
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::RegisterDistributedHardware(const std::string& devId, const std::string& dhId,
const std::string& parameters, const std::shared_ptr<RegisterCallback>& callback)
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId,
const std::shared_ptr<UnregisterCallback>& callback)
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::PrepareRemoteInput(
const std::string& deviceId, sptr<IPrepareDInputCallback> callback)
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::UnprepareRemoteInput(
const std::string& deviceId, sptr<IUnprepareDInputCallback> callback)
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::StartRemoteInput(
const std::string& deviceId, const uint32_t& inputTypes, sptr<IStartDInputCallback> callback)
{
return SUCCESS;
return DH_SUCCESS;
}
int32_t DistributedInputClient::StopRemoteInput(
const std::string& deviceId, const uint32_t& inputTypes, sptr<IStopDInputCallback> callback)
{
return SUCCESS;
return DH_SUCCESS;
}
bool DistributedInputClient::IsNeedFilterOut(const std::string& deviceId, const BusinessEvent& event)