diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp
index ed54b9c8c4c0057e48b81d5e049e4436238c341e..473a52c53c1b3b0159054a3d066e1c22b801282d 100644
--- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp
+++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp
@@ -108,140 +108,6 @@ std::vector<DHType> ComponentLoader::GetAllCompTypes()
     return DHTypeALL;
 }
 
-int32_t ParseComponent(const cJSON *json, CompConfig &cfg)
-{
-    cJSON *nameJson = cJSON_GetObjectItem(json, COMP_NAME.c_str());
-    if (!IsString(nameJson)) {
-        DHLOGE("COMP_NAME is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.name = nameJson->valuestring;
-
-    cJSON *typeJson = cJSON_GetObjectItem(json, COMP_TYPE.c_str());
-    if (!IsString(typeJson)) {
-        DHLOGE("COMP_TYPE is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.type = g_mapDhTypeName[typeJson->valuestring];
-
-    cJSON *handlerLocJson = cJSON_GetObjectItem(json, COMP_HANDLER_LOC.c_str());
-    if (!IsString(handlerLocJson)) {
-        DHLOGE("COMP_HANDLER_LOC is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compHandlerLoc = handlerLocJson->valuestring;
-
-    cJSON *handlerVerJson = cJSON_GetObjectItem(json, COMP_HANDLER_VERSION.c_str());
-    if (!IsString(handlerVerJson)) {
-        DHLOGE("COMP_HANDLER_VERSION is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compHandlerVersion = handlerVerJson->valuestring;
-    return DH_FWK_SUCCESS;
-}
-
-int32_t ParseSource(const cJSON *json, CompConfig &cfg)
-{
-    cJSON *sourceLocJson = cJSON_GetObjectItem(json, COMP_SOURCE_LOC.c_str());
-    if (!IsString(sourceLocJson)) {
-        DHLOGE("COMP_SOURCE_LOC is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compSourceLoc = sourceLocJson->valuestring;
-
-    cJSON *sourceVerJson = cJSON_GetObjectItem(json, COMP_SOURCE_VERSION.c_str());
-    if (!IsString(sourceVerJson)) {
-        DHLOGE("COMP_SOURCE_VERSION is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compSourceVersion = sourceVerJson->valuestring;
-
-    cJSON *sourceSaIdJson = cJSON_GetObjectItem(json, COMP_SOURCE_SA_ID.c_str());
-    if (!IsInt32(sourceSaIdJson)) {
-        DHLOGE("COMP_SOURCE_SA_ID is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compSourceSaId = static_cast<int32_t>(sourceSaIdJson->valueint);
-    return DH_FWK_SUCCESS;
-}
-
-int32_t ParseSink(const cJSON *json, CompConfig &cfg)
-{
-    cJSON *sinkLocJson = cJSON_GetObjectItem(json, COMP_SINK_LOC.c_str());
-    if (!IsString(sinkLocJson)) {
-        DHLOGE("COMP_SINK_LOC is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compSinkLoc = sinkLocJson->valuestring;
-
-    cJSON *sinkVerJson = cJSON_GetObjectItem(json, COMP_SINK_VERSION.c_str());
-    if (!IsString(sinkVerJson)) {
-        DHLOGE("COMP_SINK_VERSION is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compSinkVersion = sinkVerJson->valuestring;
-
-    cJSON *sinkSaIdJson = cJSON_GetObjectItem(json, COMP_SINK_SA_ID.c_str());
-    if (!IsInt32(sinkSaIdJson)) {
-        DHLOGE("COMP_SINK_SA_ID is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cfg.compSinkSaId = static_cast<int32_t>(sinkSaIdJson->valueint);
-    return DH_FWK_SUCCESS;
-}
-
-int32_t ParseResourceDesc(const cJSON *json, CompConfig &cfg)
-{
-    cJSON *resouceDescJson = cJSON_GetObjectItem(json, COMP_RESOURCE_DESC.c_str());
-    if (!IsArray(resouceDescJson)) {
-        DHLOGE("COMP_RESOURCE_DESC is invalid!");
-        return ERR_DH_FWK_JSON_PARSE_FAILED;
-    }
-    cJSON *element = nullptr;
-    cJSON_ArrayForEach(element, resouceDescJson) {
-        ResourceDesc desc;
-        cJSON *subtypeJson = cJSON_GetObjectItem(element, COMP_SUBTYPE.c_str());
-        if (!IsString(subtypeJson)) {
-            DHLOGE("COMP_SUBTYPE is invalid!");
-            return ERR_DH_FWK_JSON_PARSE_FAILED;
-        }
-        desc.subtype = subtypeJson->valuestring;
-
-        cJSON *sensitive = cJSON_GetObjectItem(element, COMP_SENSITIVE.c_str());
-        if (!IsBool(sensitive)) {
-            DHLOGE("COMP_SENSITIVE is invalid!");
-            return ERR_DH_FWK_JSON_PARSE_FAILED;
-        }
-        if (cJSON_IsTrue(sensitive)) {
-            desc.sensitiveValue = true;
-        } else {
-            desc.sensitiveValue = false;
-        }
-        cfg.compResourceDesc.push_back(desc);
-    }
-    return DH_FWK_SUCCESS;
-}
-
-void from_json(const cJSON *json, CompConfig &cfg)
-{
-    if (ParseComponent(json, cfg) != DH_FWK_SUCCESS) {
-        DHLOGE("ParseComponent is failed");
-        return;
-    }
-    if (ParseSource(json, cfg) != DH_FWK_SUCCESS) {
-        DHLOGE("ParseSource is failed");
-        return;
-    }
-    if (ParseSink(json, cfg) != DH_FWK_SUCCESS) {
-        DHLOGE("ParseSink is failed");
-        return;
-    }
-    if (ParseResourceDesc(json, cfg) != DH_FWK_SUCCESS) {
-        DHLOGE("ParseResourceDesc is failed");
-        return;
-    }
-}
-
 CompVersion ComponentLoader::GetCompVersionFromComConfig(const CompConfig& cCfg)
 {
     CompVersion compVersions;
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
index 0863daf8b87bee7c93fad9b39cb7ca394d0f4b2e..30cba16a7071e6151d673cd1f0f70f973cdf3fb5 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
@@ -299,9 +299,7 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_018, TestSize.Level0)
     const char *TYPE = "TYPE";
     const char *PATH = "PATH";
     cJSON* json0bject = cJSON_CreateObject();
-    if (json0bject == nullptr) {
-        return;
-    }
+    ASSERT_TRUE(json0bject != nullptr);
     cJSON* compVers = cJSON_CreateObject();
     if (compVers == nullptr) {
         cJSON_Delete(json0bject);
@@ -447,366 +445,11 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_028, TestSize.Level0)
     EXPECT_EQ(dhType, DHType::UNKNOWN);
 }
 
-/**
- * @tc.name: component_loader_test_029
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_029, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 4801);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.name.empty());
-}
-
-/**
- * @tc.name: component_loader_test_030
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_030, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddNumberToObject(json, COMP_TYPE.c_str(), 0x02);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_NE(DHType::AUDIO, cfg.type);
-}
-
-/**
- * @tc.name: component_loader_test_031
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_031, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddNumberToObject(json, COMP_HANDLER_LOC.c_str(), 4801);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.compHandlerLoc.empty());
-}
-
-/**
- * @tc.name: component_loader_test_032
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_032, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddNumberToObject(json, COMP_HANDLER_VERSION.c_str(), 4801);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.compHandlerVersion.empty());
-}
-
-/**
- * @tc.name: component_loader_test_033
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_033, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_LOC.c_str(), 4801);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.compSourceLoc.empty());
-}
-
-/**
- * @tc.name: component_loader_test_034
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_034, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_VERSION.c_str(), 4801);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.compSourceVersion.empty());
-}
-
-/**
- * @tc.name: component_loader_test_035
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_035, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_SA_ID.c_str(), "comp_source_sa_id");
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_NE(4801, cfg.compSourceSaId);
-}
-
-/**
- * @tc.name: component_loader_test_036
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_036, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_SA_ID.c_str(), "4801");
-    cJSON_AddNumberToObject(json, COMP_SINK_LOC.c_str(), 4802);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.compSinkLoc.empty());
-}
-
-/**
- * @tc.name: component_loader_test_037
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_037, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801);
-    cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc");
-    cJSON_AddNumberToObject(json, COMP_SINK_VERSION.c_str(), 4802);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(true, cfg.compSinkVersion.empty());
-}
-
-/**
- * @tc.name: component_loader_test_038
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_038, TestSize.Level0)
+HWTEST_F(ComponentLoaderTest, ParseCompConfigFromJson_001, TestSize.Level0)
 {
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801);
-    cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc");
-    cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "comp_sink_version");
-    cJSON_AddStringToObject(json, COMP_SINK_SA_ID.c_str(), "4802");
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_NE(4802, cfg.compSinkSaId);
-}
-
-/**
- * @tc.name: component_loader_test_039
- * @tc.desc: Verify the from_json function.
- * @tc.type: FUNC
- * @tc.require: AR000GHSK3
- */
-HWTEST_F(ComponentLoaderTest, component_loader_test_039, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version");
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801);
-    cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc");
-    cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "comp_sink_version");
-    cJSON_AddNumberToObject(json, COMP_SINK_SA_ID.c_str(), 4802);
-
-    from_json(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(4802, cfg.compSinkSaId);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSink_001, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_SINK_LOC.c_str(), 100);
-    auto ret = ParseSink(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSink_002, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc_test");
-    cJSON_AddNumberToObject(json, COMP_SINK_VERSION.c_str(), 100);
-    auto ret = ParseSink(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSink_003, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc_test");
-    cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "1.0");
-    cJSON_AddStringToObject(json, COMP_SINK_SA_ID.c_str(), "comp_sink_sa_id_test");
-    auto ret = ParseSink(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSink_004, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc_test");
-    cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "1.0");
-    cJSON_AddNumberToObject(json, COMP_SINK_SA_ID.c_str(), 4801);
-    auto ret = ParseSink(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, DH_FWK_SUCCESS);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseResourceDesc_001, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *array = cJSON_CreateArray();
-    if (array == nullptr) {
-        return;
-    }
-    cJSON *obj = cJSON_CreateObject();
-    if (obj == nullptr) {
-        cJSON_Delete(array);
-        return;
-    }
-    cJSON_AddStringToObject(obj, COMP_SUBTYPE.c_str(), "comp_subtype");
-    cJSON_AddBoolToObject(obj, COMP_SENSITIVE.c_str(), true);
-    cJSON_AddItemToArray(array, obj);
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        cJSON_Delete(array);
-        return;
-    }
-    cJSON_AddItemToObject(json, COMP_RESOURCE_DESC.c_str(), array);
-    auto ret = ParseResourceDesc(json, cfg);
-    cJSON_Delete(json);
-
     CompConfig config;
     cJSON *component = cJSON_CreateObject();
-    if (component == nullptr) {
-        return;
-    }
+    ASSERT_TRUE(component != nullptr);
     cJSON_AddNumberToObject(component, COMP_NAME.c_str(), 1);
     cJSON_AddNumberToObject(component, COMP_TYPE.c_str(), 1);
     cJSON_AddNumberToObject(component, COMP_HANDLER_LOC.c_str(), 1);
@@ -818,28 +461,15 @@ HWTEST_F(ComponentLoaderTest, ParseResourceDesc_001, TestSize.Level0)
     cJSON_AddNumberToObject(component, COMP_SINK_VERSION.c_str(), 1.0);
     cJSON_AddStringToObject(component, COMP_SINK_SA_ID.c_str(), "4802");
     cJSON_AddStringToObject(component, COMP_RESOURCE_DESC.c_str(), "comp_resource_desc");
-    ComponentLoader::GetInstance().ParseCompConfigFromJson(component, config);
+    EXPECT_NO_FATAL_FAILURE(ComponentLoader::GetInstance().ParseCompConfigFromJson(component, config));
     cJSON_Delete(component);
-    EXPECT_EQ(ret, DH_FWK_SUCCESS);
 }
 
-HWTEST_F(ComponentLoaderTest, ParseResourceDesc_002, TestSize.Level0)
+HWTEST_F(ComponentLoaderTest, ParseCompConfigFromJson_002, TestSize.Level0)
 {
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 100);
-    auto ret = ParseComponent(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-
     CompConfig config1;
     cJSON *component1 = cJSON_CreateObject();
-    if (component1 == nullptr) {
-        return;
-    }
+    ASSERT_TRUE(component1 != nullptr);
     cJSON_AddStringToObject(component1, COMP_NAME.c_str(), "comp_name_test");
     cJSON_AddStringToObject(component1, COMP_TYPE.c_str(), "comp_type_test");
     cJSON_AddStringToObject(component1, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test");
@@ -851,27 +481,10 @@ HWTEST_F(ComponentLoaderTest, ParseResourceDesc_002, TestSize.Level0)
     cJSON_AddStringToObject(component1, COMP_SINK_VERSION.c_str(), "com_sink_version_test");
     cJSON_AddNumberToObject(component1, COMP_SINK_SA_ID.c_str(), 4802);
     cJSON_AddStringToObject(component1, COMP_RESOURCE_DESC.c_str(), "comp_resource_desc");
-    ComponentLoader::GetInstance().ParseCompConfigFromJson(component1, config1);
+    EXPECT_NO_FATAL_FAILURE(ComponentLoader::GetInstance().ParseCompConfigFromJson(component1, config1));
     cJSON_Delete(component1);
 }
 
-HWTEST_F(ComponentLoaderTest, ParseResourceDesc_003, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *jsonArr = cJSON_CreateArray();
-    ASSERT_TRUE(jsonArr != nullptr);
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        cJSON_Delete(jsonArr);
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_SUBTYPE.c_str(), 1);
-    cJSON_AddItemToArray(jsonArr, json);
-    auto ret = ParseResourceDesc(jsonArr, cfg);
-    cJSON_Delete(jsonArr);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
 HWTEST_F(ComponentLoaderTest, ParseResourceDescFromJson_003, TestSize.Level0)
 {
     CompConfig config;
@@ -896,176 +509,6 @@ HWTEST_F(ComponentLoaderTest, ParseResourceDescFromJson_003, TestSize.Level0)
     EXPECT_TRUE(config.compResourceDesc.empty());
 }
 
-HWTEST_F(ComponentLoaderTest, from_json_001, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 100);
-    from_json(json, cfg);
-    cJSON_Delete(json);
-
-    cJSON *Json1 = cJSON_CreateObject();
-    if (Json1 == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(Json1, COMP_NAME.c_str(), "comp_name_test");
-    cJSON_AddStringToObject(Json1, COMP_TYPE.c_str(), "comp_type_test");
-    cJSON_AddStringToObject(Json1, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test");
-    cJSON_AddStringToObject(Json1, COMP_HANDLER_VERSION.c_str(), "1.0");
-    cJSON_AddNumberToObject(Json1, COMP_SOURCE_LOC.c_str(), 100);
-    from_json(Json1, cfg);
-    cJSON_Delete(Json1);
-
-    cJSON *Json2 = cJSON_CreateObject();
-    if (Json2 == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(Json2, COMP_NAME.c_str(), "comp_name_test");
-    cJSON_AddStringToObject(Json2, COMP_TYPE.c_str(), "comp_type_test");
-    cJSON_AddStringToObject(Json2, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test");
-    cJSON_AddStringToObject(Json2, COMP_HANDLER_VERSION.c_str(), "1.0");
-    cJSON_AddStringToObject(Json2, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test");
-    cJSON_AddStringToObject(Json2, COMP_SOURCE_VERSION.c_str(), "1.0");
-    cJSON_AddNumberToObject(Json2, COMP_SOURCE_SA_ID.c_str(), 4801);
-    cJSON_AddNumberToObject(Json2, COMP_SINK_LOC.c_str(), 100);
-    EXPECT_NO_FATAL_FAILURE(from_json(Json2, cfg));
-    cJSON_Delete(Json2);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseComponent_001, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 100);
-    auto ret = ParseComponent(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseComponent_002, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test");
-    cJSON_AddNumberToObject(json, COMP_TYPE.c_str(), 100);
-    auto ret = ParseComponent(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseComponent_003, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "comp_type_test");
-    cJSON_AddNumberToObject(json, COMP_HANDLER_LOC.c_str(), 100);
-    auto ret = ParseComponent(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseComponent_004, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "comp_type_test");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test");
-    cJSON_AddNumberToObject(json, COMP_HANDLER_VERSION.c_str(), 100);
-    auto ret = ParseComponent(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseComponent_005, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test");
-    cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "comp_type_test");
-    cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test");
-    cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "1.0");
-    auto ret = ParseComponent(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, DH_FWK_SUCCESS);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSource_001, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddNumberToObject(json, COMP_SOURCE_LOC.c_str(), 100);
-    auto ret = ParseSource(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSource_002, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_VERSION.c_str(), 100);
-    auto ret = ParseSource(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSource_003, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "1.0");
-    cJSON_AddStringToObject(json, COMP_SOURCE_SA_ID.c_str(), "4801");
-    auto ret = ParseSource(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED);
-}
-
-HWTEST_F(ComponentLoaderTest, ParseSource_004, TestSize.Level0)
-{
-    CompConfig cfg;
-    cJSON *json = cJSON_CreateObject();
-    if (json == nullptr) {
-        return;
-    }
-    cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test");
-    cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "1.0");
-    cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801);
-    auto ret = ParseSource(json, cfg);
-    cJSON_Delete(json);
-    EXPECT_EQ(ret, DH_FWK_SUCCESS);
-}
-
 HWTEST_F(ComponentLoaderTest, GetHardwareHandler_003, TestSize.Level0)
 {
     ComponentLoader::GetInstance().compHandlerMap_.clear();