!4830 同步代码至release3.1分支

Merge pull request !4830 from shilei91/OpenHarmony-3.1-Release

appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js

@@ -658,8 +658,10 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.process).assertEqual(NAME2);
         expect(datainfo.enabled).assertEqual(true);
         expect(datainfo.moduleSourceDirs.length).assertLarger(0);
+        expect(datainfo.moduleInfos.length).assertEqual(2);
+        expect(datainfo.moduleInfos[0].moduleName).assertEqual("entry");
+        expect(datainfo.moduleInfos[1].moduleName).assertEqual("feature");
         for (let j = 0; j < datainfo.moduleInfos.length; j++) {
-            expect(datainfo.moduleInfos[j].moduleName).assertEqual("entry");
             expect(datainfo.moduleInfos[j].moduleSourceDir.length).assertLarger(0);
         }
         done();
@@ -840,8 +842,10 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.process).assertEqual(NAME2);
         expect(datainfo.enabled).assertEqual(true);
         expect(datainfo.moduleSourceDirs.length).assertLarger(0);
+        expect(datainfo.moduleInfos.length).assertEqual(2);
+        expect(datainfo.moduleInfos[0].moduleName).assertEqual("entry");
+        expect(datainfo.moduleInfos[1].moduleName).assertEqual("feature");
         for (let j = 0; j < datainfo.moduleInfos.length; j++) {
-            expect(datainfo.moduleInfos[j].moduleName).assertEqual("entry");
             expect(datainfo.moduleInfos[j].moduleSourceDir.length).assertLarger(0);
         }
         done();
@@ -1087,7 +1091,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.applicationInfo.enabled).assertEqual(true);
             expect(datainfo.applicationInfo.moduleInfos[0].moduleName).assertEqual("entry");
             expect(datainfo.applicationInfo.moduleInfos[0].moduleSourceDir).assertEqual(DIR3);
-            expect(datainfo.applicationInfo.moduleInfos[1].moduleName).assertEqual("entry");
+            expect(datainfo.applicationInfo.moduleInfos[1].moduleName).assertEqual("feature");
             expect(datainfo.applicationInfo.moduleInfos[1].moduleSourceDir).assertEqual(DIR2);
         }
         done();

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/config.json

@@ -50,7 +50,7 @@
     "distro": {
       "moduleType": "feature",
       "deliveryWithInstall": true,
-      "moduleName": "entry"
+      "moduleName": "feature"
     },
     "package": "com.example.myapplication2",
     "name": ".MyApplication2",