Skip to content

X
Xts Acts

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

通知 9
Star 22
Fork 0
X
Xts Acts
提交 ddad7ec2 编写于 作者: L liangzhenyu123
浏览文件
操作

用例时效问题优化 

Signed-off-by: Nliangzhenyu123 <liangzhenyu6@huawei.com>
上级 7294104c
隐藏空白更改
内联 并排
Showing with 201 addition and 244 deletion
distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreBackupRestoreCallbackJsunit.test.js
浏览文件 @ ddad7ec2
......@@ -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 *************")
})
/**
......@@ -270,31 +270,32 @@ export default function rdbStoreBackupRestoreCallbackTest() {
}catch(err){
expect(false).assertTrue();
}
dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME).then(() => {
try{
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
console.info(TAG + 'error2 ' + err)
expect(true).assertTrue();
}
RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => {
if(err != null){
expect(false).assertTrue(0)
}else{
try{
console.info(TAG + 'Backup database success')
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
expect(false).assertTrue();
}
}
done()
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0500 end *************")
})
})
}
})
await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME).then(() => {
try{
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
console.info(TAG + 'error2 ' + err)
expect(true).assertTrue();
}
})
RdbStore.backup(DATABASE_BACKUP_NAME, (err, data) => {
if(err != null){
expect(false).assertTrue(0)
}else{
try{
console.info(TAG + 'Backup database success')
fileio.accessSync(DATABASE_DIR + DATABASE_BACKUP_NAME)
}catch(err){
expect(false).assertTrue();
}
}
})
done()
console.info(TAG + "************* RdbBackupRestoreCallbackTest_0500 end *************")
})
/**
......
distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreBackupRestoreWithFAContextJsunit.test.js
浏览文件 @ ddad7ec2
......@@ -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 *************")
})
/**
......@@ -324,13 +332,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
浏览文件 @ ddad7ec2
......@@ -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()
})
})
/**
......@@ -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
浏览文件 @ ddad7ec2
......@@ -25,6 +25,9 @@ const CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test (" + "id INTEGER PRIM
const STORE_CONFIG = {
name: "rdbstore.db",
}
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
export default function rdbStoreTest() {
describe('rdbStoreTest', function () {
beforeAll(async function () {
......@@ -54,18 +57,15 @@ describe('rdbStoreTest', function () {
*/
it('testRdbStore0001', 0, async function (done) {
console.info(TAG + "************* testRdbStore0001 start *************");
let storePromise = dataRdb.getRdbStore(STORE_CONFIG, 1);
storePromise.then(async (store) => {
await dataRdb.getRdbStore(STORE_CONFIG, 1).then(async (store) => {
try {
await console.info(TAG + "getRdbStore done: " + store);
console.info(TAG + "getRdbStore done: " + store);
} catch (e) {
expect(null).assertFail();
}
}).catch((err) => {
expect(null).assertFail();
})
await storePromise
storePromise = null
done();
console.info(TAG + "************* testRdbStore0001 end *************");
})
......@@ -80,7 +80,7 @@ describe('rdbStoreTest', function () {
let storePromise = dataRdb.getRdbStore(STORE_CONFIG, 2);
storePromise.then(async (store) => {
try {
await console.info(TAG + "getRdbStore done: " + store);
console.info(TAG + "getRdbStore done: " + store);
await store.executeSql(CREATE_TABLE_TEST);
} catch (e) {
expect(null).assertFail();
......@@ -107,7 +107,7 @@ describe('rdbStoreTest', function () {
}
let storePromise = dataRdb.getRdbStore(storeConfig, 4);
storePromise.then(async (ret) => {
await console.info(TAG + "getRdbStore done" + ret);
console.info(TAG + "getRdbStore done" + ret);
expect(null).assertFail();
}).catch((err) => {
console.info(TAG + "getRdbStore with wrong path");
......@@ -124,22 +124,13 @@ describe('rdbStoreTest', function () {
*/
it('testRdbStore0004', 0, async function (done) {
console.info(TAG + "************* testRdbStore0004 start *************");
let storePromise = dataRdb.getRdbStore(STORE_CONFIG, 1);
storePromise.then(async (store) => {
try {
await store.executeSql(CREATE_TABLE_TEST);
await dataRdb.deleteRdbStore("rdbstore.db").then(()=>{
console.info(TAG + "deleteRdbStore promise done" + store);
expect(true).assertTrue();
})
} catch (e) {
expect(null).assertFail();
}
}).catch((err) => {
try{
let store = await dataRdb.getRdbStore(STORE_CONFIG, 1)
await store.executeSql(CREATE_TABLE_TEST);
await dataRdb.deleteRdbStore("rdbstore.db")
}catch (e) {
expect(null).assertFail();
})
await storePromise
storePromise = null
}
done();
console.info(TAG + "************* testRdbStore0004 end *************");
})
......@@ -151,24 +142,14 @@ describe('rdbStoreTest', function () {
*/
it('testRdbStore0005', 0, async function (done) {
console.info(TAG + "************* testRdbStore0005 start *************");
let storePromise = dataRdb.getRdbStore(STORE_CONFIG, 2);
storePromise.then(async (store) => {
try {
await store.executeSql(CREATE_TABLE_TEST);
let deletePromise = dataRdb.deleteRdbStore("rdbstore.db")
deletePromise.then(()=>{
console.info(TAG + "deleteRdbStore promise done" + store);
expect(true).assertTrue();
})
} catch (e) {
expect(null).assertFail();
}
}).catch((err) => {
try {
let store = await dataRdb.getRdbStore(STORE_CONFIG, 2);
console.info(TAG + "Get rdbstore success")
await store.executeSql(CREATE_TABLE_TEST);
await dataRdb.deleteRdbStore("rdbstore.db")
} catch (e) {
expect(null).assertFail();
})
await storePromise
storePromise = null
}
done();
console.info(TAG + "************* testRdbStore0005 end *************");
})
......@@ -185,20 +166,14 @@ describe('rdbStoreTest', function () {
const STORE_CONFIG= {
name: "rdbstorecontext.db",
}
console.info(TAG + "first")
await dataRdb.getRdbStore(context,STORE_CONFIG, 1).then((data) => {
console.info(TAG + "Get rdbstore success")
rdbstore = data;
expect(rdbstore != null).assertTrue();
}).catch((errInfo) => {
console.info(TAG + "Get rdbstore fail " + errInfo)
expect(null).assertFail();
})
rdbstore = await dataRdb.getRdbStore(context,STORE_CONFIG, 1)
console.info(TAG + "Get rdbstore success")
expect(rdbstore != null).assertTrue();
await dataRdb.deleteRdbStore(STORE_CONFIG.name)
}catch(err){
console.info(TAG + "Get rdbstore fail catch err: " + err)
expect(null).assertFail()
}
await dataRdb.deleteRdbStore(STORE_CONFIG.name)
rdbstore = null;
done();
console.info(TAG + "************* testRdbStore0006 end *************");
......@@ -216,20 +191,14 @@ describe('rdbStoreTest', function () {
const STORE_CONFIG = {
name: "rdbstorecontext.db",
}
console.info(TAG + "first")
await dataRdb.getRdbStore(contextApplication,STORE_CONFIG, 1).then((data) => {
console.info(TAG + "Get rdbstore success")
rdbstore = data;
expect(rdbstore != null).assertTrue();
}).catch((errInfo) => {
console.info(TAG + "Get rdbstore fail " + errInfo)
expect(null).assertFail();
})
rdbstore = await dataRdb.getRdbStore(contextApplication,STORE_CONFIG, 1)
console.info(TAG + "Get rdbstore success")
expect(rdbstore != null).assertTrue();
await dataRdb.deleteRdbStore(STORE_CONFIG.name)
}catch(err){
console.info(TAG + "Get rdbstore fail catch err: " + err)
expect(null).assertFail()
}
await dataRdb.deleteRdbStore(STORE_CONFIG.name)
rdbstore = null;
done();
console.info(TAG + "************* testRdbStore0007 end *************");
......@@ -242,20 +211,15 @@ describe('rdbStoreTest', function () {
*/
it('testRdbStore0008', 0, async function (done) {
console.info(TAG + "************* testRdbStore0008 start *************");
let rdbstore = null;
dataRdb.getRdbStore(context,STORE_CONFIG, 1, (data,err) => {
if(err != undefined){
expect(null).assertFail()
}else{
rdbstore = data;
console.info(TAG + "getRdbStore success: " + rdbstore)
expect(rdbstore).assertNotNull();
}
dataRdb.getRdbStore(context,STORE_CONFIG, 1, async (err,data) => {
console.info(TAG + "getRdbStore finish")
console.info(TAG + "getRdbStore success: " + data)
expect(data != null).assertTrue();
await dataRdb.deleteRdbStore(contextApplication,STORE_CONFIG.name)
done();
console.info(TAG + "************* testRdbStore0008 end *************");
});
await dataRdb.deleteRdbStore(context,STORE_CONFIG.name)
rdbstore = null;
done();
console.info(TAG + "************* testRdbStore0008 end *************");
await sleep(1000)
})
/**
......@@ -265,21 +229,15 @@ describe('rdbStoreTest', function () {
*/
it('testRdbStore0009', 0, async function(done){
console.info(TAG + "************* testRdbStore0009 start *************");
let rdbstore = null;
dataRdb.getRdbStore(contextApplication,STORE_CONFIG, 1, (data,err) => {
if(err != undefined){
expect(null).assertFail()
}else{
rdbstore = data;
console.info(TAG + "getRdbStore success: " + rdbstore)
expect(rdbstore).assertNotNull();
}
dataRdb.getRdbStore(contextApplication,STORE_CONFIG, 1, async (err,data) => {
console.info(TAG + "getRdbStore finish")
console.info(TAG + "getRdbStore success: " + data)
expect(data != null).assertTrue();
await dataRdb.deleteRdbStore(contextApplication,STORE_CONFIG.name)
done();
console.info(TAG + "************* testRdbStore0009 end *************");
});
await dataRdb.deleteRdbStore(contextApplication,STORE_CONFIG.name)
rdbstore = null;
done();
console.info(TAG + "************* testRdbStore0009 end *************");
await sleep(1000)
})
console.info(TAG + "*************Unit Test End*************");
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或