From 0e72cfca92533e2b1bbc5097c46033f0d8362a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8A=E5=AE=98=E6=99=AF=E5=A8=81?= Date: Wed, 2 Apr 2025 15:34:12 +0800 Subject: [PATCH] =?UTF-8?q?tdd=E6=96=AD=E8=A8=80=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 上官景威 --- .../module_test/src/cm_cert_parse_test.cpp | 5 +- test/unittest/module_test/src/cm_log_test.cpp | 99 +++++++++---------- .../module_test/src/cm_param_test.cpp | 40 ++------ 3 files changed, 58 insertions(+), 86 deletions(-) diff --git a/test/unittest/module_test/src/cm_cert_parse_test.cpp b/test/unittest/module_test/src/cm_cert_parse_test.cpp index bb597c5..3883b9b 100644 --- a/test/unittest/module_test/src/cm_cert_parse_test.cpp +++ b/test/unittest/module_test/src/cm_cert_parse_test.cpp @@ -351,9 +351,8 @@ HWTEST_F(CmCertParseTest, CmCertParseTest018, TestSize.Level0) HWTEST_F(CmCertParseTest, CmCertParseTest019, TestSize.Level0) { X509 *tempX509 = X509_new(); - if (tempX509 == nullptr) { - return; - } + ASSERT_TRUE(tempX509 != nullptr); + char tmpTimeOut[DEFAULT_SIZE] = {0}; int32_t ret = GetX509NotBefore(tempX509, tmpTimeOut, sizeof(tmpTimeOut)); EXPECT_EQ(ret, CMR_ERROR_INVALID_CERT_FORMAT); diff --git a/test/unittest/module_test/src/cm_log_test.cpp b/test/unittest/module_test/src/cm_log_test.cpp index e71dc3d..16ee0c9 100644 --- a/test/unittest/module_test/src/cm_log_test.cpp +++ b/test/unittest/module_test/src/cm_log_test.cpp @@ -345,10 +345,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest014, TestSize.Level0) /* get certCount failed */ struct CertInfoLen infoLen = { false, 0, false, 0, false, 0, false, 0, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -368,10 +368,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest015, TestSize.Level0) /* certCount invalid */ struct CertInfoLen infoLen = { true, certificateList.certsCount + 1, false, 0, false, 0, false, 0, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -391,10 +391,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest016, TestSize.Level0) /* get subjectNameLen failed */ struct CertInfoLen infoLen = { true, certificateList.certsCount, false, 0, false, 0, false, 0, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -416,10 +416,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest017, TestSize.Level0) struct CertInfoLen infoLen = { true, certificateList.certsCount, true, MAX_LEN_SUBJECT_NAME + 1, false, 0, false, 0, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -441,10 +441,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest018, TestSize.Level0) struct CertInfoLen infoLen = { true, certificateList.certsCount, true, MAX_LEN_SUBJECT_NAME, false, 0, false, 0, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -466,11 +466,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest019, TestSize.Level0) struct CertInfoLen infoLen = { true, certificateList.certsCount, true, MAX_LEN_SUBJECT_NAME, true, 0, false, 0, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -492,10 +491,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest020, TestSize.Level0) struct CertInfoLen infoLen = { true, certificateList.certsCount, true, MAX_LEN_SUBJECT_NAME, true, 0, true, MAX_LEN_URI + 1, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -517,10 +516,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest021, TestSize.Level0) struct CertInfoLen infoLen = { true, certificateList.certsCount, true, MAX_LEN_SUBJECT_NAME, true, 0, true, MAX_LEN_URI, false, 0 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -542,10 +541,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest022, TestSize.Level0) struct CertInfoLen infoLen = { true, 1, true, MAX_LEN_SUBJECT_NAME, true, 0, true, MAX_LEN_URI, true, MAX_LEN_CERT_ALIAS + 1 }; - if (ConstructBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } - int32_t ret = CmCertificateListUnpackFromService(&outData, &certificateList); + int32_t ret = ConstructBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); + + ret = CmCertificateListUnpackFromService(&outData, &certificateList); EXPECT_NE(ret, CM_SUCCESS); } @@ -695,11 +694,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest028, TestSize.Level0) uint8_t outDataBuf[DEFAULT_SIZE] = {0}; struct CmBlob outData = { sizeof(outDataBuf), outDataBuf }; struct CertInfoLen infoLen = { false, 0, false, 0, false, 0, false, 0, false, 0 }; /* get status failed */ - if (ConstructCertBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } + int32_t ret = ConstructCertBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); - int32_t ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); + ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); EXPECT_NE(ret, CM_SUCCESS); } @@ -724,11 +722,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest029, TestSize.Level0) uint8_t outDataBuf[DEFAULT_SIZE] = {0}; struct CmBlob outData = { sizeof(outDataBuf), outDataBuf }; struct CertInfoLen infoLen = { false, 0, false, 0, true, 0, false, 0, false, 0 }; /* get certAliasLen failed */ - if (ConstructCertBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } + int32_t ret = ConstructCertBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); - int32_t ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); + ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); EXPECT_NE(ret, CM_SUCCESS); } @@ -755,11 +752,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest030, TestSize.Level0) /* certAlias len invalid */ struct CertInfoLen infoLen = { false, 0, false, 0, true, 0, false, 0, true, MAX_LEN_CERT_ALIAS + 1 }; - if (ConstructCertBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } + int32_t ret = ConstructCertBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); - int32_t ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); + ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); EXPECT_NE(ret, CM_SUCCESS); } @@ -784,11 +780,10 @@ HWTEST_F(CmLogTest, CmIpcClientTest031, TestSize.Level0) uint8_t outDataBuf[DEFAULT_SIZE] = {0}; struct CmBlob outData = { sizeof(outDataBuf), outDataBuf }; struct CertInfoLen infoLen = { false, 0, false, 0, true, 0, false, 0, true, MAX_LEN_CERT_ALIAS }; - if (ConstructCertBuf(&infoLen, &outData) != CM_SUCCESS) { - return; - } + int32_t ret = ConstructCertBuf(&infoLen, &outData); + ASSERT_EQ(ret, CM_SUCCESS); - int32_t ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); + ret = CmCertificateInfoUnpackFromService(&outData, &certUri, &certInfoStr); EXPECT_NE(ret, CM_SUCCESS); } } diff --git a/test/unittest/module_test/src/cm_param_test.cpp b/test/unittest/module_test/src/cm_param_test.cpp index 24b4e35..0531f4f 100644 --- a/test/unittest/module_test/src/cm_param_test.cpp +++ b/test/unittest/module_test/src/cm_param_test.cpp @@ -358,10 +358,8 @@ HWTEST_F(CmParamTest, CmParamTest019, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); + paramSet->paramSetSize = sizeof(struct CmParamSet) - 1; ret = CmBuildParamSet(¶mSet); @@ -380,10 +378,7 @@ HWTEST_F(CmParamTest, CmParamTest020, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); uint8_t tempBuf[] = "this is for test020"; paramSet->paramsCnt = 1; @@ -408,10 +403,7 @@ HWTEST_F(CmParamTest, CmParamTest021, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); uint8_t tempBuf[] = "this is for test021"; paramSet->paramsCnt = 1; @@ -436,10 +428,7 @@ HWTEST_F(CmParamTest, CmParamTest022, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); uint8_t tempBuf[] = "this is for test022"; paramSet->paramsCnt = 1; @@ -477,9 +466,7 @@ HWTEST_F(CmParamTest, CmParamTest024, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; ConstrutParamSet(¶mSet); - if (paramSet == nullptr) { - return; - } + ASSERT_TRUE(paramSet != nullptr); struct CmParamSet *outParamSet = nullptr; int32_t ret = CmGetParamSet(paramSet, paramSet->paramSetSize, &outParamSet); @@ -499,10 +486,7 @@ HWTEST_F(CmParamTest, CmParamTest025, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); uint8_t tempBuf[] = "this is for test025"; paramSet->paramsCnt = 1; @@ -529,10 +513,7 @@ HWTEST_F(CmParamTest, CmParamTest026, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); uint8_t tempBuf[] = "this is for test026"; paramSet->paramsCnt = 1; @@ -559,10 +540,7 @@ HWTEST_F(CmParamTest, CmParamTest027, TestSize.Level0) { struct CmParamSet *paramSet = nullptr; int32_t ret = CmInitParamSet(¶mSet); - EXPECT_EQ(ret, CM_SUCCESS); - if (ret != CM_SUCCESS) { - return; - } + ASSERT_EQ(ret, CM_SUCCESS); uint8_t tempBuf[] = "this is for test027"; paramSet->paramsCnt = 1; -- Gitee