openharmony/xts_dcts
1
0
Fork 0
mirror of https://gitee.com/openharmony/xts_dcts synced 2024-10-07 05:43:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!666 【distributeddatamgr】【master】kv，修改rpc.sendrequest为新接口

Browse Source 
Merge pull request !666 from wuxiaodan/master
This commit is contained in:
openharmony_ci 2024-06-21 02:10:58 +00:00 committed by Gitee
commit 7418cd46f5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 289 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
distributeddatamgr/jstest/distributed_kv_store/client/hap/src/main/js/test/KvStoreSecurityLevelS1Jsunit.test.js
View File

@ -76,7 +76,7 @@ async function driveFn() {
await sleep(2000);
let button = await driver.findComponent(BY.text('允许'));
console.info(`button is ${JSON.stringify(button)}`);
await sleep(5000);
await sleep(2000);
await button.click();
} catch (err) {
console.info('err is ' + err);
@ -110,7 +110,7 @@ export default function kvSyncTestS1() {
console.info(logTag + "flag_41 is: " + flag_41);
}
await getPermission();
await sleep(5000);
await sleep(2000);
await driveFn();
await sleep(2000);
@ -161,41 +161,36 @@ export default function kvSyncTestS1() {
beforeEach(async function (done) {
console.info(logTag + "-----------------beforeEach 0 -----------------");
done();
})
afterEach(async function (done) {
console.info(logTag + '-----------------afterEach begin-----------------');
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, kvStore, async function () {
console.info(logTag + 'CLIENT afterEach closeKVStore success');
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, function () {
console.info(logTag + 'CLIENT afterEach deleteKVStore success');
try{
console.info(logTag + '-----------------afterEach begin-----------------');
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(async () => {
console.info(logTag + 'CLIENT afterEach closeKVStore success');
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(() => {
console.info(logTag + 'CLIENT afterEach deleteKVStore success');
});
});
});
await remoteHelpers.closeKvStore(SERVET_STORE_ID).then(async (ret) => {
console.info(logTag + "REMOTE afterEach close server kvStore success: " + ret);
})
await sleep(2000);
kvStore = null;
console.info(logTag + '-----------------afterEach end-----------------');
done();
await remoteHelpers.closeKvStore(SERVET_STORE_ID).then(async (ret) => {
console.info(logTag + "REMOTE afterEach close server kvStore success: " + ret);
})
await sleep(2000);
kvStore = null;
console.info(logTag + '-----------------afterEach end-----------------');
done();
} catch (err) {
console.error('catch afterEach err:' + `, error code is ${err.code}, message is ${err.message}`);
done();
}
})
afterAll(async function (done) {
console.info(logTag + '-----------------afterAll begin-----------------');
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, kvStore, async function () {
console.info(logTag + 'CLIENT afterEach closeKVStore success');
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, function () {
console.info(logTag + 'CLIENT afterEach deleteKVStore success');
});
});
await remoteHelpers.closeKvStore(SERVET_STORE_ID).then(async (ret) => {
console.info(logTag + "REMOTE afterEach close server kvStore success: " + ret);
})
await sleep(5000);
kvStore = null;
console.info(logTag + '-----------------afterAll end-----------------');
console.info(logTag + '-----------------afterAll-----------------');
done();
})

20
distributeddatamgr/jstest/distributed_kv_store_stage/client/entry/src/main/ets/MainAbility/MainAbility.ts
View File

