提交 8b0ce0a2 编写于 作者: Z zhoujun62

solve three xts fail problem

Signed-off-by: Nzhoujun62 <zhoujun62@huawei.com>
上级 4f7b6898
...@@ -345,14 +345,6 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -345,14 +345,6 @@ describe('ActsDataAbilityHelperTest', function () {
console.log('Insert_0700 DAHelper ====<: ' + JSON.stringify(DAHelper) + "," + DAHelper) console.log('Insert_0700 DAHelper ====<: ' + JSON.stringify(DAHelper) + "," + DAHelper)
var currentAlertTimeout; var currentAlertTimeout;
try { try {
function onAsyncCallbackInsert0700(err) {
clearTimeout(currentAlertTimeout);
expect(err.code).assertEqual(0);
console.log('ACTS_Insert_0700====<onAsyncCallbackInsert0700');
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallbackInsert0700);
done();
}
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallbackInsert0700);
DAHelper.insert(dataAbilityUri, valueBucket) DAHelper.insert(dataAbilityUri, valueBucket)
.then((data) => { .then((data) => {
console.debug("=ACTS_Insert_0700 then data====>" console.debug("=ACTS_Insert_0700 then data====>"
...@@ -389,14 +381,6 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -389,14 +381,6 @@ describe('ActsDataAbilityHelperTest', function () {
console.log('featureAbility getDataAbilityHelper ====>: ' + DAHelper) console.log('featureAbility getDataAbilityHelper ====>: ' + DAHelper)
var currentAlertTimeout; var currentAlertTimeout;
try { try {
function onAsyncCallbackInsert0800(err) {
clearTimeout(currentAlertTimeout);
expect(err.code).assertEqual(0);
console.log('ACTS_Insert_0800====<onAsyncCallbackInsert0800');
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallbackInsert0800);
done();
}
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallbackInsert0800);
await DAHelper.insert(dataAbilityUri, valueBucket, await DAHelper.insert(dataAbilityUri, valueBucket,
(err, data) => { (err, data) => {
console.debug("=ACTS_Insert_0800 err,data=======>" console.debug("=ACTS_Insert_0800 err,data=======>"
...@@ -1909,15 +1893,6 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -1909,15 +1893,6 @@ describe('ActsDataAbilityHelperTest', function () {
console.log('featureAbility Update getDataAbilityHelper ====>: ' + DAHelper) console.log('featureAbility Update getDataAbilityHelper ====>: ' + DAHelper)
var currentAlertTimeout; var currentAlertTimeout;
try { try {
function onAsyncCallbackUpdate0700(err) {
expect(err.code).assertEqual(0);
clearTimeout(currentAlertTimeout);
console.log('ACTS_Update_0700====<onAsyncCallbackUpdate0700');
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallbackUpdate0700);
console.log('ACTS_Update_0700====<end');
done();
}
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallbackUpdate0700);
let predicates = new ohosDataAbility.DataAbilityPredicates(); let predicates = new ohosDataAbility.DataAbilityPredicates();
predicates.equalTo('contact_id', 1); predicates.equalTo('contact_id', 1);
predicates.limitAs(10); predicates.limitAs(10);
...@@ -1963,15 +1938,6 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -1963,15 +1938,6 @@ describe('ActsDataAbilityHelperTest', function () {
console.log('featureAbility Update getDataAbilityHelper ====>: ' + DAHelper) console.log('featureAbility Update getDataAbilityHelper ====>: ' + DAHelper)
var currentAlertTimeout; var currentAlertTimeout;
try { try {
function onAsyncCallbackUpdate0800(err) {
expect(err.code).assertEqual(0);
clearTimeout(currentAlertTimeout);
console.log('ACTS_Update_0800====<onAsyncCallbackUpdate0800');
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallbackUpdate0800);
console.log('ACTS_Update_0800====<end');
done();
}
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallbackUpdate0800);
let predicates = new ohosDataAbility.DataAbilityPredicates(); let predicates = new ohosDataAbility.DataAbilityPredicates();
predicates.equalTo('contact_id', 1); predicates.equalTo('contact_id', 1);
predicates.limitAs(10); predicates.limitAs(10);
...@@ -2466,15 +2432,6 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -2466,15 +2432,6 @@ describe('ActsDataAbilityHelperTest', function () {
console.log('ACTS_Delete_0700====<begin'); console.log('ACTS_Delete_0700====<begin');
var currentAlertTimeout; var currentAlertTimeout;
try { try {
function onAsyncCallbackDelete0700(err) {
expect(err.code).assertEqual(0);
clearTimeout(currentAlertTimeout);
console.log('ACTS_Delete_0700====<onAsyncCallbackDelete0700');
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallbackDelete0700);
console.log('ACTS_Delete_0700====<end');
done();
}
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallbackDelete0700);
let predicates = new ohosDataAbility.DataAbilityPredicates(); let predicates = new ohosDataAbility.DataAbilityPredicates();
predicates.equalTo('contact_id', 1); predicates.equalTo('contact_id', 1);
predicates.limitAs(10); predicates.limitAs(10);
...@@ -2519,15 +2476,6 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -2519,15 +2476,6 @@ describe('ActsDataAbilityHelperTest', function () {
console.log('featureAbility getDataAbilityHelper ====>: ' + DAHelper) console.log('featureAbility getDataAbilityHelper ====>: ' + DAHelper)
var currentAlertTimeout; var currentAlertTimeout;
try { try {
function onAsyncCallbackDelete0800(err) {
expect(err.code).assertEqual(0);
clearTimeout(currentAlertTimeout);
console.log('ACTS_Delete_0800====<onAsyncCallbackDelete0800');
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallbackDelete0800);
console.log('ACTS_Delete_0800====<end');
done();
}
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallbackDelete0800);
let predicates = new ohosDataAbility.DataAbilityPredicates(); let predicates = new ohosDataAbility.DataAbilityPredicates();
predicates.equalTo('contact_id', 1); predicates.equalTo('contact_id', 1);
predicates.limitAs(10); predicates.limitAs(10);
...@@ -5087,6 +5035,7 @@ describe('ActsDataAbilityHelperTest', function () { ...@@ -5087,6 +5035,7 @@ describe('ActsDataAbilityHelperTest', function () {
gSetTimeout = 500; gSetTimeout = 500;
done(); done();
} }
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallback0100);
DAHelper.on("dataChange", dataAbilityUri, onAsyncCallback0100); DAHelper.on("dataChange", dataAbilityUri, onAsyncCallback0100);
setTimeout(mySetTimeout, gSetTimeout); setTimeout(mySetTimeout, gSetTimeout);
......
...@@ -156,8 +156,7 @@ export default function abilityTest() { ...@@ -156,8 +156,7 @@ export default function abilityTest() {
expect(listKeyTemp[0]).assertEqual("Hap2MainAbility4 onWindowStageCreate"); expect(listKeyTemp[0]).assertEqual("Hap2MainAbility4 onWindowStageCreate");
expect(listKeyTemp[1]).assertEqual("Hap2MainAbility4 onWindowStageActive"); expect(listKeyTemp[1]).assertEqual("Hap2MainAbility4 onWindowStageActive");
expect(listKeyTemp[2]).assertEqual("Hap2MainAbility4 onWindowStageInactive"); expect(listKeyTemp[2]).assertEqual("Hap2MainAbility4 onWindowStageInactive");
expect(listKeyTemp[3]).assertEqual("Hap2MainAbility4 onWindowStageInactive"); expect(listKeyTemp[3]).assertEqual("Hap2MainAbility4 onWindowStageDestroy");
expect(listKeyTemp[4]).assertEqual("Hap2MainAbility4 onWindowStageDestroy");
globalThis.ApplicationContext4 globalThis.ApplicationContext4
.unregisterAbilityLifecycleCallback(globalThis.mainAbility4CallBackId, (error, data) => { .unregisterAbilityLifecycleCallback(globalThis.mainAbility4CallBackId, (error, data) => {
console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) + console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) +
......
...@@ -428,7 +428,7 @@ export default function lifecycleTest() { ...@@ -428,7 +428,7 @@ export default function lifecycleTest() {
console.log("------------Singlehap_WindowStageLifeCycleTest_0500 END-------------"); console.log("------------Singlehap_WindowStageLifeCycleTest_0500 END-------------");
done(); done();
}) })
}, 4200); }, 3800);
}); });
/* /*
...@@ -713,8 +713,7 @@ export default function lifecycleTest() { ...@@ -713,8 +713,7 @@ export default function lifecycleTest() {
expect(listKeyTemp[0]).assertEqual("Hap1MainAbility1 onWindowStageCreate"); expect(listKeyTemp[0]).assertEqual("Hap1MainAbility1 onWindowStageCreate");
expect(listKeyTemp[1]).assertEqual("Hap1MainAbility1 onWindowStageActive"); expect(listKeyTemp[1]).assertEqual("Hap1MainAbility1 onWindowStageActive");
expect(listKeyTemp[2]).assertEqual("Hap1MainAbility1 onWindowStageInactive"); expect(listKeyTemp[2]).assertEqual("Hap1MainAbility1 onWindowStageInactive");
expect(listKeyTemp[3]).assertEqual("Hap1MainAbility1 onWindowStageInactive"); expect(listKeyTemp[3]).assertEqual("Hap1MainAbility1 onWindowStageDestroy");
expect(listKeyTemp[4]).assertEqual("Hap1MainAbility1 onWindowStageDestroy");
globalThis.applicationContext9 globalThis.applicationContext9
.unregisterAbilityLifecycleCallback(globalThis.mainAbility9CallBackId, (error, data) => { .unregisterAbilityLifecycleCallback(globalThis.mainAbility9CallBackId, (error, data) => {
console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) + console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) +
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册