!4816 校验moduleName

Merge pull request !4816 from shilei91/master

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

@@ -800,8 +800,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();
@@ -835,8 +837,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();
@@ -1524,7 +1528,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();
@@ -1565,7 +1569,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();

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

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