diff --git a/interfaces/innerkits/init_module_engine/include/init_module_engine.h b/interfaces/innerkits/init_module_engine/include/init_module_engine.h index 005a1a29270ae5bbaf00a1915f3cca5fbb275f40..c9de0110ad6d0b92f9d4cb3b468cb86308999891 100755 --- a/interfaces/innerkits/init_module_engine/include/init_module_engine.h +++ b/interfaces/innerkits/init_module_engine/include/init_module_engine.h @@ -34,8 +34,6 @@ int SystemWriteParam(const char *name, const char *value); int SystemReadParam(const char *name, char *value, unsigned int *len); -int LoadParamsFile(const char *fileName, bool onlyAdd); - typedef int (*CmdExecutor)(int id, const char *name, int argc, const char **argv); int AddCmdExecutor(const char *cmdName, CmdExecutor execCmd); diff --git a/interfaces/innerkits/init_module_engine/stub/libinit.stub.json b/interfaces/innerkits/init_module_engine/stub/libinit.stub.json index bf210c7a4c5e0a8fbdcdf41f58a3e4b5c1cb631b..09fae6666efaf87e623d98f78a4315cbee2bafae 100755 --- a/interfaces/innerkits/init_module_engine/stub/libinit.stub.json +++ b/interfaces/innerkits/init_module_engine/stub/libinit.stub.json @@ -1,7 +1,6 @@ [ { "name": "SystemWriteParam" }, { "name": "SystemReadParam" }, - { "name": "LoadParamsFile" }, { "name": "SplitString" }, { "name": "AddCmdExecutor" }, { "name": "RemoveCmdExecutor" }, diff --git a/services/param/manager/param_server.c b/services/param/manager/param_server.c index d1e83952f0a440fdb35bcafba4b73844d96d9ea0..26af8fe2db42c670258ed908d59054ecacac2436 100755 --- a/services/param/manager/param_server.c +++ b/services/param/manager/param_server.c @@ -193,11 +193,6 @@ static int ProcessParamFile(const char *fileName, void *context) return LoadDefaultParam_(fileName, mode, exclude, ARRAY_LENGTH(exclude), LoadOneParam_); } -int LoadParamsFile(const char *fileName, bool onlyAdd) -{ - return LoadDefaultParams(fileName, onlyAdd ? LOAD_PARAM_ONLY_ADD : LOAD_PARAM_NORMAL); -} - int LoadDefaultParams(const char *fileName, uint32_t mode) { PARAM_CHECK(fileName != NULL, return -1, "Invalid filename for load"); diff --git a/test/unittest/innerkits/innerkits_unittest.cpp b/test/unittest/innerkits/innerkits_unittest.cpp index dbf68df2db7615422f93f1ae90934e846fe3f1d7..718e5c1279c6d8981cc0ccc25e4a558b02203e43 100644 --- a/test/unittest/innerkits/innerkits_unittest.cpp +++ b/test/unittest/innerkits/innerkits_unittest.cpp @@ -225,4 +225,29 @@ HWTEST_F(InnerkitsUnitTest, TestSysCap, TestSize.Level1) ret = HasSystemCapability("SystemCapability.ArkUI.ArkUI.Napi"); EXPECT_EQ(ret, true); } + +// TestControlService +HWTEST_F(InnerkitsUnitTest, TestControlService, TestSize.Level1) +{ + ServiceControl("deviceinfoservice", START); + ServiceControl("deviceinfoservice", STOP); + ServiceControl("deviceinfoservice", RESTART); + ServiceControl("param_watcher", RESTART); + EXPECT_EQ(ServiceControl(nullptr, RESTART), -1); + const char *argv[] = {"testArg"}; + ServiceControlWithExtra("deviceinfoservice", RESTART, argv, 1); + ServiceControlWithExtra(nullptr, RESTART, argv, 1); + ServiceControlWithExtra(nullptr, 3, argv, 1); // 3 is action + ServiceControlWithExtra("notservie", RESTART, argv, 1); + ServiceSetReady("deviceinfoservice"); + ServiceSetReady(nullptr); + ServiceWaitForStatus("deviceinfoservice", SERVICE_READY, 1); + ServiceWaitForStatus("deviceinfoservice", SERVICE_READY, -1); + ServiceWaitForStatus(nullptr, SERVICE_READY, 1); + StartServiceByTimer("deviceinfoservice", 1); + StartServiceByTimer("deviceinfoservice", 0); + StartServiceByTimer(nullptr, 0); + StopServiceTimer("deviceinfoservice"); +} + } // namespace init_ut diff --git a/test/unittest/param/param_stub.cpp b/test/unittest/param/param_stub.cpp index 55e8a87a260278d908bc9e835fc04726b00f386d..afe4eae65aea4ea001f6713495c1d9d5acc16867 100644 --- a/test/unittest/param/param_stub.cpp +++ b/test/unittest/param/param_stub.cpp @@ -21,6 +21,7 @@ #include "param_security.h" #include "param_utils.h" #include "init_group_manager.h" +#include "beget_ext.h" #ifdef PARAM_LOAD_CFG_FROM_CODE #include "param_cfg.h" #endif @@ -443,6 +444,7 @@ int TestFreeLocalSecurityLabel(ParamSecurityLabel *srcLabel) static __attribute__((constructor(101))) void ParamTestStubInit(void) { EnableInitLog(INIT_DEBUG); + SetInitLogLevel(INIT_DEBUG); PARAM_LOGI("ParamTestStubInit"); PrepareInitUnitTestEnv(); }