Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
cb921b90
X
Xts Acts
项目概览
OpenHarmony
/
Xts Acts
大约 1 年 前同步成功
通知
9
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
Xts Acts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
cb921b90
编写于
3月 14, 2023
作者:
O
openharmony_ci
提交者:
Gitee
3月 14, 2023
浏览文件
操作
浏览文件
下载
差异文件
!7964 系统账号osAccountInfo type返回类型整改
Merge pull request !7964 from 郭永强/master
上级
380526a1
de7c161e
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
35 addition
and
15 deletion
+35
-15
account/appaccount/actsaccountoperatetest/src/main/js/test/ChangeOnOff.js
...nt/actsaccountoperatetest/src/main/js/test/ChangeOnOff.js
+4
-0
account/appaccount/actsaccountoperatetest/src/main/js/test/List.test.js
...ount/actsaccountoperatetest/src/main/js/test/List.test.js
+1
-1
account/appaccount/actsaccounttest/src/main/js/test/List.test.js
.../appaccount/actsaccounttest/src/main/js/test/List.test.js
+1
-1
account/appaccount/actsaccounttest/src/main/js/test/OnOff.js
account/appaccount/actsaccounttest/src/main/js/test/OnOff.js
+14
-0
account/appaccount/sceneProject/actsaccountsceneonoff/entry/src/main/js/default/pages/index/index.js
...sceneonoff/entry/src/main/js/default/pages/index/index.js
+7
-5
account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js
...countthirdpartytest/src/main/js/test/OsAccountGet.test.js
+4
-4
account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountQuery.test.js
...untthirdpartytest/src/main/js/test/OsAccountQuery.test.js
+4
-4
未找到文件。
account/appaccount/actsaccountoperatetest/src/main/js/test/ChangeOnOff.js
浏览文件 @
cb921b90
...
...
@@ -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
浏览文件 @
cb921b90
...
...
@@ -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
浏览文件 @
cb921b90
...
...
@@ -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
浏览文件 @
cb921b90
...
...
@@ -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
100755 → 100644
浏览文件 @
cb921b90
...
...
@@ -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
浏览文件 @
cb921b90
...
...
@@ -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
浏览文件 @
cb921b90
...
...
@@ -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
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录