Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
11 个月 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

体验新版 GitCode，发现更多精彩内容 >>

提交 2079a5a6 编写于 作者: L liangzhenyu123
浏览文件
操作

用例运行时序优化 

Signed-off-by: Nliangzhenyu123 <liangzhenyu6@huawei.com>
上级 d7bcd4d0
隐藏空白更改
内联 并排
Showing with 185 addition and 192 deletion
distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreBackupRestoreCallbackJsunit.test.js
浏览文件 @ 2079a5a6
......@@ -134,7 +134,7 @@ export default function rdbStoreBackupRestoreCallbackTest() {
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0100 start *************")
// RDB backup function test
await RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => {
await RdbStore.backup(DATABASE_BACKUP_NAME,async (err, data) => {
if(err != null){
expect(false).assertTrue()
}else{
......@@ -145,52 +145,52 @@ export default function rdbStoreBackupRestoreCallbackTest() {
expect(false).assertTrue()
}
}
})
// RDB before restored, delete data
let deleteData = new dataRdb.RdbPredicates("backupTest")
deleteData.equalTo("name", "zhangsan")
await RdbStore.delete(deleteData)
// RDB restore function test
await RdbStore.restore(DATABASE_BACKUP_NAME, async (err, data) => {
if(err != null){
expect(false).assertTrue()
}else{
try {
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
expect(false).assertTrue()
} catch (err) {
expect(true).assertTrue()
}
try {
fileio.accessSync(DATABASE_DIR + STORE_CONFIG.name)
} catch (err) {
expect(false).assertTrue()
}
let predicates = new dataRdb.RdbPredicates("backupTest")
predicates.equalTo("name", "zhangsan")
let resultSet = await RdbStore.query(predicates)
try {
console.info(TAG + "After restore resultSet query done")
expect(true).assertEqual(resultSet.goToFirstRow())
const id = resultSet.getLong(resultSet.getColumnIndex("id"))
const name = resultSet.getString(resultSet.getColumnIndex("name"))
const blobType = resultSet.getBlob(resultSet.getColumnIndex("blobType"))
expect(1).assertEqual(id)
expect("zhangsan").assertEqual(name)
expect(1).assertEqual(blobType[0])
} catch (err) {
console.info(TAG + 'RdbBackupRestoreTest_0010 accessSync err4: ' + err)
expect(false).assertTrue()
}
resultSet = null
RdbStore = null
}
// RDB before restored, delete data
let deleteData = new dataRdb.RdbPredicates("backupTest")
deleteData.equalTo("name", "zhangsan")
RdbStore.delete(deleteData).then(()=> {
RdbStore.restore(DATABASE_BACKUP_NAME, async (err, data) => {
if(err != null){
expect(false).assertTrue()
}else{
try {
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
expect(false).assertTrue()
} catch (err) {
expect(true).assertTrue()
}
try {
fileio.accessSync(DATABASE_DIR + STORE_CONFIG.name)
} catch (err) {
expect(false).assertTrue()
}
let predicates = new dataRdb.RdbPredicates("backupTest")
predicates.equalTo("name", "zhangsan")
let resultSet = await RdbStore.query(predicates)
try {
console.info(TAG + "After restore resultSet query done")
expect(true).assertEqual(resultSet.goToFirstRow())
const id = resultSet.getLong(resultSet.getColumnIndex("id"))
const name = resultSet.getString(resultSet.getColumnIndex("name"))
const blobType = resultSet.getBlob(resultSet.getColumnIndex("blobType"))
expect(1).assertEqual(id)
expect("zhangsan").assertEqual(name)
expect(1).assertEqual(blobType[0])
} catch (err) {
console.info(TAG + 'RdbBackupRestoreTest_0010 accessSync err4: ' + err)
expect(false).assertTrue()
}
resultSet = null
RdbStore = null
}
done()
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0100 end *************")
})
})
})
done()
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0100 end *************")
})
/**
......@@ -262,7 +262,7 @@ export default function rdbStoreBackupRestoreCallbackTest() {
// RDB restore function test, backup file
RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => {
if(err != null){
expect(false).assertTrue(0)
expect(false).assertTrue()
}else{
try{
console.info(TAG + 'Backup database success')
......@@ -279,17 +279,18 @@ export default function rdbStoreBackupRestoreCallbackTest() {
}
RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => {
if(err != null){
expect(false).assertTrue(0)
console.info(`${TAG} Backup database second failed, error: message: ${err.message}`)
expect(true).assertTrue()
done();
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0500 end *************")
}else{
try{
console.info(TAG + 'Backup database success')
console.info(TAG + 'Backup database second success')
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
expect(false).assertTrue();
}
}
done()
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0500 end *************")
})
})
}
......@@ -333,22 +334,23 @@ export default function rdbStoreBackupRestoreCallbackTest() {
*/
it('RdbBackupRestoreCallbackTest_0700', 0, async function (done) {
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0700 start *************")
RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => {
let DATABASE_BACKUP_TEST_NAME = "BackupTest.db"
RdbStore.backup(DATABASE_BACKUP_TEST_NAME, (err, data) => {
if(err != null){
expect(false).assertTrue()
}else{
expect(true).assertTrue()
}
})
await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME).then(() => {
await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_TEST_NAME).then(() => {
try{
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_TEST_NAME)
}catch(err){
expect(true).assertTrue();
}
})
RdbStore.restore(DATABASE_BACKUP_NAME, (err, data) => {
RdbStore.restore(DATABASE_BACKUP_TEST_NAME, (err, data) => {
if(err != null){
expect(true).assertTrue()
}
......
distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreBackupRestoreWithFAContextJsunit.test.js
浏览文件 @ 2079a5a6
......@@ -132,65 +132,73 @@ describe('rdbStoreBackupRestorePromiseTest', function () {
console.info(TAG + "************* RdbBackupRestoreTest_0010 start *************")
// RDB backup function test
let promiseBackup = RdbStore.backup(DATABASE_BACKUP_NAME)
promiseBackup.then(() => {
RdbStore.backup(DATABASE_BACKUP_NAME).then(async() => {
try {
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
fileio.accessSync(DATABASE_DIR + STORE_CONFIG.name)
} catch (err) {
console.info("RdbBackupRestoreTest_0010 backup success")
expect(false).assertTrue()
}
}).catch((err) => {
expect(false).assertTrue()
})
await promiseBackup
// RDB before restored, delete data
let deleteData = new dataRdb.RdbPredicates("test")
deleteData.equalTo("name", "zhangsan")
await RdbStore.delete(deleteData)
// RDB before restored, delete data
let deleteData = new dataRdb.RdbPredicates("test")
deleteData.equalTo("name", "zhangsan")
await RdbStore.delete(deleteData)
// RDB restore function test
let promiseRestore = RdbStore.restore(DATABASE_BACKUP_NAME)
promiseRestore.then(() => {
try {
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
expect(false).assertTrue()
} catch (err) {
expect(true).assertTrue()
}
RdbStore.restore(DATABASE_BACKUP_NAME).then(async () => {
try {
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
expect(false).assertTrue()
} catch (err) {
console.info("RdbBackupRestoreTest_0010 restore success")
expect(true).assertTrue()
}
try {
fileio.accessSync(DATABASE_DIR + STORE_CONFIG.name)
} catch (err) {
try {
fileio.accessSync(DATABASE_DIR + STORE_CONFIG.name)
} catch (err) {
console.info("RdbBackupRestoreTest_0010 restore success2")
expect(false).assertTrue()
}
// RDB after restored, data query test
let predicates = new dataRdb.RdbPredicates("test")
predicates.equalTo("name", "zhangsan")
RdbStore.query(predicates).then((resultSet)=>{
try {
console.info(TAG + "After restore resultSet query done")
resultSet.goToFirstRow();
expect(true).assertEqual(resultSet.goToFirstRow())
console.info("RdbBackupRestoreTest_0010 goto first row success")
const id = resultSet.getLong(resultSet.getColumnIndex("id"))
console.info("RdbBackupRestoreTest_0010 get dolumnindex id success")
const name = resultSet.getString(resultSet.getColumnIndex("name"))
console.info("RdbBackupRestoreTest_0010 get dolumnindex name success")
const blobType = resultSet.getBlob(resultSet.getColumnIndex("blobType"))
console.info(`RdbBackupRestoreTest_0010 id is ${id},name id ${name},blobType is ${blobType[0]}`)
expect(1).assertEqual(id)
expect("zhangsan").assertEqual(name)
expect(1).assertEqual(blobType[0])
} catch (err) {
console.info(TAG + 'RdbBackupRestoreTest_0010 accessSync err4: ' + err)
expect(false).assertTrue()
}
resultSet = null
RdbStore = null
done()
console.info(TAG + "************* RdbBackupRestoreTest_0010 end *************")
})
}).catch((err) => {
console.info("RdbBackupRestoreTest_0010 restore error: " + err)
expect(false).assertTrue()
}
})
}).catch((err) => {
expect(false).assertTrue()
})
await promiseRestore
// RDB after restored, data query test
let predicates = new dataRdb.RdbPredicates("test")
predicates.equalTo("name", "zhangsan")
let resultSet = await RdbStore.query(predicates)
try {
console.info(TAG + "After restore resultSet query done")
expect(true).assertEqual(resultSet.goToFirstRow())
const id = resultSet.getLong(resultSet.getColumnIndex("id"))
const name = resultSet.getString(resultSet.getColumnIndex("name"))
const blobType = resultSet.getBlob(resultSet.getColumnIndex("blobType"))
expect(1).assertEqual(id)
expect("zhangsan").assertEqual(name)
expect(1).assertEqual(blobType[0])
} catch (err) {
console.info(TAG + 'RdbBackupRestoreTest_0010 accessSync err4: ' + err)
expect(false).assertTrue()
}
resultSet = null
RdbStore = null
done()
console.info(TAG + "************* RdbBackupRestoreTest_0010 end *************")
})
/**
......@@ -298,24 +306,16 @@ describe('rdbStoreBackupRestorePromiseTest', function () {
*/
it('RdbBackupRestoreTest_0060', 0, async function (done) {
console.info(TAG + "************* RdbBackupRestoreTest_0060 start *************")
// Backup file is specified to database name
await RdbStore.backup(STORE_CONFIG.name).then(() => {
console.info(TAG + 'Backup database finish')
RdbStore.backup(STORE_CONFIG.name).then(() => {
console.info(TAG + 'Backup database finish');
expect(false).assertTrue() ;
}).catch((err) => {
expect(true).assertTrue()
})
// Backup file is specified to database name again
await RdbStore.backup(STORE_CONFIG.name).then(() => {
console.info(TAG + 'Backup database finish')
}).catch((err) => {
expect(true).assertTrue();
console.info(TAG + "Backup database error");
expect(true).assertTrue() ;
done();
})
done();
console.info(TAG + "************* RdbBackupRestoreTest_0060 end *************")
})
/**
* @tc.name RDB BackupRestore test
* @tc.number SUB_DDM_RDB_JS_RdbBackupRestoreTest_0070
......@@ -324,13 +324,12 @@ describe('rdbStoreBackupRestorePromiseTest', function () {
it('RdbBackupRestoreTest_0070', 0, async function (done) {
console.info(TAG + "************* RdbBackupRestoreTest_0070 start *************")
await RdbStore.backup(DATABASE_BACKUP_NAME)
await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME).then(() => {
try{
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
expect(true).assertTrue();
}
})
await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME)
try{
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
expect(true).assertTrue();
}
await RdbStore.restore(DATABASE_BACKUP_NAME).catch((err) => {
console.info(TAG + 'Restore fail: ' + err)
expect(true).assertTrue();
......
distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreDeleteJsunit.test.js
浏览文件 @ 2079a5a6
......@@ -85,18 +85,16 @@ describe('rdbStoreDeleteTest', function () {
}
//删除
{
let predicates = await new dataRdb.RdbPredicates('test')
let deletePromise = rdbStore.delete(predicates)
deletePromise.then(async (ret) => {
let predicates = new dataRdb.RdbPredicates('test')
rdbStore.delete(predicates).then(async (ret) => {
expect(3).assertEqual(ret)
console.info(TAG + 'Delete done: ' + ret)
done()
console.info(TAG + '************* testRdbStoreDelete0001 end *************');
}).catch((err) => {
expect(null).assertFail()
})
await deletePromise
}
done()
console.info(TAG + '************* testRdbStoreDelete0001 end *************');
})
/**
......@@ -138,17 +136,15 @@ describe('rdbStoreDeleteTest', function () {
{
let predicates = await new dataRdb.RdbPredicates('test')
predicates.equalTo('name', 'zhangsan')
let deletePromise = rdbStore.delete(predicates)
deletePromise.then(async (ret) => {
await expect(1).assertEqual(ret)
await console.info(TAG + 'Delete done: ' + ret)
rdbStore.delete(predicates).then(async (ret) => {
expect(1).assertEqual(ret)
console.info(TAG + 'Delete done: ' + ret)
done()
console.info(TAG + '************* testRdbStoreDelete0002 end *************');
}).catch((err) => {
expect(null).assertFail()
})
await deletePromise
}
done()
console.info(TAG + '************* testRdbStoreDelete0002 end *************');
})
/**
......@@ -185,27 +181,24 @@ describe('rdbStoreDeleteTest', function () {
expect(1).assertEqual(resultSet.rowCount)
}
//删除
{
let predicates = await new dataRdb.RdbPredicates('test')
predicates.equalTo('age', 28)
let deletePromise = rdbStore.delete(predicates)
deletePromise.then(async (ret) => {
expect(1).assertEqual(ret)
console.info(TAG + 'Delete done: ' + ret)
}).catch((err) => {
expect(null).assertFail()
})
await deletePromise
}
//删除后查询
{
let predicates = await new dataRdb.RdbPredicates('test')
predicates.equalTo('age', 28)
rdbStore.delete(predicates).then(async (ret) => {
expect(1).assertEqual(ret)
console.info(TAG + 'Delete done: ' + ret)
//删除后查询
let predicates = await new dataRdb.RdbPredicates('test')
predicates.equalTo('age', 28)
let resultSet = await rdbStore.query(predicates)
expect(0).assertEqual(resultSet.rowCount)
}
done()
console.info(TAG + '************* testRdbStoreDelete0003 end *************');
done()
console.info(TAG + '************* testRdbStoreDelete0003 end *************');
}).catch((err) => {
expect(null).assertFail()
})
})
/**
......@@ -247,16 +240,16 @@ describe('rdbStoreDeleteTest', function () {
{
let predicates = await new dataRdb.RdbPredicates('test')
predicates.equalTo('aaa id', 1)
let deletePromise = rdbStore.delete(predicates)
deletePromise.then(async (ret) => {
rdbStore.delete(predicates).then(async (ret) => {
console.info(TAG + 'delete done: ' + ret)
expect(null).assertFail()
}).catch((err) => {
console.info(TAG + 'delete with wrong conditions')
console.info(TAG + '************* testRdbStoreDelete0004 end *************');
})
}
done()
console.info(TAG + '************* testRdbStoreDelete0004 end *************');
done();
})
/**
......@@ -298,17 +291,16 @@ describe('rdbStoreDeleteTest', function () {
{
let predicates = await new dataRdb.RdbPredicates('test')
predicates.equalTo('name', 'lisi')
let deletePromise = rdbStore.delete(predicates)
deletePromise.then(async (ret) => {
rdbStore.delete(predicates).then(async (ret) => {
expect(2).assertEqual(ret)
console.info(TAG + 'Delete done: ' + ret)
done()
console.info(TAG + '************* testRdbStoreDelete0005 end *************');
}).catch((err) => {
expect(null).assertFail()
})
await deletePromise
}
done()
console.info(TAG + '************* testRdbStoreDelete0005 end *************');
})
/**
......@@ -350,8 +342,7 @@ describe('rdbStoreDeleteTest', function () {
//删除
try{
let predicates = await new dataRdb.RdbPredicates('')
let deletePromise = rdbStore.delete(predicates)
deletePromise.then(async (ret) => {
rdbStore.delete(predicates).then(async (ret) => {
console.info(TAG + 'delete done: ' + ret)
expect(null).assertFail()
}).catch((err) => {
......
distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreRdbstoreJsunit.test.js
浏览文件 @ 2079a5a6
......@@ -105,16 +105,20 @@ describe('rdbStoreTest', function () {
let storeConfig = {
name: "/wrong/rdbstore.db",
}
let storePromise = dataRdb.getRdbStore(storeConfig, 4);
storePromise.then(async (ret) => {
console.info(TAG + "getRdbStore done" + ret);
expect(null).assertFail();
}).catch((err) => {
console.info(TAG + "getRdbStore with wrong path");
})
storePromise = null
done();
console.info(TAG + "************* testRdbStore0003 end *************");
try{
dataRdb.getRdbStore(storeConfig, 4).then(async (ret) => {
console.info(TAG + "getRdbStore done" + ret);
expect(null).assertFail();
}).catch((err) => {
console.info(TAG + "getRdbStore with wrong path");
})
expect(false).assertTrue();
}catch(error){
console.info(TAG + `catch err: failed: err: code= ${error.code}, message = ${error.message}`)
expect(error.code).assertEqual("401")
done();
console.info(TAG + "************* testRdbStore0003 end *************");
}
})
/**
......
distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/RdbstoreRdbstoreV9.test.ets
浏览文件 @ 2079a5a6
......@@ -178,12 +178,12 @@ describe('rdbStoreV9Test', function () {
}else{
console.info(TAG + "create table success")
}
done();
dataRdb.deleteRdbStore(context,"secure.db").then(()=>{
console.info(TAG + "Delete rdbstore success")
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0100 end *************");
})
});
await dataRdb.deleteRdbStore(context,"secure.db");
await sleep(1000)
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0100 end *************");
})
/**
......@@ -205,12 +205,11 @@ describe('rdbStoreV9Test', function () {
}else{
console.info(TAG + "create table success")
}
done();
dataRdb.deleteRdbStore(context, "secure.db").then(() => {
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0200 end *************");
})
});
await dataRdb.deleteRdbStore(context,"secure.db");
await sleep(1000)
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0200 end *************");
})
/**
......@@ -232,12 +231,11 @@ describe('rdbStoreV9Test', function () {
}else{
console.info(TAG + "create table success")
}
done();
dataRdb.deleteRdbStore(context, "secure.db").then(() => {
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0300 end *************");
})
});
await dataRdb.deleteRdbStore(context,"secure.db");
await sleep(1000)
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0300 end *************");
})
/**
......@@ -259,12 +257,11 @@ describe('rdbStoreV9Test', function () {
}else{
console.info(TAG + "get rdb store success")
}
done();
dataRdb.deleteRdbStore(context,"secure.db").then(() => {
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0400 end *************");
})
});
await dataRdb.deleteRdbStore(context,"secure.db");
await sleep(1000)
done();
console.log(TAG + "************* SUB_DDM_RELATIONALETS_GETRDBSTOREV9_CALLBACK_0400 end *************");
})
/**
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或