!4867 【xts_acts】【master】【multimodalinput】部件化适配及主干编译报错解决

Merge pull request !4867 from chenkang/master

multimodalinput/input_js_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("multimodalinput_js_test") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsMultimodalinputJSApiTest"
+  subsystem_name = "multimodalinput"
+  part_name = "input"
 }
 ohos_js_assets("multimodalinput_js_assets") {
   source_dir = "./src/main/js/default"

multimodalinput/multimodalinput_ets_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsMultimodalInputEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsMultimodalInputEtsTest"
+  subsystem_name = "multimodalinput"
+  part_name = "input"
 }
 ohos_js_assets("multimodalinput_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

multimodalinput/multimodalinput_ets_standard/entry/src/main/ets/test/MultimodalInputEventType.test.ets

@@ -63,7 +63,7 @@ export default function MultimodalInputEventTypeTest() {
             let testKeyEvent: KeyEvent = {
                 id: 1, deviceId: 1, actionTime: 1, screenId: 1, windowId: 1,
                 action: keyEvent.Action.DOWN, key: testKey, unicodeChar: 1, keys: [testKey],
-                ctrlKey: true, altKey: true, shiftKey: true, infooKey: true, fnKey: true, capsLock: true, numLock: true,
+                ctrlKey: true, altKey: true, shiftKey: true, logoKey: true, fnKey: true, capsLock: true, numLock: true,
                 scrollLock: true
             };
 
@@ -74,7 +74,7 @@ export default function MultimodalInputEventTypeTest() {
             expect(testKeyEvent.ctrlKey).assertTrue();
             expect(testKeyEvent.altKey).assertTrue();
             expect(testKeyEvent.shiftKey).assertTrue();
-            expect(testKeyEvent.infooKey).assertTrue();
+            expect(testKeyEvent.logoKey).assertTrue();
             expect(testKeyEvent.fnKey).assertTrue();
             expect(testKeyEvent.capsLock).assertTrue();
             expect(testKeyEvent.numLock).assertTrue();
@@ -188,7 +188,7 @@ export default function MultimodalInputEventTypeTest() {
                 windowY: 1, rawDeltaX: 1, rawDeltaY: 1, button: mouseEvent.Button.LEFT,
                 pressedButtons: [mouseEvent.Button.LEFT], axes: [testAxisValue],
                 pressedKeys: [inputkeyCode.KeyCode.KEYCODE_FN], ctrlKey: true, altKey: true, shiftKey: true,
-                infooKey: true, fnKey: true, capsLock: true, numLock: true, scrollLock: true
+                logoKey: true, fnKey: true, capsLock: true, numLock: true, scrollLock: true
             };
             expect(testMouseEvent.action == mouseEvent.Action.CANCEL).assertTrue();
             expect(testMouseEvent.screenX == 1).assertTrue();
@@ -204,7 +204,7 @@ export default function MultimodalInputEventTypeTest() {
             expect(testMouseEvent.ctrlKey).assertTrue();
             expect(testMouseEvent.altKey).assertTrue();
             expect(testMouseEvent.shiftKey).assertTrue();
-            expect(testMouseEvent.infooKey).assertTrue();
+            expect(testMouseEvent.logoKey).assertTrue();
             expect(testMouseEvent.fnKey).assertTrue();
             expect(testMouseEvent.capsLock).assertTrue();
             expect(testMouseEvent.numLock).assertTrue();