Skip to content

X
Xts Acts

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

通知 9
Star 22
Fork 0
X
Xts Acts
提交 80b729de 编写于 作者: C caiminggang
浏览文件
操作

xts编译问题修复 

Signed-off-by: Ncaiminggang <caiminggang1@huawei.com>
上级 4625cc87
隐藏空白更改
内联 并排
Showing with 92 addition and 93 deletion
customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts
浏览文件 @ 80b729de
...@@ -16,7 +16,6 @@ export default class MainAbility extends Ability { ...@@ -16,7 +16,6 @@ export default class MainAbility extends Ability {
// Main window is created, set main page for this ability // Main window is created, set main page for this ability
console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage)
globalThis.windowStage = windowStage globalThis.windowStage = windowStage
globalThis.abilityStorage = this.storage
globalThis.abilityContext = this.context globalThis.abilityContext = this.context
windowStage.setUIContent(this.context, "pages/index/index", null) windowStage.setUIContent(this.context, "pages/index/index", null)
} }
......
customization/edm_xts_stage/entry/src/main/ets/pages/index/index.ets
浏览文件 @ 80b729de
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
*/ */
import file from '@system.file'; import file from '@system.file';
import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets" import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
import testsuite from "../../test/List.test.ets" import testsuite from "../../test/List.test.ets"
......
customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets
浏览文件 @ 80b729de
...@@ -23,87 +23,87 @@ import enterpriseDeviceManager from '@ohos.enterpriseDeviceManager' ...@@ -23,87 +23,87 @@ import enterpriseDeviceManager from '@ohos.enterpriseDeviceManager'
export default function edmCallbackTest() { export default function edmCallbackTest() {
describe('edmCallback_test', function () { describe('edmCallback_test', function () {
/** // /**
* @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0001 // * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0001
* @tc.name test enableAdmin method in callback mode without user id // * @tc.name test enableAdmin method in callback mode without user id
* @tc.desc enable admin in callback mode // * @tc.desc enable admin in callback mode
*/ // */
it('enableAdmin_test_002', 0, async function (done) { // it('enableAdmin_test_002', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, // var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent); // enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { // async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); // console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
expect(datainfo).assertTrue(); // expect(datainfo).assertTrue();
var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); // var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); // console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
expect(isEnabled).assertTrue(); // expect(isEnabled).assertTrue();
retValue = await enterpriseDeviceManager.disableAdmin(WANT1); // retValue = await enterpriseDeviceManager.disableAdmin(WANT1);
console.log('enterpriseDeviceManager.disableAdmin : ' + retValue); // console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
expect(retValue).assertTrue(); // expect(retValue).assertTrue();
isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); // isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); // console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
expect(isEnabled).assertFalse(); // expect(isEnabled).assertFalse();
done(); // done();
} // }
}) // })
/** // /**
* @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0004 // * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0004
* @tc.name test enableAdmin method in callback mode with ADMIN_TYPE_SUPER param without user id // * @tc.name test enableAdmin method in callback mode with ADMIN_TYPE_SUPER param without user id
* @tc.desc enable super admin in callback mode // * @tc.desc enable super admin in callback mode
*/ // */
it('enableAdmin_test_004', 0, async function (done) { // it('enableAdmin_test_004', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, // var retValue = await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, OnReceiveEvent); // enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { // async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin : ' + retValue); // console.log('enterpriseDeviceManager.enableAdmin : ' + retValue);
expect(datainfo).assertTrue(); // expect(datainfo).assertTrue();
var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); // var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME);
console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled); // console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled);
expect(isEnabled).assertTrue(); // expect(isEnabled).assertTrue();
retValue = await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); // retValue = await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME);
console.log('enterpriseDeviceManager.disableSuperAdmin : ' + retValue); // console.log('enterpriseDeviceManager.disableSuperAdmin : ' + retValue);
expect(retValue).assertTrue(); // expect(retValue).assertTrue();
isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); // isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME);
console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled); // console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled);
expect(isEnabled).assertFalse(); // expect(isEnabled).assertFalse();
done(); // done();
} // }
}) // })
/** // /**
* @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0006 // * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0006
* @tc.name test enableAdmin method in callback mode without user id // * @tc.name test enableAdmin method in callback mode without user id
* @tc.desc enable admin in callback mode // * @tc.desc enable admin in callback mode
*/ // */
it('enableAdmin_test_006', 0, async function (done) { // it('enableAdmin_test_006', 0, async function (done) {
console.log(' enableAdmin()'); // console.log(' enableAdmin()');
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, // var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent); // enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { // async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); // console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
expect(datainfo).assertTrue(); // expect(datainfo).assertTrue();
var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); // var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); // console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
expect(isEnabled).assertTrue(); // expect(isEnabled).assertTrue();
retValue = await enterpriseDeviceManager.disableAdmin(WANT1); // retValue = await enterpriseDeviceManager.disableAdmin(WANT1);
console.log('enterpriseDeviceManager.disableAdmin : ' + retValue); // console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
expect(retValue).assertTrue(); // expect(retValue).assertTrue();
isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); // isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); // console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
expect(isEnabled).assertFalse(); // expect(isEnabled).assertFalse();
done(); // done();
} // }
}) // })
/** /**
* @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0008 * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0008
...@@ -111,7 +111,7 @@ export default function edmCallbackTest() { ...@@ -111,7 +111,7 @@ export default function edmCallbackTest() {
* @tc.desc enable admin in multi-user * @tc.desc enable admin in multi-user
*/ */
it('enableAdmin_test_008', 0, async function (done) { it('enableAdmin_test_008', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent); enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
...@@ -121,7 +121,7 @@ export default function edmCallbackTest() { ...@@ -121,7 +121,7 @@ export default function edmCallbackTest() {
console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
expect(isEnabled).assertTrue(); expect(isEnabled).assertTrue();
retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
console.log('enterpriseDeviceManager.disableAdmin : ' + retValue); console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
expect(retValue).assertTrue(); expect(retValue).assertTrue();
...@@ -138,7 +138,7 @@ export default function edmCallbackTest() { ...@@ -138,7 +138,7 @@ export default function edmCallbackTest() {
* @tc.desc enable admin in multi-user * @tc.desc enable admin in multi-user
*/ */
it('enableAdmin_test_012', 0, async function (done) { it('enableAdmin_test_012', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent); enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
...@@ -148,7 +148,7 @@ export default function edmCallbackTest() { ...@@ -148,7 +148,7 @@ export default function edmCallbackTest() {
console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
expect(isEnabled).assertTrue(); expect(isEnabled).assertTrue();
retValue = await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID); var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID);
console.log('enterpriseDeviceManager.disableAdmin : ' + retValue); console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
expect(retValue).assertTrue(); expect(retValue).assertTrue();
...@@ -165,7 +165,7 @@ export default function edmCallbackTest() { ...@@ -165,7 +165,7 @@ export default function edmCallbackTest() {
* @tc.desc enable admin in multi-user * @tc.desc enable admin in multi-user
*/ */
it('enableAdmin_test_013', 0, async function (done) { it('enableAdmin_test_013', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent); enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
...@@ -175,7 +175,7 @@ export default function edmCallbackTest() { ...@@ -175,7 +175,7 @@ export default function edmCallbackTest() {
console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
expect(isEnabled).assertFalse(); expect(isEnabled).assertFalse();
retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
console.log('enterpriseDeviceManager.disableAdmin : ' + retValue); console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
expect(retValue).assertTrue(); expect(retValue).assertTrue();
...@@ -192,7 +192,7 @@ export default function edmCallbackTest() { ...@@ -192,7 +192,7 @@ export default function edmCallbackTest() {
* @tc.desc enable and disable admin in multi-user * @tc.desc enable and disable admin in multi-user
*/ */
it('enableAdmin_test_014', 0, async function (done) { it('enableAdmin_test_014', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent); enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
...@@ -203,7 +203,7 @@ export default function edmCallbackTest() { ...@@ -203,7 +203,7 @@ export default function edmCallbackTest() {
expect(isEnabled).assertTrue(); expect(isEnabled).assertTrue();
try { try {
retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
console.log('enterpriseDeviceManager.disableAdmin over'); console.log('enterpriseDeviceManager.disableAdmin over');
} catch (error) { } catch (error) {
expect(error != null).assertTrue(); expect(error != null).assertTrue();
...@@ -239,7 +239,7 @@ export default function edmCallbackTest() { ...@@ -239,7 +239,7 @@ export default function edmCallbackTest() {
expect(isEnabled).assertTrue(); expect(isEnabled).assertTrue();
console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
retValue = await enterpriseDeviceManager.setEnterpriseInfo(SELFWANT, ENTINFO2, OnReceiveEvent); await enterpriseDeviceManager.setEnterpriseInfo(SELFWANT, ENTINFO2, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.setEnterpriseInfo : ' + datainfo); console.log('enterpriseDeviceManager.setEnterpriseInfo : ' + datainfo);
expect(datainfo).assertTrue(); expect(datainfo).assertTrue();
......
customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets
浏览文件 @ 80b729de
...@@ -194,7 +194,7 @@ export default function edmPromiseTest() { ...@@ -194,7 +194,7 @@ export default function edmPromiseTest() {
it('enableAdmin_test_015', 0, async function (done) { it('enableAdmin_test_015', 0, async function (done) {
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID);
var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent); enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent);
async function OnReceiveEvent(err, datainfo) { async function OnReceiveEvent(err, datainfo) {
console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo); console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或