提交 c85764f7 编写于 作者: Z zhaoyuan

update abilitymanager

Signed-off-by: Nzhaoyuan <zhaoyuan17@huawei.com>
上级 3c9e9888
......@@ -47,7 +47,7 @@ var bundleNameList = [
describe('ActsAmsCallBackFifthScene', function () {
console.info('----ActsAmsCallBackFifthScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -62,18 +62,15 @@ describe('ActsAmsCallBackFifthScene', function () {
},
);
var maxnum = 10, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfifthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackfifthscene') {
abilitymanager.removeMission(data[i].id,
(info) => {
console.info(' removeMission data [' + info + ']');
});
}
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfifthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackfifthscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -113,29 +110,7 @@ describe('ActsAmsCallBackFifthScene', function () {
},
},
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......
......@@ -44,7 +44,7 @@ var bundleNameList = [
describe('ActsAmsCallBackFirstScene', function () {
console.info('----ActsAmsCallBackFirstScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -59,18 +59,15 @@ describe('ActsAmsCallBackFirstScene', function () {
},
);
var maxnum = 10, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfirstscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackfirstscene') {
abilitymanager.removeMission(data[i].id,
(info) => {
console.info(' removeMission data [' + info + ']');
});
}
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfirstscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackfirstscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -84,27 +81,7 @@ describe('ActsAmsCallBackFirstScene', function () {
},
},
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......@@ -159,7 +136,7 @@ describe('ActsAmsCallBackFirstScene', function () {
abilitymanager.queryRunningAbilityMissionInfos(maxnum,
(error, info) => {
console.info('queryRecentAbilityMissionInfos error.code : \
' + error.code + ',data length [' + data.length + ']');
' + error.code + ',data length [' + info.length + ']');
console.info('Acts_Ams_test_0400 queryRunningAbilityMissionInfos info ' + JSON.stringify(info));
expect(Array.isArray(info)).assertEqual(true);
expect(info.length).assertEqual(2);
......@@ -205,7 +182,7 @@ describe('ActsAmsCallBackFirstScene', function () {
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag,
(error, info) => {
console.info('queryRunningAbilityMissionInfos error.code : \
' + error.code + ',data length [' + data.length + ']');
' + error.code + ',data length [' + info.length + ']');
console.info('Acts_Ams_test_0600 queryRecentAbilityMissionInfos info ' + JSON.stringify(info));
expect(Array.isArray(info)).assertEqual(true);
expect(info.length).assertEqual(2);
......
......@@ -50,7 +50,7 @@ var bundleNameList = [
describe('ActsAmsCallBackFourthScene', function () {
console.info('----ActsAmsCallBackFourthScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -64,19 +64,16 @@ describe('ActsAmsCallBackFourthScene', function () {
},
},
);
var maxnum = 20, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfourthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackfourthscene') {
abilitymanager.removeMission(data[i].id,
(info) => {
console.info(' removeMission data [' + info + ']');
});
}
var maxnum = 10, flag = 1;
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfourthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackfourthscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -129,28 +126,7 @@ describe('ActsAmsCallBackFourthScene', function () {
},
}
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......
......@@ -46,7 +46,7 @@ var bundleNameList = [
describe('ActsAmsCallBackSecondScene', function () {
console.info('----ActsAmsCallBackSecondScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -60,19 +60,16 @@ describe('ActsAmsCallBackSecondScene', function () {
},
},
);
var maxnum = 20, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbacksecondscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbacksecondscene') {
abilitymanager.removeMission(data[i].id,
(info) => {
console.info(' removeMission data [' + info + ']');
});
}
var maxnum = 10, flag = 1;
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbacksecondscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbacksecondscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -99,28 +96,7 @@ describe('ActsAmsCallBackSecondScene', function () {
},
}
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......@@ -175,7 +151,7 @@ describe('ActsAmsCallBackSecondScene', function () {
abilitymanager.queryRunningAbilityMissionInfos(maxnum,
(error, info) => {
console.info('queryRecentAbilityMissionInfos error.code : \
' + error.code + ',data length [' + data.length + ']');
' + error.code + ',data length [' + info.length + ']');
console.info('Acts_Ams_test_2000 queryRunningAbilityMissionInfos info ' + JSON.stringify(info));
expect(Array.isArray(info)).assertEqual(true);
expect(info.length).assertEqual(3);
......@@ -221,7 +197,7 @@ describe('ActsAmsCallBackSecondScene', function () {
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag,
(error, info) => {
console.info('queryRunningAbilityMissionInfos error.code : \
' + error.code + ',data length [' + data.length + ']');
' + error.code + ',data length [' + info.length + ']');
console.info('Acts_Ams_test_2200 queryRecentAbilityMissionInfos info ' + JSON.stringify(info));
expect(Array.isArray(info)).assertEqual(true);
expect(info.length).assertEqual(3);
......
......@@ -44,7 +44,7 @@ var bundleNameList = [
]
describe('ActsAmsCallBackThirdScene', function () {
console.info('----ActsAmsCallBackThirdScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -58,19 +58,16 @@ describe('ActsAmsCallBackThirdScene', function () {
},
}
);
var maxnum = 20, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackthirdscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackthirdscene') {
abilitymanager.removeMission(data[i].id,
(info) => {
console.info(' removeMission data [' + info + ']');
});
}
var maxnum = 10, flag = 1;
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackthirdscene' &&
data[i].topAbility.bundleName != 'com.example.actsamscallbackthirdscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -110,28 +107,7 @@ describe('ActsAmsCallBackThirdScene', function () {
},
},
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......@@ -186,7 +162,7 @@ describe('ActsAmsCallBackThirdScene', function () {
abilitymanager.queryRunningAbilityMissionInfos(maxnum,
(error, info) => {
console.info('queryRecentAbilityMissionInfos error.code : \
' + error.code + ',data length [' + data.length + ']');
' + error.code + ',data length [' + info.length + ']');
console.info('Acts_Ams_test_3600 queryRunningAbilityMissionInfos info ' + JSON.stringify(info));
expect(Array.isArray(info)).assertEqual(true);
expect(info.length).assertEqual(3);
......@@ -232,7 +208,7 @@ describe('ActsAmsCallBackThirdScene', function () {
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag,
(error, info) => {
console.info('queryRunningAbilityMissionInfos error.code : \
' + error.code + ',data length [' + data.length + ']');
' + error.code + ',data length [' + info.length + ']');
console.info('Acts_Ams_test_3800 queryRecentAbilityMissionInfos info ' + JSON.stringify(info));
expect(Array.isArray(info)).assertEqual(true);
expect(info.length).assertEqual(3);
......
......@@ -47,7 +47,7 @@ var bundleNameList = [
describe('ActsAmsTestFifthScene', function () {
console.info('----ActsAmsTestFifthScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -67,16 +67,15 @@ describe('ActsAmsTestFifthScene', function () {
},
);
var maxnum = 10, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestfifthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestfifthscene') {
var info = abilitymanager.removeMission(data[i].id);
console.info(' removeMission data [' + info + ']');
}
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestfifthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestfifthscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -131,31 +130,9 @@ describe('ActsAmsTestFifthScene', function () {
},
},
);
done();
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
});
/*
* @tc.number : Acts_Ams_test_6500
* @tc.name : getAllRunningProcesses : Get All Running Processes Info
......
......@@ -44,7 +44,7 @@ var bundleNameList = [
describe('ActsAmsTestFirstScene', function () {
console.info('----ActsAmsTestFirstScene----');
beforeAll(async function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -64,16 +64,15 @@ describe('ActsAmsTestFirstScene', function () {
},
);
var maxnum = 10, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestfirstscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestfirstscene.MainAbility') {
var info = abilitymanager.removeMission(data[i].id);
console.info(' removeMission data [' + info + ']');
}
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestfirstscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestfirstscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -92,10 +91,7 @@ describe('ActsAmsTestFirstScene', function () {
},
},
);
});
afterAll(function () {
abilitymanager.clearMissions();
done();
});
/*
......
......@@ -49,7 +49,7 @@ var bundleNameList = [
]
describe('ActsAmsTestFourthScene', function () {
console.info('----ActsAmsTestFourthScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -68,17 +68,16 @@ describe('ActsAmsTestFourthScene', function () {
},
},
);
var maxnum = 20, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestfourthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestfourthscene') {
var info = abilitymanager.removeMission(data[i].id);
console.info('removeMission data [' + info + ']');
}
var maxnum = 10, flag = 1;
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestfourthscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestfourthscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -151,28 +150,7 @@ describe('ActsAmsTestFourthScene', function () {
},
},
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......
......@@ -46,7 +46,7 @@ var bundleNameList = [
describe('ActsAmsTestSecondScene', function () {
console.info('----ActsAmsTestSecondScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -66,16 +66,15 @@ describe('ActsAmsTestSecondScene', function () {
},
);
var maxnum = 10, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestsecondscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestsecondscene') {
var info = abilitymanager.removeMission(data[i].id);
console.info(' removeMission data [' + info + ']');
}
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestsecondscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestsecondscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -112,29 +111,7 @@ describe('ActsAmsTestSecondScene', function () {
},
},
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......
......@@ -46,7 +46,7 @@ var bundleNameList = [
describe('ActsAmsTestThirdScene', function () {
console.info('----ActsAmsTestThirdScene----');
beforeAll(function () {
beforeAll(async function (done) {
featureAbility.startAbility(
{
want:
......@@ -65,17 +65,16 @@ describe('ActsAmsTestThirdScene', function () {
},
},
);
var maxnum = 20, flag = 1;
abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => {
console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestthirdscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestthirdscene') {
var info = abilitymanager.removeMission(data[i].id);
console.info(' removeMission data [' + info + ']');
}
var maxnum = 10, flag = 1;
var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag);
console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data));
for (var i = 0; i < data.length; i++) {
if (data[i].baseAbility.bundleName != 'com.example.actsamstestthirdscene' &&
data[i].topAbility.bundleName != 'com.example.actsamstestthirdscene') {
var info = abilitymanager.removeMission(data[i].id);
console.log(' removeMission data [' + info + ']');
}
});
};
featureAbility.startAbility(
{
want:
......@@ -130,28 +129,7 @@ describe('ActsAmsTestThirdScene', function () {
},
},
);
});
afterAll(function () {
featureAbility.startAbility(
{
want:
{
deviceId: "",
bundleName: "com.ohos.launcher",
abilityName: "com.ohos.launcher.MainAbility",
action: "action1",
entities: ["entity1"],
type: "MIMETYPE",
uri: "key={true,true,false}",
options:
{},
parameters:
{},
},
},
);
abilitymanager.clearMissions();
done();
});
/*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册