@ -26,16 +26,16 @@ export class MyMessageAble {
this.num = num;
this.str = string;
}
marshalling(messageParcel) {
console.log('MyMessageAble messageParcel marshalling' + this.num , + this.str)
messageParcel.writeInt(this.num);
messageParcel.writeString(this.str);
marshalling(MessageSequence) {
console.log('MyMessageAble MessageSequence marshalling' + this.num , + this.str)
MessageSequence.writeInt(this.num);
MessageSequence.writeString(this.str);
return true;
}
unmarshalling(messageParcel) {
console.log('MyMessageAble messageParcel unmarshalling' + this.num , + this.str)
this.num = messageParcel.readInt();
this.str = messageParcel.readString();
unmarshalling(MessageSequence) {
console.log('MyMessageAble MessageSequence unmarshalling' + this.num , + this.str)
this.num = MessageSequence.readInt();
this.str = MessageSequence.readString();
return true;
}
}
@ -46,9 +46,9 @@ export class StubTest extends rpc.RemoteObject {
super(descriptor)
}
onRemoteRequest(code, data, reply, option) {
onRemoteMessageRequest(code, data, reply, option) {
console.info("onRemoteRequest: " + code)
console.info("onRemoteMessageRequest: " + code)
let tmp1 = data.readInt();
let tmp2 = data.readInt();
let tmp3 = tmp1 + tmp2;

4
distributeddatamgr/jstest/distributed_kv_store_stage/client/entry/src/main/ets/serviceability/ServiceAbility.ts
View File

@ -19,8 +19,8 @@ class StubTest extends rpc.RemoteObject {
constructor(descriptor) {
super(descriptor);
}
onRemoteRequest(code, data, reply, option) {
console.info("onRemoteRequest: " + code)
onRemoteMessageRequest(code, data, reply, option) {
console.info("onRemoteMessageRequest: " + code)
let tmp1 = data.readInt()
let tmp2 = data.readInt()
let tmp3 = tmp1 + tmp2;

48
distributeddatamgr/jstest/distributed_kv_store_stage/client/entry/src/main/ets/test/KvStoreSecurityLevelS1Etsunit.test.ets
View File

@ -171,36 +171,32 @@ export default function kvSyncTestS1Ets() {
})
afterEach(async function (done) {
console.info(logTag + '-----------------afterEach begin-----------------');
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, async function () {
console.info(logTag + 'CLIENT afterEach closeKVStore success');
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, function () {
console.info(logTag + 'CLIENT afterEach deleteKVStore success');
try{
console.info(logTag + '-----------------afterEach begin-----------------');
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(async () => {
console.info(logTag + 'CLIENT afterEach closeKVStore success');
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(() => {
console.info(logTag + 'CLIENT afterEach deleteKVStore success');
});
});
});
await remoteHelpers.closeKvStore(SERVET_STORE_ID).then(async (ret) => {
console.info(logTag + "REMOTE afterEach close server kvStore success: " + ret);
})
await sleep(2000);
kvStore = null;
console.info(logTag + '-----------------afterEach end-----------------');
done();
await remoteHelpers.closeKvStore(SERVET_STORE_ID).then(async (ret) => {
console.info(logTag + "REMOTE afterEach close server kvStore success: " + ret);
})
await sleep(2000);
kvStore = null;
console.info(logTag + '-----------------afterEach end-----------------');
done();
} catch (err) {
console.error('catch afterEach err:' + `, error code is ${err.code}, message is ${err.message}`);
done();
}
})
afterAll(async function (done) {
console.info(logTag + '-----------------afterAll begin-----------------');
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, async function () {
console.info(logTag + 'CLIENT afterEach closeKVStore success');
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, function () {
console.info(logTag + 'CLIENT afterEach deleteKVStore success');
});
});
await remoteHelpers.closeKvStore(SERVET_STORE_ID).then(async (ret) => {
console.info(logTag + "REMOTE afterEach close server kvStore success: " + ret);
})
await sleep(5000);
kvStore = null;
console.info(logTag + '-----------------afterAll end-----------------');
console.info(logTag + '-----------------afterAll -----------------');
done();
})

68
testtools/disetsTest/client/remoteHelper.ets
View File

@ -30,39 +30,47 @@ export default class RemoteHelper{
}
async getReq(message) {
console.log(logTag + "getReq begin");
let messageParcel = rpc.MessageParcel.create();
console.log(logTag + "create object successfully.");
let messageParcelreply = rpc.MessageParcel.create();
let option = new rpc.MessageOption();
let writeResult = messageParcel.writeSequenceable(message);
await this.gIRemoteObject.sendRequest(CODE_INVOKE, messageParcel, messageParcelreply, option);
console.log(logTag + "sendRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
let dataReply = messageParcelreply.readSequenceable(ret);
console.log(logTag + "run readSequenceable success, result is" + dataReply);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
try {
console.log(logTag + "getReq begin");
console.log(logTag + "getReq. message= "+ JSON.stringify(message));
let data= rpc.MessageSequence.create();
let reply = rpc.MessageSequence.create();
let option = new rpc.MessageOption();
data.writeParcelable(message);
await this.gIRemoteObject.sendMessageRequest(CODE_INVOKE, data, reply, option);
console.log(logTag + "sendMessageRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
reply.readParcelable(ret);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
} catch(err) {
console.error('***********catch getReq err:' + `, error code is ${err.code}, message is ${err.message}`);
return 411;
}
}
async getReqTestCase(message) {
console.log(logTag + "getReq begin");
let messageParcel = rpc.MessageParcel.create();
console.log(logTag + "create object successfully.");
let messageParcelreply = rpc.MessageParcel.create();
let option = new rpc.MessageOption();
let writeResult = messageParcel.writeSequenceable(message);
await this.gIRemoteObject.sendRequest(CODE_INVOKE_TESTCASE, messageParcel, messageParcelreply, option);
console.log(logTag + "sendRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
let dataReply = messageParcelreply.readSequenceable(ret);
console.log(logTag + "run readSequenceable success, result is" + dataReply);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
try {
console.log(logTag + "getReqTestCase begin");
console.log(logTag + "getReqTestCase. message= "+ JSON.stringify(message));
let data= rpc.MessageSequence.create();
let reply = rpc.MessageSequence.create();
let option = new rpc.MessageOption();
data.writeParcelable(message);
await this.gIRemoteObject.sendMessageRequest(CODE_INVOKE_TESTCASE, data, reply, option);
console.log(logTag + "sendMessageRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
reply.readParcelable(ret);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
} catch(err) {
console.error('***********catch getReq err:' + `, error code is ${err.code}, message is ${err.message}`);
return 411;
}
}
async setTestCaseName(name){

32
testtools/disetsTest/common/apiMessage.ets
View File

@ -33,29 +33,29 @@ export default class ApiMessage {
this._apiResult = apiResult;
}
marshalling(messageParcel) {
marshalling(messageSequence: rpc.MessageSequence) {
console.log(logTag + "into marshalling.");
messageParcel.writeString(this._deviceName);
messageParcel.writeString(this._className);
messageParcel.writeString(this._methodName);
messageParcel.writeString(this._apiSession);
messageSequence.writeString(this._deviceName);
messageSequence.writeString(this._className);
messageSequence.writeString(this._methodName);
messageSequence.writeString(this._apiSession);
console.log(logTag + "writeString successfully.");
messageParcel.writeStringArray(this._parameterTypes);
messageParcel.writeStringArray(this._parameters);
messageParcel.writeString(this._apiResult);
messageSequence.writeStringArray(this._parameterTypes);
messageSequence.writeStringArray(this._parameters);
messageSequence.writeString(this._apiResult);
console.log(logTag + "marshalling successfully.");
return true;
}
unmarshalling(messageParcel) {
unmarshalling(messageSequence: rpc.MessageSequence) {
console.log(logTag + "into unmarshalling.");
this._deviceName = messageParcel.readString();
this._className = messageParcel.readString();
this._methodName = messageParcel.readString();
this._apiSession = messageParcel.readString();
this._parameterTypes = messageParcel.readStringArray();
this._parameters = messageParcel.readStringArray();
this._apiResult = messageParcel.readString();
this._deviceName = messageSequence.readString();
this._className = messageSequence.readString();
this._methodName = messageSequence.readString();
this._apiSession = messageSequence.readString();
this._parameterTypes = messageSequence.readStringArray();
this._parameters = messageSequence.readStringArray();
this._apiResult = messageSequence.readString();
console.log(logTag + "unmarshalling successfully.");
return true;
}

105
testtools/disetsTest/server/service.ets
View File

@ -30,71 +30,64 @@ export default class Stub extends rpc.RemoteObject {
super(descriptor);
}
onRemoteRequest(code, data, reply, option) {
onRemoteMessageRequest(code, data, reply, option) {
try {
console.log(logTag +" =================== onRemoteRequest: code is " + code + " ===================");
console.log(logTag +' =================== onRemoteMessageRequest: code is " + code + " ===================');
switch (code) {
case CODE_INVOKE:
{
console.info(logTag +" case CODE_INVOKE start");
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
var tmp = data.readSequenceable(testBundle);
console.log( logTag +" read result is " + tmp + JSON.stringify(testBundle));
let resultCall = new ApiResult(0,null);
var resCallApi = -1;
const reflectCallApi = new ReflectCallApi();
resCallApi = reflectCallApi.call(testBundle);
console.log(logTag+"_methodName call success,result is "+resCallApi);
if (resCallApi == 1) {
resultCall._resultCode = 1;
resultCall._result = 1;
} else {
resultCall._resultCode = -1;
resultCall._result = -1;
}
console.log(logTag + "The server's writeSequenceable result is " + JSON.stringify(resultCall));
case CODE_INVOKE:
{
console.info(logTag +' case CODE_INVOKE start');
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
data.readParcelable(testBundle);
testBundle._apiResult=JSON.stringify(resultCall);
console.log(logTag +" The testBundle is " + JSON.stringify(testBundle));
let result = reply.writeSequenceable(testBundle);
console.log(logTag +" writeSequenceable result is " + result);
return true;
}
case CODE_INVOKE_TESTCASE:
{
console.info(logTag +" =================== case CODE_INVOKE_TESTCASE start =================== ");
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
var tmp = data.readSequenceable(testBundle);
console.log( logTag +" read result is " + tmp + JSON.stringify(testBundle));
let resultCall = new ApiResult(0,null);
let resultCall = new ApiResult(0,null);
var resCallApi = -1;
const reflectCallApi = new ReflectCallApi();
resCallApi = reflectCallApi.call(testBundle);
console.log(logTag + '_methodName call success,result is ' + resCallApi);
if (resCallApi === 1) {
resultCall._resultCode = 1;
resultCall._result = 1;
testBundle._apiResult=JSON.stringify(resultCall);
let result = reply.writeSequenceable(testBundle);
console.log(logTag +" writeSequenceable result is " + result);
return true;
}
case CODE_INVOKE_OSVERSION:
{
console.info(logTag +" =================== case CODE_INVOKE_OSVERSION start =================== ");
let tmp = data.readString();
console.log(logTag +" readString tmp is " + tmp);
} else {
resultCall._resultCode = -1;
resultCall._result = -1;
}
console.log(logTag + "The server's writeSequenceable result is ' + JSON.stringify(resultCall)");
let osFullNameInfo = deviceinfo.osFullName;
console.info('the value of the deviceinfo osFullName is :' + osFullNameInfo);
testBundle._apiResult=JSON.stringify(resultCall);
console.log(logTag + ' The testBundle is ' + JSON.stringify(testBundle));
reply.writeParcelable(testBundle);
reply.writeString(osFullNameInfo);
console.log(logTag +" writeSequenceable result is " + tmp);
return true;
}
default:
console.error(logTag +" default case " + code);
return super.onRemoteRequest(code, data, reply, option);
return true;
}
case CODE_INVOKE_TESTCASE:
{
console.info(logTag +' =================== case CODE_INVOKE_TESTCASE start =================== ');
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
data.readSequenceable(testBundle);
let resultCall = new ApiResult(0,null);
resultCall._resultCode = 1;
resultCall._result = 1;
testBundle._apiResult=JSON.stringify(resultCall);
reply.writeParcelable(testBundle);
return true;
}
case CODE_INVOKE_OSVERSION:
{
console.info(logTag +' =================== case CODE_INVOKE_OSVERSION start =================== ');
data.readString();
let osFullNameInfo = deviceinfo.osFullName;
console.info('the value of the deviceinfo osFullName is :' + osFullNameInfo);
reply.writeString(osFullNameInfo);
return true;
}
default:
console.error(logTag +' default case ' + code);
return super.onRemoteMessageRequest(code, data, reply, option);
}
} catch (error) {
console.log(logTag +"ERROR: onRemoteRequest: " + error);
console.log(logTag +'ERROR: onRemoteMessageRequest: ' + error.code + error.message);
}
return false;
}

11
testtools/disetsTest/server/testApi.ets
View File

@ -97,7 +97,7 @@ export default class TestApi{
createIfMissing : true,
encrypt : false,
backup : false,
autoSync : true,
autoSync: false,
kvStoreType : disData.KVStoreType.SINGLE_VERSION,
schema : undefined,
securityLevel : disData.SecurityLevel.S1,
@ -148,8 +148,9 @@ export default class TestApi{
});
}
async closeKvStore(storeId){
await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(async () => {
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(() => {
try{
await kvManager.closeKVStore(TEST_BUNDLE_NAME, storeId).then(async () => {
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, storeId).then(() => {
console.info(logTag + " Server deleteKVStore success, storeId=" + storeId);
return String(true);
})
@ -157,6 +158,10 @@ export default class TestApi{
console.error(logTag + "Server deleteKVStore fail, error.code=" + error.code + "error.message=" + error.message);
return String(error);
});
} catch (err) {
console.error('catch closeKvStore err:' + `, error code is ${err.code}, message is ${err.message}`);
return String(err);
}
}
async kvPut(key,value,valueType){

68
testtools/disjsTest/client/remoteHelper.js
View File

@ -30,39 +30,47 @@ export default class RemoteHelper{
}
async getReq(message) {
console.log(logTag + "getReq begin");
let messageParcel = rpc.MessageParcel.create();
console.log(logTag + "create object successfully.");
let messageParcelreply = rpc.MessageParcel.create();
let option = new rpc.MessageOption();
let writeResult = messageParcel.writeSequenceable(message);
await this.gIRemoteObject.sendRequest(CODE_INVOKE, messageParcel, messageParcelreply, option);
console.log(logTag + "sendRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
let dataReply = messageParcelreply.readSequenceable(ret);
console.log(logTag + "run readSequenceable success, result is" + dataReply);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
try {
console.log(logTag + "getReq begin");
console.log(logTag + "getReq. message= "+ JSON.stringify(message));
let data= rpc.MessageSequence.create();
let reply = rpc.MessageSequence.create();
let option = new rpc.MessageOption();
data.writeParcelable(message);
await this.gIRemoteObject.sendMessageRequest(CODE_INVOKE, data, reply, option);
console.log(logTag + "sendMessageRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
reply.readParcelable(ret);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
} catch(err) {
console.error('***********catch getReq err:' + `, error code is ${err.code}, message is ${err.message}`);
return 411;
}
}
async getReqTestCase(message) {
console.log(logTag + "getReq begin");
let messageParcel = rpc.MessageParcel.create();
console.log(logTag + "create object successfully.");
let messageParcelreply = rpc.MessageParcel.create();
let option = new rpc.MessageOption();
let writeResult = messageParcel.writeSequenceable(message);
await this.gIRemoteObject.sendRequest(CODE_INVOKE_TESTCASE, messageParcel, messageParcelreply, option);
console.log(logTag + "sendRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
let dataReply = messageParcelreply.readSequenceable(ret);
console.log(logTag + "run readSequenceable success, result is" + dataReply);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
try {
console.log(logTag + "getReqTestCase begin");
console.log(logTag + "getReqTestCase. message= "+ JSON.stringify(message));
let data= rpc.MessageSequence.create();
let reply = rpc.MessageSequence.create();
let option = new rpc.MessageOption();
data.writeParcelable(message);
await this.gIRemoteObject.sendMessageRequest(CODE_INVOKE_TESTCASE, data, reply, option);
console.log(logTag + "sendMessageRequest got result");
let ret = new ApiMessage(null, null, null, null, null, null, null);
reply.readParcelable(ret);
let retApi = JSON.parse(ret._apiResult);
let retApiResult = retApi._result;
console.log(logTag + "*********** read success, results is " + retApiResult + "**************");
return retApiResult;
} catch(err) {
console.error('***********catch getReq err:' + `, error code is ${err.code}, message is ${err.message}`);
return 411;
}
}
async setTestCaseName(name){

23
testtools/disjsTest/client/testService.js
View File

@ -47,29 +47,6 @@ export default class TestService {
}
async invoke(gIRemoteObject,message) {
var messageParcel = rpc.MessageParcel.create();
console.log(logTag + "create object successfully.");
var messageParcelreply = rpc.MessageParcel.create();
var option = new rpc.MessageOption();
var writeResult = messageParcel.writeSequenceable(message);
gIRemoteObject.sendRequest(CODE_INVOKE, messageParcel, messageParcelreply, option).then(function (result) {
if (result.errCode === 0) {
console.log(logTag + "sendRequest got result");
var ret = new ApiMessage(null, null, null, null, null, null,null);
var dataReply = result.reply.readSequenceable(ret);
console.log(logTag + "run readSequenceable success, result is" + dataReply);
results = JSON.parse(ret._apiResult);
console.log(logTag + " read success, results is" + results._result);
return results._result;
} else {
console.log(logTag + "sendRequest failed, errCode: " + errCode);
}
}).catch(function (e) {
console.log(logTag + " sendRequest got exception: " + e.message);
});
}
getDeviceList(deviceManager) {
deviceList = deviceManager.getAvailableDeviceListSync();
console.info(logTag + "getDeviceList success, deviceList id: " + JSON.stringify(deviceList));

34
testtools/disjsTest/common/apiMessage.js
View File

@ -14,7 +14,7 @@
*/
let logTag = 'RpcServer_ApiMessage: ';
export default class ApiMessage {
export default class ApiMessage {
_deviceName = null;
_className = null;
_methodName = null;
@ -33,29 +33,29 @@ export default class ApiMessage {
this._apiResult = apiResult;
}
marshalling(messageParcel) {
marshalling(MessageSequence) {
console.log(logTag + "into marshalling.");
messageParcel.writeString(this._deviceName);
messageParcel.writeString(this._className);
messageParcel.writeString(this._methodName);
messageParcel.writeString(this._apiSession);
MessageSequence.writeString(this._deviceName);
MessageSequence.writeString(this._className);
MessageSequence.writeString(this._methodName);
MessageSequence.writeString(this._apiSession);
console.log(logTag + "writeString successfully.");
messageParcel.writeStringArray(this._parameterTypes);
messageParcel.writeStringArray(this._parameters);
messageParcel.writeString(this._apiResult);
MessageSequence.writeStringArray(this._parameterTypes);
MessageSequence.writeStringArray(this._parameters);
MessageSequence.writeString(this._apiResult);
console.log(logTag + "marshalling successfully.");
return true;
}
unmarshalling(messageParcel) {
unmarshalling(MessageSequence) {
console.log(logTag + "into unmarshalling.");
this._deviceName = messageParcel.readString();
this._className = messageParcel.readString();
this._methodName = messageParcel.readString();
this._apiSession = messageParcel.readString();
this._parameterTypes = messageParcel.readStringArray();
this._parameters = messageParcel.readStringArray();
this._apiResult = messageParcel.readString();
this._deviceName = MessageSequence.readString();
this._className = MessageSequence.readString();
this._methodName = MessageSequence.readString();
this._apiSession = MessageSequence.readString();
this._parameterTypes = MessageSequence.readStringArray();
this._parameters = MessageSequence.readStringArray();
this._apiResult = MessageSequence.readString();
console.log(logTag + "unmarshalling successfully.");
return true;
}

109
testtools/disjsTest/server/service.js
View File

@ -30,71 +30,66 @@ export default class Stub extends rpc.RemoteObject {
super(descriptor);
}
onRemoteRequest(code, data, reply, option) {
onRemoteMessageRequest(code, data, reply, option) {
try {
console.log(logTag +" =================== onRemoteRequest: code is " + code + " ===================");
console.log(logTag +' =================== onRemoteMessageRequest: code is " + code + " ===================');
switch (code) {
case CODE_INVOKE:
{
console.info(logTag +" case CODE_INVOKE start");
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
var tmp = data.readSequenceable(testBundle);
console.log( logTag +" read result is " + tmp + JSON.stringify(testBundle));
let resultCall = new ApiResult();
var resCallApi = -1;
const reflectCallApi = new ReflectCallApi();
resCallApi = reflectCallApi.call(testBundle);
console.log(logTag+"_methodName call success,result is "+resCallApi);
if (resCallApi == 1) {
resultCall._resultCode = true;
resultCall._result = 1;
} else {
resultCall._resultCode = false;
resultCall._result = -1;
}
console.log(logTag + "The server's writeSequenceable result is " + JSON.stringify(resultCall));
case CODE_INVOKE:
{
console.info(logTag + ' case CODE_INVOKE start');
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
data.readParcelable(testBundle);
testBundle._apiResult=JSON.stringify(resultCall);
console.log(logTag +" The testBundle is " + JSON.stringify(testBundle));
let result = reply.writeSequenceable(testBundle);
console.log(logTag +" writeSequenceable result is " + result);
return true;
}
case CODE_INVOKE_TESTCASE:
{
console.info(logTag +" =================== case CODE_INVOKE_TESTCASE start =================== ");
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
var tmp = data.readSequenceable(testBundle);
console.log( logTag +" read result is " + tmp + JSON.stringify(testBundle));
let resultCall = new ApiResult();
resultCall._resultCode = true;
let resultCall = new ApiResult(0,null);
var resCallApi = -1;
const reflectCallApi = new ReflectCallApi();
resCallApi = reflectCallApi.call(testBundle);
console.log(logTag + '_methodName call success,result is ' + resCallApi);
if (resCallApi === 1) {
resultCall._resultCode = 1;
resultCall._result = 1;
testBundle._apiResult=JSON.stringify(resultCall);
let result = reply.writeSequenceable(testBundle);
console.log(logTag +" writeSequenceable result is " + result);
return true;
}
case CODE_INVOKE_OSVERSION:
{
console.info(logTag +" =================== case CODE_INVOKE_OSVERSION start =================== ");
let tmp = data.readString();
console.log(logTag +" readString tmp is " + tmp);
} else {
resultCall._resultCode = -1;
resultCall._result = -1;
}
console.log(logTag + " The server's writeSequenceable result is ' + JSON.stringify(resultCall)");
let osFullNameInfo = deviceinfo.osFullName;
console.info('the value of the deviceinfo osFullName is :' + osFullNameInfo);
testBundle._apiResult=JSON.stringify(resultCall);
console.log(logTag + ' The testBundle is ' + JSON.stringify(testBundle));
reply.writeParcelable(testBundle);
reply.writeString(osFullNameInfo);
console.log(logTag +" writeSequenceable result is " + tmp);
return true;
}
default:
console.error(logTag +" default case " + code);
return super.onRemoteRequest(code, data, reply, option);
return true;
}
case CODE_INVOKE_TESTCASE:
{
console.info(logTag + ' =================== case CODE_INVOKE_TESTCASE start =================== ');
let testBundle = new ApiMessage(null, null, null, null, null, null, null);
data.readSequenceable(testBundle);
let resultCall = new ApiResult(0,null);
resultCall._resultCode = 1;
resultCall._result = 1;
testBundle._apiResult=JSON.stringify(resultCall);
reply.writeParcelable(testBundle);
return true;
}
case CODE_INVOKE_OSVERSION:
{
console.info(logTag + ' =================== case CODE_INVOKE_OSVERSION start =================== ');
data.readString();
let osFullNameInfo = deviceinfo.osFullName;
console.info('the value of the deviceinfo osFullName is :' + osFullNameInfo);
reply.writeString(osFullNameInfo);
return true;
}
default:
{
console.error(logTag + ' default case ' + code);
return super.onRemoteMessageRequest(code, data, reply, option);
}
}
} catch (error) {
console.log(logTag +"ERROR: onRemoteRequest: " + error);
console.log(logTag +'ERROR: onRemoteMessageRequest: ' + error.code + error.message);
}
return false;
}

21
testtools/disjsTest/server/testApi.js
View File

@ -97,7 +97,7 @@ export default class TestApi{
createIfMissing : true,
encrypt : false,
backup : false,
autoSync : true,
autoSync: false,
kvStoreType : disData.KVStoreType.SINGLE_VERSION,
schema : '',
securityLevel : disData.SecurityLevel.S1,
@ -149,19 +149,24 @@ export default class TestApi{
return String(true);
}).catch((error) => {
console.error(logTag + "getKVStore fail, error.code=" + error.code + "error.message=" + error.message);
return String(err);
return String(error);
});
}
async closeKvStore(storeId){
await kvManager.closeKVStore(TEST_BUNDLE_NAME,storeId,kvStore).then(async () => {
await kvManager.deleteKVStore(TEST_BUNDLE_NAME,storeId).then(() => {
console.info(logTag + " Server delete KVStore success, storeId=" + storeId);
try{
await kvManager.closeKVStore(TEST_BUNDLE_NAME, storeId).then(async () => {
await kvManager.deleteKVStore(TEST_BUNDLE_NAME, storeId).then(() => {
console.info(logTag + " Server deleteKVStore success, storeId=" + storeId);
return String(true);
})
}).catch((error) => {
console.error(logTag + "closeKvStore fail, error.code=" + error.code + "error.message=" + error.message);
return String(err);
console.error(logTag + "Server deleteKVStore fail, error.code=" + error.code + "error.message=" + error.message);
return String(error);
});
} catch (err) {
console.error('catch closeKvStore err:' + `, error code is ${err.code}, message is ${err.message}`);
return String(err);
}
}
async kvPut(key,value,valueType){
@ -188,7 +193,7 @@ export default class TestApi{
return String(true);
}).catch((error) => {
console.error(logTag + " Server put fail, error.code=" + error.code + "error.message=" + error.message);
return String(err);
return String(error);
});
}
async kvGet(key,callback){