提交 9febfb7f 编写于 作者: X xionglei6

init: fix codedex

Signed-off-by: Nxionglei6 <xionglei6@huawei.com>
上级 dcac61fa
......@@ -144,8 +144,8 @@ HWTEST_F(CmdsUnitTest, TestCommonChmod, TestSize.Level1)
EXPECT_EQ(testMode, testMode & info.st_mode);
DoCmdByName("chmod ", "777 /data/init_ut/test_dir0/test_file001");
fd = -1;
close(fd);
fd = -1;
}
HWTEST_F(CmdsUnitTest, TestCommonCopy, TestSize.Level1)
......@@ -160,9 +160,8 @@ HWTEST_F(CmdsUnitTest, TestCommonCopy, TestSize.Level1)
DoCmdByName("copy ", "/data/init_ut/test_dir0/test_file_copy1 /data/init_ut/test_dir0/test_file_copy2");
int ret = access(testFile2, F_OK);
EXPECT_EQ(ret, 0);
fd = -1;
close(fd);
fd = -1;
// abnormal
DoCmdByName("copy ", "/data/init_ut/test_dir0/test_file_copy1 /data/init_ut/test_dir0/test_file_copy1");
DoCmdByName("copy ", "/data/init_ut/test_dir0/test_file_copy11 /data/init_ut/test_dir0/test_file_copy1");
......@@ -178,11 +177,10 @@ HWTEST_F(CmdsUnitTest, TestCommonWrite, TestSize.Level1)
DoCmdByName("write ", "/data/init_ut/test_dir0/test_file_write1 aaa");
const int bufLen = 50;
char buffer[bufLen];
int length = read(fd, buffer, bufLen);
EXPECT_EQ(length, strlen("aaa"));
fd = -1;
int length = read(fd, buffer, bufLen - 1);
EXPECT_EQ(length, strlen("aaa"));
close(fd);
fd = -1;
// abnormal
DoCmdByName("write ", "/data/init_ut/test_dir0/test_file_write2 aaa");
}
......@@ -252,6 +250,7 @@ HWTEST_F(CmdsUnitTest, TestGetCmdLinesFromJson, TestSize.Level1)
cJSON *cmdsItem1 = cJSON_GetArrayItem(cmdsItem, 0);
ASSERT_NE(nullptr, cmdsItem1);
CmdLines **cmdLines = (CmdLines **)calloc(1, 1);
ASSERT_NE(nullptr, cmdLines);
int ret = GetCmdLinesFromJson(cmdsItem1, cmdLines);
EXPECT_EQ(ret, -1);
cJSON *cmdsItem2 = cJSON_GetObjectItem(cmdsItem1, "cmds");
......
......@@ -38,6 +38,7 @@ HWTEST_F(MountUnitTest, TestMountRequriedPartitions, TestSize.Level0)
if (fstab != NULL) {
int ret = MountRequriedPartitions(fstab);
EXPECT_EQ(ret, -1);
ReleaseFstab(fstab)
}
}
} // namespace init_ut
......@@ -39,6 +39,7 @@ HWTEST_F(ServiceFileUnitTest, TestServiceFile, TestSize.Level1)
{
const char *fileName = "/data/filetest";
ServiceFile *fileOpt = (ServiceFile *)calloc(1, sizeof(ServiceFile) + strlen(fileName) + 1);
ASSERT_NE(fileOpt, nullptr);
fileOpt->next = NULL;
fileOpt->flags = O_RDWR;
fileOpt->uid = 1000;
......@@ -47,6 +48,7 @@ HWTEST_F(ServiceFileUnitTest, TestServiceFile, TestSize.Level1)
fileOpt->perm = 0770;
if (strncpy_s(fileOpt->fileName, strlen(fileName) + 1, fileName, strlen(fileName)) != 0) {
free(fileOpt);
fileOpt = nullptr;
ASSERT_TRUE(1);
}
CreateServiceFile(fileOpt);
......@@ -54,5 +56,6 @@ HWTEST_F(ServiceFileUnitTest, TestServiceFile, TestSize.Level1)
EXPECT_NE(ret, -1);
CloseServiceFile(fileOpt);
free(fileOpt);
fileOpt = nullptr;
}
}
......@@ -32,11 +32,12 @@ public:
HWTEST_F(ServiceSocketUnitTest, TestCreateSocket, TestSize.Level0)
{
ServiceSocket *sockopt = (ServiceSocket *)calloc(1, sizeof(ServiceSocket));
ASSERT_NE(sockopt, nullptr);
sockopt->type = SOCK_SEQPACKET;
sockopt->sockFd = -1;
sockopt->uid = 1000;
sockopt->gid = 1000;
sockopt->perm = 660;
sockopt->perm = 0660;
sockopt->passcred = true;
const char *testSocName = "test_socket";
errno_t ret = strncpy_s(sockopt->name, strlen(testSocName) + 1, testSocName, strlen(testSocName));
......
......@@ -79,6 +79,7 @@ HWTEST_F(ServiceUnitTest, TestServiceStartAbnormal, TestSize.Level1)
cJSON *serviceItem = cJSON_GetObjectItem(jobItem, "services");
ASSERT_NE(nullptr, serviceItem);
Service *service = (Service *)calloc(1, sizeof(Service));
ASSERT_NE(nullptr, service);
int ret = ParseOneService(serviceItem, service);
EXPECT_EQ(ret, 0);
......@@ -105,10 +106,12 @@ HWTEST_F(ServiceUnitTest, TestServiceStartAbnormal, TestSize.Level1)
HWTEST_F(ServiceUnitTest, TestServiceReap, TestSize.Level1)
{
Service *service = (Service *)calloc(1, sizeof(Service));
ASSERT_NE(nullptr, service);
ServiceReap(service);
EXPECT_EQ(service->attribute, 0);
service->restartArg = (CmdLines *)calloc(1, sizeof(CmdLines));
ASSERT_NE(nullptr, service->restartArg);
ServiceReap(service);
EXPECT_EQ(service->attribute, 0);
......@@ -142,6 +145,7 @@ HWTEST_F(ServiceUnitTest, TestServiceReapOther, TestSize.Level1)
ASSERT_NE(nullptr, serviceItem);
Service *service = (Service *)calloc(1, sizeof(Service));
ASSERT_NE(nullptr, service);
int ret = GetCmdLinesFromJson(cJSON_GetObjectItem(serviceItem, "onrestart"), &service->restartArg);
EXPECT_EQ(ret, 0);
ret = ParseOneService(serviceItem, service);
......@@ -207,7 +211,9 @@ HWTEST_F(ServiceUnitTest, TestServiceManagerGetService, TestSize.Level1)
HWTEST_F(ServiceUnitTest, TestServiceExec, TestSize.Level1)
{
Service *service = (Service *)malloc(sizeof(Service));
ASSERT_NE(service, nullptr);
service->pathArgs.argv = (char **)malloc(sizeof(char *));
ASSERT_NE(service->pathArgs.argv, nullptr);
service->pathArgs.count = 1;
const char *path = "/data/init_ut/test_service_release";
service->pathArgs.argv[0] = strdup(path);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册