diff --git a/README.md b/README.md
index db873c2620ea0ad2a44a8b7e76506e8295fe4fed..756a12b518aafb24776d64211b1f570998f7f5c8 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,9 @@
Input Method Framework, is used to connect the application and input method. the application can input text through the input method
+**图 1** 子系统架构图
+
+
#### Warehouse path
/base/miscservices/inputmethod
diff --git a/README_zh.md b/README_zh.md
index 39200d45a333085d7a349ae580adc799144606b7..b3d72ed400dcd4e85f151af2bc349b32b1ee4224 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -3,6 +3,9 @@
#### 介绍
输入法框架，主要作用是拉通应用和输入法，保证应用可以通过输入法进行文本输入
+**图 1** 子系统架构图
+
+
#### 仓路径
/base/miscservices/inputmethod
diff --git a/figures/subsystem_architecture.png b/figures/subsystem_architecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..deaf36f6f857d0096aa94df01ad6012fb55c8049
Binary files /dev/null and b/figures/subsystem_architecture.png differ
diff --git a/figures/subsystem_architecture_zh.png b/figures/subsystem_architecture_zh.png
new file mode 100644
index 0000000000000000000000000000000000000000..9497536287fe412bbbcac59aeabbbb291d694ca4
Binary files /dev/null and b/figures/subsystem_architecture_zh.png differ
diff --git a/frameworks/inputmethod_ability/BUILD.gn b/frameworks/inputmethod_ability/BUILD.gn
index bbfa17365e7f305c8e6bd472b2f9c9b60e2da530..90769ce6c5bcff3a48b5ff4636c0d464e233016c 100644
--- a/frameworks/inputmethod_ability/BUILD.gn
+++ b/frameworks/inputmethod_ability/BUILD.gn
@@ -66,7 +66,6 @@ ohos_shared_library("inputmethod_ability") {
public_configs = [
":inputmethod_ability_native_config",
- "//utils/native/base:utils_config",
]
subsystem_name = "miscservices"
diff --git a/frameworks/inputmethod_controller/BUILD.gn b/frameworks/inputmethod_controller/BUILD.gn
index 597d87b336eb45896a9ead949909cf197a114c08..2c088a5cfc7df2c61c4b5262b58df66496fa6538 100644
--- a/frameworks/inputmethod_controller/BUILD.gn
+++ b/frameworks/inputmethod_controller/BUILD.gn
@@ -59,7 +59,6 @@ ohos_shared_library("inputmethod_client") {
configs = [
":inputmethod_client_native_config",
- "//utils/native/base:utils_config",
]
public_configs = [ ":inputmethod_client_native_public_config" ]
diff --git a/unitest/src/input_method_ability_test.cpp b/unitest/src/input_method_ability_test.cpp
index 8270a8a98e74079934f14c181b795878ee82a493..c5c40dd65adce50f9fc5f7a76ce0bce396aea77d 100644
--- a/unitest/src/input_method_ability_test.cpp
+++ b/unitest/src/input_method_ability_test.cpp
@@ -60,11 +60,11 @@ void InputMethodAbilityTest::TearDown(void)
}
/**
-* @tc.name: Ima001
+* @tc.name: testReadWriteIInputMethodAgent
* @tc.desc: Checkout IInputMethodAgent.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodAbilityTest, Ima001, TestSize.Level0)
+HWTEST_F(InputMethodAbilityTest, testReadWriteIInputMethodAgent, TestSize.Level0)
{
sptr mInputMethodAgentStub = new InputMethodAgentStub();
MessageParcel data;
@@ -76,11 +76,11 @@ HWTEST_F(InputMethodAbilityTest, Ima001, TestSize.Level0)
}
/**
-* @tc.name: Ima002
+* @tc.name: testReadWriteIInputMethodCore
* @tc.desc: Checkout IInputMethodCore.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodAbilityTest, Ima002, TestSize.Level0)
+HWTEST_F(InputMethodAbilityTest, testReadWriteIInputMethodCore, TestSize.Level0)
{
sptr mInputMethodCoreStub = new InputMethodCoreStub(0);
MessageParcel data;
@@ -92,11 +92,11 @@ HWTEST_F(InputMethodAbilityTest, Ima002, TestSize.Level0)
}
/**
-* @tc.name: Ima003
+* @tc.name: testReadWriteIInputControlChannel
* @tc.desc: Checkout IInputControlChannel.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodAbilityTest, Ima003, TestSize.Level0)
+HWTEST_F(InputMethodAbilityTest, testReadWriteIInputControlChannel, TestSize.Level0)
{
sptr mInputControlChannelStub = new InputControlChannelStub(0);
MessageParcel data;
@@ -108,22 +108,22 @@ HWTEST_F(InputMethodAbilityTest, Ima003, TestSize.Level0)
}
/**
-* @tc.name: Ima004
+* @tc.name: testGetInputMethodAbilityInstance
* @tc.desc: Checkout the function of getInstance.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodAbilityTest, Ima004, TestSize.Level0)
+HWTEST_F(InputMethodAbilityTest, testGetInputMethodAbilityInstance, TestSize.Level0)
{
auto ima = InputMethodAbility::GetInstance();
ASSERT_TRUE(ima != nullptr);
}
/**
-* @tc.name: Ima005
+* @tc.name: testSerializedInputAttribute
* @tc.desc: Checkout the serialization of InputAttribute.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodAbilityTest, Ima005, TestSize.Level0)
+HWTEST_F(InputMethodAbilityTest, testSerializedInputAttribute, TestSize.Level0)
{
sptr mInputAttribute = new InputAttribute();
mInputAttribute->SetInputPattern(InputAttribute::PATTERN_PASSWORD);
@@ -136,11 +136,11 @@ HWTEST_F(InputMethodAbilityTest, Ima005, TestSize.Level0)
}
/**
-* @tc.name: Ima006
+* @tc.name: testSerializedKeyboardType
* @tc.desc: Checkout the serialization of KeyboardType.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodAbilityTest, Ima006, TestSize.Level0)
+HWTEST_F(InputMethodAbilityTest, testSerializedKeyboardType, TestSize.Level0)
{
int32_t def_value = 2021;
sptr mKeyboardType = new KeyboardType();
diff --git a/unitest/src/input_method_controller_test.cpp b/unitest/src/input_method_controller_test.cpp
index 3c9b7e44a2b2104e09e84cb8ce7dca0a0da099f7..379dfdb40b12322ce532ff545ea6c08f5d72a5a6 100644
--- a/unitest/src/input_method_controller_test.cpp
+++ b/unitest/src/input_method_controller_test.cpp
@@ -83,11 +83,11 @@ void InputMethodControllerTest::TearDown(void)
}
/**
-* @tc.name: Imc001
+* @tc.name: testGetIMSAProxy
* @tc.desc: Get Imsa Proxy.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc001, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testGetIMSAProxy, TestSize.Level0)
{
auto systemAbilityManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
ASSERT_TRUE(systemAbilityManager != nullptr);
@@ -96,11 +96,11 @@ HWTEST_F(InputMethodControllerTest, Imc001, TestSize.Level0)
}
/**
-* @tc.name: Imc002
+* @tc.name: testWriteReadIInputDataChannel
* @tc.desc: Checkout IInputDataChannel.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc002, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testWriteReadIInputDataChannel, TestSize.Level0)
{
sptr mInputDataChannel = new InputDataChannelStub();
MessageParcel data;
@@ -112,11 +112,11 @@ HWTEST_F(InputMethodControllerTest, Imc002, TestSize.Level0)
}
/**
-* @tc.name: Imc003
+* @tc.name: testIMCBindToIMSA
* @tc.desc: Bind IMSA.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc003, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testIMCBindToIMSA, TestSize.Level0)
{
sptr mClient = new InputClientStub();
MessageParcel data;
@@ -128,11 +128,11 @@ HWTEST_F(InputMethodControllerTest, Imc003, TestSize.Level0)
}
/**
-* @tc.name: Imc004
+* @tc.name: testInputMethodSettingValue
* @tc.desc: Checkout setting.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc004, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testInputMethodSettingValue, TestSize.Level0)
{
InputMethodSetting setting;
std::u16string key = InputMethodSetting::CURRENT_INPUT_METHOD_TAG;
@@ -146,11 +146,11 @@ HWTEST_F(InputMethodControllerTest, Imc004, TestSize.Level0)
}
/**
-* @tc.name: Imc005
+* @tc.name: testInputMethodSettingCurrentInputMethod
* @tc.desc: Checkout setting.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc005, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testInputMethodSettingCurrentInputMethod, TestSize.Level0)
{
InputMethodSetting setting;
std::u16string curIme = setting.GetCurrentInputMethod();
@@ -163,11 +163,11 @@ HWTEST_F(InputMethodControllerTest, Imc005, TestSize.Level0)
}
/**
-* @tc.name: Imc006
+* @tc.name: testInputMethodSettingCurrentKeyboard
* @tc.desc: Checkout setting.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc006, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testInputMethodSettingCurrentKeyboard, TestSize.Level0)
{
InputMethodSetting setting;
int32_t curType = setting.GetCurrentKeyboardType();
@@ -187,11 +187,11 @@ HWTEST_F(InputMethodControllerTest, Imc006, TestSize.Level0)
}
/**
-* @tc.name: Imc007
+* @tc.name: testInputMethodWholeProcess
* @tc.desc: Bind IMSA.
* @tc.type: FUNC
*/
-HWTEST_F(InputMethodControllerTest, Imc007, TestSize.Level0)
+HWTEST_F(InputMethodControllerTest, testInputMethodWholeProcess, TestSize.Level0)
{
IMSA_HILOGI("IMC TEST START");
sptr imc = InputMethodController::GetInstance();