提交 a96fed64 编写于 作者: Y yaocui 提交者: 姚翠
上级 3922dd17
...@@ -1198,7 +1198,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1198,7 +1198,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} }
}) })
}) })
/** /**
* @tc.number SUB_WINDOW_ON_OFF_JSAPI_005 * @tc.number SUB_WINDOW_ON_OFF_JSAPI_005
* @tc.name Test listenerTest5 * @tc.name Test listenerTest5
...@@ -1209,10 +1208,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1209,10 +1208,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
let msgStr = 'jsunittest ' + caseName + ' '; let msgStr = 'jsunittest ' + caseName + ' ';
let listenerOnFlag = false; let listenerOnFlag = false;
console.log(msgStr + 'begin'); console.log(msgStr + 'begin');
listenerData.on = true;
listenerData.typeStr = 'systemAvoidAreaChange';
let setSystemBarEnableType = null;
function setSystemBarEnable(tempWnd) { function setSystemBarEnable(tempWnd) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
tempWnd.setSystemBarEnable([], (err, data) => { tempWnd.setSystemBarEnable([], (err, data) => {
...@@ -1220,8 +1215,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1220,8 +1215,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
reject(false) reject(false)
} else { } else {
console.log(msgStr + 'tempWnd.setSystemBarEnable([]) success'); console.log(msgStr + 'tempWnd.setSystemBarEnable([]) success');
listenerOnFlag = true;
setSystemBarEnableType = 0;
resolve(true) resolve(true)
} }
}) })
...@@ -1235,7 +1228,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1235,7 +1228,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
reject(false) reject(false)
} else { } else {
console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success'); console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success');
setSystemBarEnableType = 2;
resolve(true) resolve(true)
} }
}) })
...@@ -1248,23 +1240,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1248,23 +1240,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
expect().assertFail() expect().assertFail()
}); });
expect(!!tempWnd).assertTrue(); expect(!!tempWnd).assertTrue();
await tempWnd.show().then((data) => {
console.info(msgStr + 'Success to show the window. data: ' + JSON.stringify(data));
}).catch((err) => {
console.error(msgStr + 'Failed to show the window. Cause: ' + JSON.stringify(err));
expect().assertFail()
});
await tempWnd.setFullScreen(true).then((data) => {
console.info(msgStr + 'Success to enable the full-screen mode. data: ' + JSON.stringify(data));
}).catch((err) => {
console.error(msgStr + 'Failed to enable the full-screen mode. Cause: ' + JSON.stringify(err));
expect().assertFail()
});
tempWnd.on('systemAvoidAreaChange', avoidAreaData => { tempWnd.on('systemAvoidAreaChange', avoidAreaData => {
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, avoidAreaData : ' + JSON.stringify(avoidAreaData));
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, setSystemBarEnableType : ' + setSystemBarEnableType);
if (listenerOnFlag === true) { if (listenerOnFlag === true) {
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, listenerOnFlag : ' + listenerOnFlag); console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, listenerOnFlag : ' + listenerOnFlag);
try { try {
...@@ -1274,35 +1250,14 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1274,35 +1250,14 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} }
tempWnd.off('systemAvoidAreaChange') tempWnd.off('systemAvoidAreaChange')
done(); done();
} else {
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, listenerOnFlag : ' + listenerOnFlag);
if (setSystemBarEnableType === 0) {
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, setSystemBarEnableType === 0');
try {
expect().assertTrue();
} catch (error) {
console.info(msgStr + `tempWnd.on catch error: ${JSON.stringify(error)}`)
}
tempWnd.off('systemAvoidAreaChange')
done();
} else if (setSystemBarEnableType === 2) {
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, setSystemBarEnableType === 2');
try {
expect().assertTrue();
} catch (error) {
console.info(msgStr + `tempWnd.on catch error: ${JSON.stringify(error)}`)
}
tempWnd.off('systemAvoidAreaChange')
done();
} else {
console.log(msgStr + 'tempWnd.on systemAvoidAreaChange, setSystemBarEnableType null:' + setSystemBarEnableType);
}
} }
}) })
listenerOnFlag=true;
await setSystemBarEnable(tempWnd).catch((err) => { await setSystemBarEnable(tempWnd).catch((err) => {
console.info(msgStr + 'setWindowSystemBarEnable error : ' + JSON.stringify(err)); console.info(msgStr + 'setWindowSystemBarEnable error : ' + JSON.stringify(err));
expect().assertFail(); expect().assertFail();
}); });
await sleep(1000)
await setSystemBarEnableT(tempWnd).catch((err) => { await setSystemBarEnableT(tempWnd).catch((err) => {
console.info(msgStr + 'setWindowSystemBarEnable error : ' + JSON.stringify(err)); console.info(msgStr + 'setWindowSystemBarEnable error : ' + JSON.stringify(err));
expect().assertFail(); expect().assertFail();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册