!7964 系统账号osAccountInfo type返回类型整改

Merge pull request !7964 from 郭永强/master

account/appaccount/actsaccountoperatetest/src/main/js/test/ChangeOnOff.js

@@ -60,6 +60,7 @@ export default function ActsAccountOnOff() {
         */
         it('ActsAccountOnOff_0300', 0, async function (done) {
             testInit();
+	    await sleep(500);
             console.debug("====>ActsAccountOnOff_0300 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -124,6 +125,7 @@ export default function ActsAccountOnOff() {
         */
         it('ActsAccountOnOff_0400', 0, async function (done) {
             testInit();
+	    await sleep(500);
             console.debug("====>ActsAccountOnOff_0400 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -192,6 +194,7 @@ export default function ActsAccountOnOff() {
         */
         it('ActsAccountOnOff_0500', 0, async function (done) {
             testInit();
+	    await sleep(500);
             console.debug("====>ActsAccountOnOff_0500 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -251,6 +254,7 @@ export default function ActsAccountOnOff() {
         */
         it('ActsAccountOnOff_0600', 0, async function (done) {
             testInit();
+	    await sleep(500);
             console.debug("====>ActsAccountOnOff_0600 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");

account/appaccount/actsaccountoperatetest/src/main/js/test/List.test.js

@@ -32,7 +32,7 @@ export default function testsuite() {
     ActsAccountRemoveAccount()
     ActsAccountErrPermission()
     ActsAccountAuthToken()
-    ActsAccountOnOff()
     ActsAccountAuthenticator()
     ActsAccountErrCode()
+    ActsAccountOnOff()
 }
\ No newline at end of file

account/appaccount/actsaccounttest/src/main/js/test/List.test.js

@@ -33,6 +33,6 @@ export default function testsuite() {
     ActsAccountSetGetExtraInfo()
     ActsAccountNoPermission()
     ActsAccountOAuthToken()
-    ActsAccountChangeOnOff()
     ActsAccountAuthenticator()
+    ActsAccountChangeOnOff()
 }
\ No newline at end of file

account/appaccount/actsaccounttest/src/main/js/test/OnOff.js

@@ -60,6 +60,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0100', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0100 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -129,6 +130,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0200', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0200 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -193,6 +195,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0300', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0300 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -257,6 +260,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0400', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0400 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -325,6 +329,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0500', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0500 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -384,6 +389,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0600', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0600 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -456,6 +462,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_0700', 0, async function (done) {
             testInit();
+            await sleep(1000);
             console.debug("====>ActsAccountChangeOnOff_0700 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
@@ -520,6 +527,7 @@ export default function ActsAccountChangeOnOff() {
         it('ActsAccountChangeOnOff_0800', 0, async function (done) {
             console.debug("====>ActsAccountChangeOnOff_0800 start====");
             let dataMap = new Map();
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add account ActsAccountChangeOnOff_0800 start");
@@ -575,6 +583,7 @@ export default function ActsAccountChangeOnOff() {
         it('ActsAccountChangeOnOff_0900', 0, async function (done) {
             console.debug("====>ActsAccountChangeOnOff_0900 start====");
             let dataMap = new Map();
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add first account ActsAccountChangeOnOff_0900 start");
@@ -642,6 +651,7 @@ export default function ActsAccountChangeOnOff() {
             console.debug("====>ActsAccountChangeOnOff_1000 start====");
             let dataMapFir = new Map();
             let dataMapSec = new Map();
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add account ActsAccountChangeOnOff_1000 start");
@@ -718,6 +728,7 @@ export default function ActsAccountChangeOnOff() {
         it('ActsAccountChangeOnOff_1100', 0, async function (done) {
             console.debug("====>ActsAccountChangeOnOff_1100 start====");
             let dataMap = new Map();
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add account ActsAccountChangeOnOff_1100 start");
@@ -778,6 +789,7 @@ export default function ActsAccountChangeOnOff() {
         it('ActsAccountChangeOnOff_1200', 0, async function (done) {
             console.debug("====>ActsAccountChangeOnOff_1200 start====");
             let dataMap = new Map();
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add account ActsAccountChangeOnOff_1200 start");
@@ -838,6 +850,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_1300', 0, async function (done) {
             console.debug("====>ActsAccountChangeOnOff_1300 start====");
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add account ActsAccountChangeOnOff_1300 start");
@@ -884,6 +897,7 @@ export default function ActsAccountChangeOnOff() {
         */
         it('ActsAccountChangeOnOff_1400', 0, async function (done) {
             console.debug("====>ActsAccountChangeOnOff_1400 start====");
+            await sleep(1000);
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>creat appAccountManager finish");
             console.debug("====>add account ActsAccountChangeOnOff_1400 start");

account/appaccount/sceneProject/actsaccountsceneonoff/entry/src/main/js/default/pages/index/index.js

@@ -36,9 +36,10 @@ export default {
     data: {
     },
     onShow() {
-        this.title = "scene on off";
+       // this.title = "scene on off";
     },
     onInit() {
+        this.title = "scene on off";
         console.debug("====>change on off scene start====");
         var appAccountManager = account.createAppAccountManager();
         var commonEventSubscribeInfo = {
@@ -51,11 +52,12 @@ export default {
             console.debug("====>publish call back scene err:" + JSON.stringify(err));
             console.debug("====>scene off start====");
             appAccountManager.off('accountChange', function (){
-                appAccountManager.off('change', function (){
-                    console.debug("====>scene off finish====");
-                });
+                console.debug("====>scene off accountChange finish====");
+            });
+            appAccountManager.off('change', function (){
+                console.debug("====>scene off change finish====");
             });
-           // featureAbility.terminateSelf()
+            featureAbility.terminateSelf()
         }
 
         // Subscribe to the callback of account information changes, verify the received account information, and send

account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js

@@ -213,7 +213,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
                 console.debug("====>get type err: " + JSON.stringify(err));
                 console.debug("====>type obtained by process:" + JSON.stringify(accountType));
                 expect(err).assertEqual(null);
-                expect(accountType.ADMIN).assertEqual(0);
+                expect(accountType).assertEqual(0);
                 console.debug("====>ActsOsAccountGetTypeFormProcess_0100 end====");
                 done();
             });
@@ -230,7 +230,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             console.debug("====>get AccountManager finish====");
             var accountType = await osAccountManager.getOsAccountTypeFromProcess();
             console.debug("====>type obtained by process:" + JSON.stringify(accountType));
-            expect(accountType.ADMIN).assertEqual(0);
+            expect(accountType).assertEqual(0);
             console.debug("====>ActsOsAccountGetTypeFormProcess_0200 end====");
             done();
         });
@@ -354,7 +354,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
                 expect(err).assertEqual(null);
                 expect(data.localName).assertEqual("osAccountNameIdSerialA");
                 expect(data.domainInfo.accountName == "").assertEqual(true)
-                expect(data.type.NORMAL).assertEqual(1);
+                expect(data.type).assertEqual(1);
                 expect(data.constraints.length > 0).assertEqual(true);
                 expect(data.isVerified).assertEqual(false);
                 expect(data.distributedInfo.name != null).assertEqual(true);
@@ -644,7 +644,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             var data = await AccountManager.queryCurrentOsAccount();
             console.debug("====>queryCurrentOsAccount data:" + JSON.stringify(data));
             expect(data.localId).assertEqual(100);
-            expect(data.type.ADMIN).assertEqual(0);
+            expect(data.type).assertEqual(0);
             var serialNumberStr = data.serialNumber.toString();
             var serialIntercept = serialNumberStr.substring(8);
             console.debug("====>truncate the last eight characters: " + serialIntercept);

account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountQuery.test.js

@@ -215,7 +215,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() {
                 console.debug("====>get type err: " + JSON.stringify(err));
                 console.debug("====>type obtained by process:" + JSON.stringify(accountType));
                 expect(err).assertEqual(null);
-                expect(accountType.ADMIN).assertEqual(0);
+                expect(accountType).assertEqual(0);
                 console.debug("====>ActsOsAccountgetType_0100 end====");
                 done();
             });
@@ -232,7 +232,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() {
             console.debug("====>get AccountManager finish====");
             var accountType = await osAccountManager.getOsAccountType();
             console.debug("====>type obtained by process:" + JSON.stringify(accountType));
-            expect(accountType.ADMIN).assertEqual(0);
+            expect(accountType).assertEqual(0);
             console.debug("====>ActsOsAccountgetType_0200 end====");
             done();
         });
@@ -356,7 +356,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() {
                 expect(err).assertEqual(null);
                 expect(data.localName).assertEqual("osAccountNameIdSerialA");
                 expect(data.domainInfo.accountName == "").assertEqual(true)
-                expect(data.type.NORMAL).assertEqual(1);
+                expect(data.type).assertEqual(1);
                 expect(data.constraints.length > 0).assertEqual(true);
                 expect(data.isVerified).assertEqual(false);
                 expect(data.distributedInfo.name != null).assertEqual(true);
@@ -646,7 +646,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() {
             var data = await AccountManager.getCurrentOsAccount();
             console.debug("====>getCurrentOsAccount data:" + JSON.stringify(data));
             expect(data.localId).assertEqual(100);
-            expect(data.type.ADMIN).assertEqual(0);
+             expect(data.type).assertEqual(0);
             var serialNumberStr = data.serialNumber.toString();
             var serialIntercept = serialNumberStr.substring(8);
             console.debug("====>truncate the last eight characters: " + serialIntercept);