diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js index 3dcab10ba4e526ec20e35a75c6551baa810219be..c135a068015e46ef01296672b5647d52587b45e7 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js @@ -415,11 +415,15 @@ export default function relationalStoreBackupRestoreCallbackTest() { */ it('RdbBackupRestoreCallbackTest_1200', 0, async function (done) { console.info(TAG + "************* RdbBackupRestoreCallbackTest_1200 start *************") - RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => { - if(err != null){ - expect(false).assertTrue() + await RdbStore.backup(DATABASE_BACKUP_NAME); + await RdbStore.backup(DATABASE_BACKUP_NAME, function(err) { + if(err){ + console.error(TAG + `Restore failed, code is ${err.code},message is ${err.message}`); + expect(err !== undefined).assertFail(); + done(); } - BackupCallbackTest(DATABASE_BACKUP_NAME) + console.info(TAG + `Restore success.`); + expect(err === undefined).assertTrue(); done(); }) console.info(TAG + "************* RdbBackupRestoreCallbackTest_1200 end *************") diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js index fdb253c7bf333a69103366e128a70723fc9ee59e..0347edd64d42f9c7b7223e86ac79dfb5882ff28d 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js @@ -386,8 +386,23 @@ describe('relationalStoreBackupRestorePromiseTest', function () { it('RdbBackupRestoreTest_0120', 0, async function (done) { console.info(TAG + "************* RdbBackupRestoreTest_0120 start *************") await RdbStore.backup(DATABASE_BACKUP_NAME) - await BackupTest(DATABASE_BACKUP_NAME) - done(); + await RdbStore.backup(DATABASE_BACKUP_NAME).then(()=>{ + console.info(TAG + `Backup success.`); + RdbStore.restore(DATABASE_BACKUP_NAME, function(err) { + if (err) { + console.error(TAG + `Restore failed, code is ${err.code},message is ${err.message}`); + expect(err !== undefined).assertFail(); + done(); + } + console.info(TAG + `Restore success.`); + expect(err === undefined).assertTrue(); + done(); + }) + }).catch((err)=>{ + console.error(TAG + `Backup failed, code is ${err.code},message is ${err.message}`); + expect(err !== undefined).assertFail(); + done(); + }); console.info(TAG + "************* RdbBackupRestoreTest_0120 end *************") })