Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 a9821726 编写于 作者: 华 华华小仙女
浏览文件
操作

优化用例 

Signed-off-by: N华华小仙女 <zhurong18@h-partners.com>
上级 839b3891
隐藏空白更改
内联 并排
Showing with 304 addition and 35 deletion
graphic/windowStage/entry/src/main/ets/test/displayAndWindowRefactorInterface.test.ets
浏览文件 @ a9821726
...@@ -1964,14 +1964,14 @@ export default function displayAndWindowRefactorInterfaceTest(context, windowSta ...@@ -1964,14 +1964,14 @@ export default function displayAndWindowRefactorInterfaceTest(context, windowSta
sumCount++ sumCount++
console.info(msgStr + 'Succeeded in setting the window mode. count: ' + sumCount); console.info(msgStr + 'Succeeded in setting the window mode. count: ' + sumCount);
console.info(msgStr + 'Succeeded in setting the window mode. loopCount.length: ' + loopCount.length); console.info(msgStr + 'Succeeded in setting the window mode. loopCount.length: ' + loopCount.length);
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length + ' ,tempType:' + tempType);
}
if (sumCount == loopCount.length) done(); if (sumCount == loopCount.length) done();
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length + ' ,tempType:' + tempType);
}
}) })
} catch (exception) { } catch (exception) {
console.error(msgStr + 'try catch Failed to set the window mode. Cause: ' + JSON.stringify(exception)); console.error(msgStr + 'try catch Failed to set the window mode. Cause: ' + JSON.stringify(exception));
......
graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets
浏览文件 @ a9821726
...@@ -574,7 +574,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -574,7 +574,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`) console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
} }
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
console.log(msgStr + 'systemBarTintChange compare start!'); console.log(msgStr + 'systemBarTintChange compare start!');
...@@ -587,6 +589,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -587,6 +589,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} catch (error) { } catch (error) {
console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`) console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
} }
...@@ -635,7 +643,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -635,7 +643,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success'); console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success');
listenerFlag = listenerStatus.pending; listenerFlag = listenerStatus.pending;
let loopCount = commonRGBColorArr.length let loopCount = commonRGBColorArr.length
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
let tempColor = commonRGBColorArr[i]; let tempColor = commonRGBColorArr[i];
let systemBarProperties = { let systemBarProperties = {
statusBarColor: tempColor, statusBarColor: tempColor,
...@@ -652,8 +662,15 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -652,8 +662,15 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
unexpectedError(err, caseName, 'tempWnd.setSystemBarProperties' + tempColor + ' ', done); unexpectedError(err, caseName, 'tempWnd.setSystemBarProperties' + tempColor + ' ', done);
} }
console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success'); console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success');
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}) })
} }
setTimeout(() => { setTimeout(() => {
console.log(msgStr + 'time wait finished. compareCount: ' + compareCount); console.log(msgStr + 'time wait finished. compareCount: ' + compareCount);
listenerFlag = listenerStatus.finished; listenerFlag = listenerStatus.finished;
...@@ -806,7 +823,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -806,7 +823,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success'); console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success');
listenerFlag = listenerStatus.pending; listenerFlag = listenerStatus.pending;
let loopCount = commonNUMBERColorArr.length let loopCount = commonNUMBERColorArr.length
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
console.log(msgStr+'tempWnd.setSystemBarEnable i:'+i); console.log(msgStr+'tempWnd.setSystemBarEnable i:'+i);
let tempColor = commonNUMBERColorArr[i]; let tempColor = commonNUMBERColorArr[i];
let systemBarProperties = { let systemBarProperties = {
...@@ -827,6 +846,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -827,6 +846,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.info(`tempWnd.setSystemBarProperties catch error: ${JSON.stringify(error)}`) console.info(`tempWnd.setSystemBarProperties catch error: ${JSON.stringify(error)}`)
} }
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}) })
} }
}) })
...@@ -858,7 +883,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -858,7 +883,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`) console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
} }
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
console.log(msgStr + 'systemBarTintChange compare start!'); console.log(msgStr + 'systemBarTintChange compare start!');
...@@ -871,6 +898,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -871,6 +898,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} catch (error) { } catch (error) {
console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`) console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
} }
...@@ -919,7 +952,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -919,7 +952,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success'); console.log(msgStr + 'tempWnd.setSystemBarEnable([status, navigation]) success');
listenerFlag = listenerStatus.pending; listenerFlag = listenerStatus.pending;
let loopCount = commonRGBColorArr.length let loopCount = commonRGBColorArr.length
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
let tempColor = commonKEYColorArr[i]; let tempColor = commonKEYColorArr[i];
let systemBarProperties = { let systemBarProperties = {
statusBarColor: tempColor, statusBarColor: tempColor,
...@@ -938,6 +973,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -938,6 +973,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} catch (error) { } catch (error) {
console.info(`tempWnd.setSystemBarProperties catch error: ${JSON.stringify(error)}`) console.info(`tempWnd.setSystemBarProperties catch error: ${JSON.stringify(error)}`)
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
done(); done();
} }
}) })
...@@ -963,7 +1004,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -963,7 +1004,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.log(msgStr + 'begin context==' + JSON.stringify(context)); console.log(msgStr + 'begin context==' + JSON.stringify(context));
let loopCount = appWindowTypeArr.length; let loopCount = appWindowTypeArr.length;
console.log(msgStr + 'loopCount: ' + loopCount); console.log(msgStr + 'loopCount: ' + loopCount);
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
let tempType = ohosWindow.WindowType.TYPE_APP; let tempType = ohosWindow.WindowType.TYPE_APP;
let windId = 'createTest5' + i; let windId = 'createTest5' + i;
console.log(msgStr + 'ohosWindow.create ' + tempType + ' start'); console.log(msgStr + 'ohosWindow.create ' + tempType + ' start');
...@@ -973,10 +1016,17 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -973,10 +1016,17 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
if (err && err.code) { if (err && err.code) {
try { try {
expect(err.code === 1003).assertTrue(); expect(err.code === 1003).assertTrue();
} catch (error) { } catch (error) {
console.info(`ohosWindow.create catch error: ${JSON.stringify(error)}`) console.info(`ohosWindow.create catch error: ${JSON.stringify(error)}`)
} }
console.log(msgStr + 'ohosWindow.create err.code==' + JSON.stringify(err.code)) console.log(msgStr + 'ohosWindow.create err.code==' + JSON.stringify(err.code))
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
if (i === loopCount - 1) { if (i === loopCount - 1) {
done(); done();
} }
...@@ -997,7 +1047,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -997,7 +1047,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
console.log(msgStr + 'begin'); console.log(msgStr + 'begin');
let loopCount = systemWindowTypeArr.length; let loopCount = systemWindowTypeArr.length;
console.log('jsunittest loopCount: ' + loopCount); console.log('jsunittest loopCount: ' + loopCount);
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
let tempType = ohosWindow.WindowType.TYPE_SYSTEM_ALERT; let tempType = ohosWindow.WindowType.TYPE_SYSTEM_ALERT;
let windId = 'createTest6' + i; let windId = 'createTest6' + i;
console.log(msgStr + 'ohosWindow.create ' + tempType + ' start'); console.log(msgStr + 'ohosWindow.create ' + tempType + ' start');
...@@ -1030,6 +1082,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1030,6 +1082,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} catch (error) { } catch (error) {
console.info(`tempWnd.getProperties catch error: ${JSON.stringify(error)}`) console.info(`tempWnd.getProperties catch error: ${JSON.stringify(error)}`)
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}) })
}) })
} }
...@@ -1890,8 +1948,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1890,8 +1948,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
currentDeviceDefault = data; currentDeviceDefault = data;
currentDeviceDefaultDpi = parseInt(currentDeviceDefault.densityDPI) currentDeviceDefaultDpi = parseInt(currentDeviceDefault.densityDPI)
let dpiItem = [-80, 80, 1000, 160, 0, 320, 188.88, 0, 640, 300, currentDeviceDefaultDpi]; let dpiItem = [-80, 80, 1000, 160, 0, 320, 188.88, 0, 640, 300, currentDeviceDefaultDpi];
for (let i = 0;i < dpiItem.length; i++) { getData(0, dpiItem.length)
await sleep(1000);
function getData(i, length) {
screens[0].setDensityDpi(dpiItem[i], (errDpi, dataDpi) => { screens[0].setDensityDpi(dpiItem[i], (errDpi, dataDpi) => {
if (errDpi.code) { if (errDpi.code) {
console.error('Failed to set DensityDpi. Cause: ' + JSON.stringify(err) + dpiItem[i]); console.error('Failed to set DensityDpi. Cause: ' + JSON.stringify(err) + dpiItem[i]);
...@@ -1910,6 +1969,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1910,6 +1969,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
} catch (error) { } catch (error) {
console.info(`tempWnd.show catch error: ${JSON.stringify(error)}`) console.info(`tempWnd.show catch error: ${JSON.stringify(error)}`)
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
}) })
}) })
...@@ -1940,14 +2005,21 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) ...@@ -1940,14 +2005,21 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
let orientationItem = ['UNSPECIFIED', 'PORTRAIT', 'LANDSCAPE', 'PORTRAIT_INVERTED', let orientationItem = ['UNSPECIFIED', 'PORTRAIT', 'LANDSCAPE', 'PORTRAIT_INVERTED',
'LANDSCAPE_INVERTED', 'AUTO_ROTATION', 'AUTO_ROTATION_PORTRAIT', 'AUTO_ROTATION_LANDSCAPE', 'LANDSCAPE_INVERTED', 'AUTO_ROTATION', 'AUTO_ROTATION_PORTRAIT', 'AUTO_ROTATION_LANDSCAPE',
'AUTO_ROTATION_RESTRICTED', 'AUTO_ROTATION_PORTRAIT_RESTRICTED', 'AUTO_ROTATION_LANDSCAPE_RESTRICTED', 'LOCKED', 'UNSPECIFIED']; 'AUTO_ROTATION_RESTRICTED', 'AUTO_ROTATION_PORTRAIT_RESTRICTED', 'AUTO_ROTATION_LANDSCAPE_RESTRICTED', 'LOCKED', 'UNSPECIFIED'];
for (let i = 0;i < orientationItem.length; i++) { getData(0, orientationItem.length)
await sleep(1000);
async function getData(i, length) {
let orientation = ohosWindow.Orientation[orientationItem[i]] let orientation = ohosWindow.Orientation[orientationItem[i]]
await mainWin.setPreferredOrientation(orientation, (err, data) => { await mainWin.setPreferredOrientation(orientation, (err, data) => {
if (err && err.code) { if (err && err.code) {
console.log(msgStr + 'window.setPreferredOrientation failed set error' + orientation); console.log(msgStr + 'window.setPreferredOrientation failed set error' + orientation);
} }
num++ num++
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
if (num == orientationItem.length) done(); if (num == orientationItem.length) done();
console.log(msgStr + 'success set window.setPreferredOrientation ' + orientation + JSON.stringify(data)); console.log(msgStr + 'success set window.setPreferredOrientation ' + orientation + JSON.stringify(data));
}) })
......
graphic/windowStage/entry/src/main/ets/test/windowPromise.test.ets
浏览文件 @ a9821726
...@@ -352,9 +352,11 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -352,9 +352,11 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!tempWnd).assertTrue(); expect(!!tempWnd).assertTrue();
let loopCount1 = systemWindowTypeArr; let loopCount1 = systemWindowTypeArr;
console.log(msgStr + 'ohosWindow.windowType' + JSON.stringify(loopCount1)) console.log(msgStr + 'ohosWindow.windowType' + JSON.stringify(loopCount1))
for (let i = 1; i < loopCount1.length; i++) { getData(1, loopCount1.length)
async function getData(i, length) {
let tempType = ohosWindow.WindowType[loopCount1[i]]; let tempType = ohosWindow.WindowType[loopCount1[i]];
console.log(msgStr + 'tempWnd.setWindowType: ' + tempType + ' ,start'); console.log(msgStr + 'tempWnd.setWindowType: ' + tempType + ' ,start ,i:'+i);
tempTypeArr.push(tempType); tempTypeArr.push(tempType);
console.log(msgStr + 'tempTypeArr: ' + JSON.stringify(tempTypeArr)); console.log(msgStr + 'tempTypeArr: ' + JSON.stringify(tempTypeArr));
let windowTypeData = await tempWnd.setWindowType(tempType).catch((err) => { let windowTypeData = await tempWnd.setWindowType(tempType).catch((err) => {
...@@ -376,11 +378,18 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -376,11 +378,18 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
tempTypeArr.splice(tempTypeArr.findIndex(item => item === prodata.type), 1); tempTypeArr.splice(tempTypeArr.findIndex(item => item === prodata.type), 1);
console.log(msgStr + '(loopCount1.length - i): ' + (loopCount1.length - i)); console.log(msgStr + '(loopCount1.length - i): ' + (loopCount1.length - i));
console.log(msgStr + '(tempTypeArr.length + 1): ' + (tempTypeArr.length + 1)); console.log(msgStr + '(tempTypeArr.length + 1): ' + (tempTypeArr.length + 1));
console.log(msgStr + '(loopCount1.length - 1): ' + (loopCount1.length - 1));
if (i == loopCount1.length - 1) { if (i == loopCount1.length - 1) {
expect((loopCount1.length - i) == (tempTypeArr.length + 1)).assertTrue(); expect((loopCount1.length - i) == (tempTypeArr.length + 1)).assertTrue();
console.log(msgStr + 'tempWnd.getProperties i=' + i + ' , loopCount1.length-1==' + loopCount1.length); console.log(msgStr + 'tempWnd.getProperties i=' + i + ' , loopCount1.length-1==' + loopCount1.length);
done();
} }
if (++i <= length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
done();
} }
} }
} }
...@@ -422,6 +431,91 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -422,6 +431,91 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
* @tc.name Test setSystemBarEnableTest1 * @tc.name Test setSystemBarEnableTest1
* @tc.desc Verify that the scene shows the status bar and hides the navigation bar * @tc.desc Verify that the scene shows the status bar and hides the navigation bar
*/ */
// it('setSystemBarEnableTest1', 0, async function (done) {
// let caseName = 'setSystemBarEnableTest1';
// let msgStr = 'jsunittest ' + caseName + ' ';
// let statusFlag = listenerStatus.ready;
// let navigationFlag = listenerStatus.ready;
// console.log(msgStr + 'begin');
// console.log(msgStr + 'tempWnd.on systemBarTintChange finished');
// let tempWnd = await windowStage.getMainWindow().catch((err) => {
// unexpectedError(err, caseName, 'windowStage.getMainWindow', done);
// });
// console.log(msgStr + 'windowStage.getMainWindow, tempWnd: ' + tempWnd);
// expect(!!tempWnd).assertTrue();
// await tempWnd.show().catch((err) => {
// unexpectedError(err, caseName, 'tempWnd.show', done);
// });
// console.log(msgStr + 'tempWnd.show success');
// await tempWnd.setFullScreen(true).catch((err) => {
// unexpectedError(err, caseName, 'tempWnd.setFullScreen(true)', done);
// });
// console.log(msgStr + 'tempWnd.setFullScreen(true) success');
// await tempWnd.setSystemBarEnable(['navigation']).catch((err) => {
// unexpectedError(err, caseName, 'tempWnd.setSystemBarEnable([navigation])', done);
// });
// console.log(msgStr + 'tempWnd.setSystemBarEnable([navigation]) success');
// await sleep(1000);
// statusFlag = listenerStatus.pending;
// navigationFlag = listenerStatus.pending;
// if (statusFlag === listenerStatus.pending || navigationFlag === listenerStatus.pending) {
// console.log(msgStr + 'start on !!!!');
// listenerData.on = true;
// listenerData.typeStr = 'systemBarTintChange';
// ohosWindow.on('systemBarTintChange', (systemBarData) => {
// console.log(msgStr + 'tempWnd.on systemBarTintChange, systemBatData : ' + JSON.stringify(systemBarData));
// console.log(msgStr + 'tempWnd.on , statusFlag : ' + JSON.stringify(statusFlag));
// console.log(msgStr + 'tempWnd.on , listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
// console.log(msgStr + 'tempWnd.on , navigationFlag : ' + JSON.stringify(navigationFlag));
// console.log(msgStr + 'tempWnd.on , listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
//
// setTimeout(() => {
// console.log(msgStr + 'tempWnd.on , 3 statusFlag : ' + JSON.stringify(statusFlag));
// console.log(msgStr + 'tempWnd.on , 3 listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
// console.log(msgStr + 'tempWnd.on , 3 navigationFlag : ' + JSON.stringify(navigationFlag));
// console.log(msgStr + 'tempWnd.on , 3 listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
//
// if (statusFlag === listenerStatus.pending || navigationFlag === listenerStatus.pending) {
// console.log(msgStr + 'systemBarTintChange compare start!');
// expect(!!systemBarData).assertTrue();
// expect(!!systemBarData.regionTint).assertTrue();
// let arrLength = systemBarData.regionTint.length;
// getData(0, arrLength)
//
// function getData(i, length) {
// let tempData = systemBarData.regionTint[i];
// console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable);
// if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) {
// statusFlag = listenerStatus.finished;
// expect(!tempData.isEnable).assertTrue();
// } else if (tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR && navigationFlag === listenerStatus.pending) {
// navigationFlag = listenerStatus.finished;
// expect(tempData.isEnable).assertTrue();
// }
// if (++i <setWindowTypeTest1 length) {
// getData(i, length)
// console.log(msgStr + 'jixuzhixing i: ' + i);
// } else {
// console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
// }
// }
// ohosWindow.off('systemBarTintChange');
// }
// done();
// }, 3000)
// })
// }
//
//
// await tempWnd.setSystemBarEnable(['status']).catch((err) => {
// unexpectedError(err, caseName, 'tempWnd.setSystemBarEnable([status])', done);
// });
// console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success');
// console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, statusFlag : ' + JSON.stringify(statusFlag));
// console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
// console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, navigationFlag : ' + JSON.stringify(navigationFlag));
// console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
// })
it('setSystemBarEnableTest1', 0, async function (done) { it('setSystemBarEnableTest1', 0, async function (done) {
let caseName = 'setSystemBarEnableTest1'; let caseName = 'setSystemBarEnableTest1';
let msgStr = 'jsunittest ' + caseName + ' '; let msgStr = 'jsunittest ' + caseName + ' ';
...@@ -499,7 +593,6 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -499,7 +593,6 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, navigationFlag : ' + JSON.stringify(navigationFlag)); console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, navigationFlag : ' + JSON.stringify(navigationFlag));
console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending)); console.log(msgStr + 'tempWnd.setSystemBarEnable([status]) success, listenerStatus.pending : ' + JSON.stringify(listenerStatus.pending));
}) })
/** /**
* @tc.number SUB_WINDOW_SETSYSTEMBARENABLE_JSAPI_002 * @tc.number SUB_WINDOW_SETSYSTEMBARENABLE_JSAPI_002
* @tc.name Test setSystemBarEnableTest2 * @tc.name Test setSystemBarEnableTest2
...@@ -520,7 +613,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -520,7 +613,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!systemBarData).assertTrue(); expect(!!systemBarData).assertTrue();
expect(!!systemBarData.regionTint).assertTrue(); expect(!!systemBarData.regionTint).assertTrue();
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable); console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable);
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) {
...@@ -530,6 +625,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -530,6 +625,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
navigationFlag = listenerStatus.finished; navigationFlag = listenerStatus.finished;
expect(tempData.isEnable).assertTrue(); expect(tempData.isEnable).assertTrue();
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
done(); done();
...@@ -581,7 +682,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -581,7 +682,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!systemBarData).assertTrue(); expect(!!systemBarData).assertTrue();
expect(!!systemBarData.regionTint).assertTrue(); expect(!!systemBarData.regionTint).assertTrue();
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable); console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable);
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) {
...@@ -591,6 +694,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -591,6 +694,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
navigationFlag = listenerStatus.finished; navigationFlag = listenerStatus.finished;
expect(tempData.isEnable).assertTrue(); expect(tempData.isEnable).assertTrue();
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
done(); done();
...@@ -642,7 +751,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -642,7 +751,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!systemBarData).assertTrue(); expect(!!systemBarData).assertTrue();
expect(!!systemBarData.regionTint).assertTrue(); expect(!!systemBarData.regionTint).assertTrue();
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable); console.log(msgStr + 'compare, type: ' + tempData.type + ';isEnable: ' + tempData.isEnable);
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR && statusFlag === listenerStatus.pending) {
...@@ -652,6 +763,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -652,6 +763,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
navigationFlag = listenerStatus.finished; navigationFlag = listenerStatus.finished;
expect(!tempData.isEnable).assertTrue(); expect(!tempData.isEnable).assertTrue();
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
done(); done();
...@@ -738,7 +855,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -738,7 +855,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!systemBarData).assertTrue(); expect(!!systemBarData).assertTrue();
expect(!!systemBarData.regionTint).assertTrue(); expect(!!systemBarData.regionTint).assertTrue();
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
console.log(msgStr + 'systemBarTintChange compare start!'); console.log(msgStr + 'systemBarTintChange compare start!');
...@@ -747,6 +866,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -747,6 +866,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
let contentColorIndex = cloneColorArr.indexOf(tempData.contentColor); let contentColorIndex = cloneColorArr.indexOf(tempData.contentColor);
expect(backgroundIndex === -1).assertTrue(); expect(backgroundIndex === -1).assertTrue();
expect(contentColorIndex === -1).assertTrue(); expect(contentColorIndex === -1).assertTrue();
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
} }
...@@ -773,7 +898,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -773,7 +898,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
await sleep(1000); await sleep(1000);
listenerFlag = listenerStatus.pending; listenerFlag = listenerStatus.pending;
let loopCount = commonRGBColorArr.length; let loopCount = commonRGBColorArr.length;
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
async function getData(i, length) {
let tempColor = commonRGBColorArr[i]; let tempColor = commonRGBColorArr[i];
let systemBarProperties = { let systemBarProperties = {
statusBarColor: tempColor, statusBarColor: tempColor,
...@@ -785,6 +912,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -785,6 +912,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
}; };
tempWnd.setSystemBarProperties(systemBarProperties).then(() => { tempWnd.setSystemBarProperties(systemBarProperties).then(() => {
console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success'); console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success');
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}, (err) => { }, (err) => {
console.log(msgStr + 'tempWnd.setSystemBarProperties failed, err : ' + JSON.stringify(err)); console.log(msgStr + 'tempWnd.setSystemBarProperties failed, err : ' + JSON.stringify(err));
expect(TRUE_FLAG).assertFail(); expect(TRUE_FLAG).assertFail();
...@@ -817,7 +950,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -817,7 +950,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!systemBarData).assertTrue(); expect(!!systemBarData).assertTrue();
expect(!!systemBarData.regionTint).assertTrue(); expect(!!systemBarData.regionTint).assertTrue();
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, arrLength)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR) {
console.log(msgStr + 'systemBarTintChange compare start!'); console.log(msgStr + 'systemBarTintChange compare start!');
...@@ -846,6 +981,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -846,6 +981,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(backgroundIndex !== -1).assertTrue(); expect(backgroundIndex !== -1).assertTrue();
expect(contentColorIndex !== -1).assertTrue(); expect(contentColorIndex !== -1).assertTrue();
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
done(); done();
...@@ -871,7 +1012,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -871,7 +1012,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
await sleep(1000); await sleep(1000);
listenerFlag = listenerStatus.pending; listenerFlag = listenerStatus.pending;
let loopCount = commonNUMBERColorArr.length; let loopCount = commonNUMBERColorArr.length;
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
let tempColor = commonNUMBERColorArr[i]; let tempColor = commonNUMBERColorArr[i];
let systemBarProperties = { let systemBarProperties = {
statusBarColor: tempColor, statusBarColor: tempColor,
...@@ -883,6 +1026,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -883,6 +1026,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
}; };
tempWnd.setSystemBarProperties(systemBarProperties).then(() => { tempWnd.setSystemBarProperties(systemBarProperties).then(() => {
console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success'); console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success');
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}, (err) => { }, (err) => {
console.log(msgStr + 'tempWnd.setSystemBarProperties failed, err : ' + JSON.stringify(err)); console.log(msgStr + 'tempWnd.setSystemBarProperties failed, err : ' + JSON.stringify(err));
expect(TRUE_FLAG).assertFail(); expect(TRUE_FLAG).assertFail();
...@@ -910,7 +1059,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -910,7 +1059,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(!!systemBarData).assertTrue(); expect(!!systemBarData).assertTrue();
expect(!!systemBarData.regionTint).assertTrue(); expect(!!systemBarData.regionTint).assertTrue();
let arrLength = systemBarData.regionTint.length; let arrLength = systemBarData.regionTint.length;
for (let i = 0; i < arrLength; i++) { getData(0, loopCount)
function getData(i, length) {
let tempData = systemBarData.regionTint[i]; let tempData = systemBarData.regionTint[i];
console.log(msgStr + 'i=' + i + ' , ohosWindow.on for=' + JSON.stringify(tempData)); console.log(msgStr + 'i=' + i + ' , ohosWindow.on for=' + JSON.stringify(tempData));
if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) { if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
...@@ -920,6 +1071,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -920,6 +1071,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
let contentColorIndex = cloneColorArr.indexOf(tempData.contentColor); let contentColorIndex = cloneColorArr.indexOf(tempData.contentColor);
expect(backgroundIndex === -1).assertTrue(); expect(backgroundIndex === -1).assertTrue();
expect(contentColorIndex === -1).assertTrue(); expect(contentColorIndex === -1).assertTrue();
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
} }
} }
...@@ -946,7 +1103,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -946,7 +1103,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
await sleep(1000); await sleep(1000);
listenerFlag = listenerStatus.pending; listenerFlag = listenerStatus.pending;
let loopCount = commonKEYColorArr.length; let loopCount = commonKEYColorArr.length;
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
function getData(i, length) {
let tempColor = commonKEYColorArr[i]; let tempColor = commonKEYColorArr[i];
let systemBarProperties = { let systemBarProperties = {
statusBarColor: tempColor, statusBarColor: tempColor,
...@@ -958,6 +1117,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -958,6 +1117,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
}; };
tempWnd.setSystemBarProperties(systemBarProperties).then(() => { tempWnd.setSystemBarProperties(systemBarProperties).then(() => {
console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success'); console.log(msgStr + 'tempWnd.setSystemBarProperties ' + tempColor + ' success');
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}, (err) => { }, (err) => {
console.log(msgStr + 'tempWnd.setSystemBarProperties failed, err : ' + JSON.stringify(err)); console.log(msgStr + 'tempWnd.setSystemBarProperties failed, err : ' + JSON.stringify(err));
expect(TRUE_FLAG).assertFail(); expect(TRUE_FLAG).assertFail();
...@@ -977,7 +1142,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -977,7 +1142,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
console.log(msgStr + 'begin'); console.log(msgStr + 'begin');
let loopCount = systemWindowTypeDicArr.length; let loopCount = systemWindowTypeDicArr.length;
console.log(msgStr + 'loopCount: ' + loopCount); console.log(msgStr + 'loopCount: ' + loopCount);
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
async function getData(i, length) {
let tempType = systemWindowTypeDic[systemWindowTypeDicArr[i]]; let tempType = systemWindowTypeDic[systemWindowTypeDicArr[i]];
let windId = 'createTest1' + i; let windId = 'createTest1' + i;
console.log(msgStr + 'ohosWindow.create ' + tempType + ' start'); console.log(msgStr + 'ohosWindow.create ' + tempType + ' start');
...@@ -987,6 +1154,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -987,6 +1154,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
}); });
console.log(msgStr + 'ohosWindow.create ' + tempType + 'finished, wnd: ' + tempWnd); console.log(msgStr + 'ohosWindow.create ' + tempType + 'finished, wnd: ' + tempWnd);
expect(!!tempWnd).assertTrue(); expect(!!tempWnd).assertTrue();
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
console.log(msgStr + 'done '); console.log(msgStr + 'done ');
done(); done();
...@@ -1003,7 +1176,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1003,7 +1176,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
let loopCount = systemWindowTypeArr.length; let loopCount = systemWindowTypeArr.length;
console.log(msgStr + ' loopCount: ' + loopCount); console.log(msgStr + ' loopCount: ' + loopCount);
let n = 0 let n = 0
for (let i = 0; i < loopCount; i++) { getData(0, loopCount)
async function getData(i, length) {
let tempType = ohosWindow.WindowType.TYPE_SYSTEM_ALERT; let tempType = ohosWindow.WindowType.TYPE_SYSTEM_ALERT;
let windId = 'createTest2' + i; let windId = 'createTest2' + i;
console.log(msgStr + 'ohosWindow.create ' + tempType + ' start'); console.log(msgStr + 'ohosWindow.create ' + tempType + ' start');
...@@ -1041,6 +1216,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1041,6 +1216,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
expect(true).assertFail(); expect(true).assertFail();
} }
} }
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
} }
done(); done();
}) })
...@@ -1101,7 +1282,6 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1101,7 +1282,6 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
let tempWnd = null; let tempWnd = null;
try { try {
await ohosWindow.createWindow(createWindowObj).then((data) => { await ohosWindow.createWindow(createWindowObj).then((data) => {
// await ohosWindow.create(context, wndId, baseType).then((data) => {
tempWnd = data tempWnd = data
console.log(msgStr + 'ohosWindow.create ' + baseWndType + ' , wnd: ' + tempWnd); console.log(msgStr + 'ohosWindow.create ' + baseWndType + ' , wnd: ' + tempWnd);
}).catch((err) => { }).catch((err) => {
...@@ -1262,6 +1442,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1262,6 +1442,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
}); });
expect(!!subWindow).assertTrue(); expect(!!subWindow).assertTrue();
console.log(msgStr + 'windowStage.createSubWindow end subWindow=' + JSON.stringify(subWindow)); console.log(msgStr + 'windowStage.createSubWindow end subWindow=' + JSON.stringify(subWindow));
console.log(msgStr + 'windowStage.createSubWindow end !!subWindow=' + !!subWindow);
done(); done();
}) })
/** /**
...@@ -1419,7 +1600,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1419,7 +1600,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
console.log(msgStr + 'screen.setDensityDpi display.getDefaultDisplay current device' + JSON.stringify(currentDeviceDefault)); console.log(msgStr + 'screen.setDensityDpi display.getDefaultDisplay current device' + JSON.stringify(currentDeviceDefault));
let currentDeviceDefaultDpi = parseInt(currentDeviceDefault.densityDPI) let currentDeviceDefaultDpi = parseInt(currentDeviceDefault.densityDPI)
let dpiItem = [-80, 80, 1000, 160, 0, 320, 188.88, 0, 640, 300, currentDeviceDefaultDpi]; let dpiItem = [-80, 80, 1000, 160, 0, 320, 188.88, 0, 640, 300, currentDeviceDefaultDpi];
for (let i = 0;i < dpiItem.length; i++) { getData(0, dpiItem.length)
async function getData(i, length) {
await sleep(1000); await sleep(1000);
await screens[0].setDensityDpi(dpiItem[i]).then(async () => { await screens[0].setDensityDpi(dpiItem[i]).then(async () => {
console.log(msgStr + 'screen.setDensityDpi success set DPI ' + dpiItem[i]); console.log(msgStr + 'screen.setDensityDpi success set DPI ' + dpiItem[i]);
...@@ -1433,6 +1616,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1433,6 +1616,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
let isEqual = Number(defaultDpi.densityDPI) == dpiItem[i] let isEqual = Number(defaultDpi.densityDPI) == dpiItem[i]
console.log(msgStr + 'same ? ' + isEqual) console.log(msgStr + 'same ? ' + isEqual)
expect(isEqual).assertTrue() expect(isEqual).assertTrue()
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
}).catch(err => { }).catch(err => {
console.log(msgStr + 'screen.setDensityDpi failed set DPI error' + dpiItem[i]); console.log(msgStr + 'screen.setDensityDpi failed set DPI error' + dpiItem[i]);
}); });
...@@ -1458,13 +1647,21 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) ...@@ -1458,13 +1647,21 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
let orientationItem = ['UNSPECIFIED', 'PORTRAIT', 'LANDSCAPE', 'PORTRAIT_INVERTED', let orientationItem = ['UNSPECIFIED', 'PORTRAIT', 'LANDSCAPE', 'PORTRAIT_INVERTED',
'LANDSCAPE_INVERTED', 'AUTO_ROTATION', 'AUTO_ROTATION_PORTRAIT', 'AUTO_ROTATION_LANDSCAPE', 'LANDSCAPE_INVERTED', 'AUTO_ROTATION', 'AUTO_ROTATION_PORTRAIT', 'AUTO_ROTATION_LANDSCAPE',
'AUTO_ROTATION_RESTRICTED', 'AUTO_ROTATION_PORTRAIT_RESTRICTED', 'AUTO_ROTATION_LANDSCAPE_RESTRICTED', 'LOCKED', 'UNSPECIFIED']; 'AUTO_ROTATION_RESTRICTED', 'AUTO_ROTATION_PORTRAIT_RESTRICTED', 'AUTO_ROTATION_LANDSCAPE_RESTRICTED', 'LOCKED', 'UNSPECIFIED'];
for (let i = 0;i < orientationItem.length; i++) { getData(0, orientationItem.length)
async function getData(i, length) {
await sleep(1000); await sleep(1000);
let orientation = ohosWindow.Orientation[orientationItem[i]] let orientation = ohosWindow.Orientation[orientationItem[i]]
console.log(msgStr + 'i : ' + i + ' ,orientation : ' + orientation); console.log(msgStr + 'i : ' + i + ' ,orientation : ' + orientation);
console.log(msgStr + 'i : ' + i + ' ,ohosWindow.Orientation : ' + JSON.stringify(ohosWindow.Orientation)); console.log(msgStr + 'i : ' + i + ' ,ohosWindow.Orientation : ' + JSON.stringify(ohosWindow.Orientation));
await mainWin.setPreferredOrientation(orientation).then(() => { await mainWin.setPreferredOrientation(orientation).then(() => {
console.log(msgStr + 'success set window.setPreferredOrientation : ' + orientation); console.log(msgStr + 'success set window.setPreferredOrientation : ' + orientation);
if (++i < length) {
getData(i, length)
console.log(msgStr + 'jixuzhixing i: ' + i);
} else {
console.log(msgStr + 'i++<length i: ' + i + ' ,length:' + length);
}
num++ num++
if(num == orientationItem.length) done(); if(num == orientationItem.length) done();
}).catch(err => { }).catch(err => {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或