xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试：修改测试用例，增加注册账号逻辑

Browse Source
This commit is contained in:
liangtongchuan
2021-08-27 18:01:16 +08:00
parent 3c13acc1b2
commit fa3643c314
7 changed files with 89 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/test/Client.ts
+66 -6
View File
@@ -1,12 +1,57 @@
import { PinusWSClient } from 'pinus-robot-plugin'; import { PinusWSClient } from 'pinus-robot-plugin';
import { expect } from 'chai'; import { expect } from 'chai';
import { checkSuccessResponse } from './CheckPatten'; import { checkSuccessResponse } from './CheckPatten';
import { ON_ADD_CHANNEL_ROUTE } from '../app/consts'; import { ON_ADD_CHANNEL_ROUTE, STATUS } from '../app/consts';
import { genCode } from '../app/pubUtils/util';
const request = require('request');
const crypto = require('crypto');
export class Client { export class Client {
private _client; private _client;
private _roleInfo; private _roleInfo;
private ENCRYPT_IV = 'f7182j5f04e377ux';
private ENCRYPT_KEY = 'fiqaxijabbantusmprc234fj';
constructor(tel: string = '13636354764') { constructor(tel: string = '13636354764') {
const param = {tel, deviceId: genCode(10), code: '', platform: 'ios', pkgName: 'com.bantu.zyz', serverType: 'dev'};
const paramStr = this.aesEncrypt(JSON.stringify(param), this.ENCRYPT_KEY, this.ENCRYPT_IV);
request.post('http://127.0.0.1:7001/user/smslogin', {
json: {
data: paramStr
}
}, (err, res, body) => {
const loginRes = JSON.parse(this.aesDecrypt(body.result, this.ENCRYPT_KEY, this.ENCRYPT_IV));
checkSuccessResponse(loginRes);
request.post('http://127.0.0.1:7001/user/checkrole', {
json: {
data: this.aesEncrypt(JSON.stringify({token: loginRes.data.token, serverId: 1}), this.ENCRYPT_KEY, this.ENCRYPT_IV)
}
}, (err, res, body) => {
const checkRoleRes = JSON.parse(this.aesDecrypt(body.result, this.ENCRYPT_KEY, this.ENCRYPT_IV));
if (checkRoleRes.code === 0) {
this.createClient(loginRes.data.token);
} else {
this.createRole(loginRes.data.token, () => {
this.createClient(loginRes.data.token);
});
}
});
});
}
createRole(token, sucCB) {
request.post('http://127.0.0.1:7001/user/createrole', {
json: {
data: this.aesEncrypt(JSON.stringify({token, serverId: 1}), this.ENCRYPT_KEY, this.ENCRYPT_IV)
}
}, (err, res, body) => {
const result = JSON.parse(this.aesDecrypt(body.result, this.ENCRYPT_KEY, this.ENCRYPT_IV));
checkSuccessResponse(result);
sucCB();
});
}
createClient(token) {
this._client = new PinusWSClient(); this._client = new PinusWSClient();
let host = '127.0.0.1'; let host = '127.0.0.1';
let port = '3050'; let port = '3050';
@@ -15,21 +60,22 @@ export class Client {
port: port port: port
}, (data) => { }, (data) => {
// 连接成功执行函数 // 连接成功执行函数
this._client.request('connector.entryHandler.debugQueryToken', { tel, magicWord: 'zyz666server518' }, (res) => {
checkSuccessResponse(res);
expect(res.data.token).to.be.an('string');
this._client.on(ON_ADD_CHANNEL_ROUTE, (msg) => { this._client.on(ON_ADD_CHANNEL_ROUTE, (msg) => {
checkSuccessResponse(msg); checkSuccessResponse(msg);
expect(msg.data.roleId).to.be.a('string'); expect(msg.data.roleId).to.be.a('string');
expect(msg.data.channelName).to.be.a('string'); expect(msg.data.channelName).to.be.a('string');
}); });
this._client.request('connector.entryHandler.enter', { serverId: 1, ...res.data }, (enterRes) => { this._client.request('connector.entryHandler.enter', { serverId: 1, token }, (enterRes) => {
// 消息回调 // 消息回调
checkSuccessResponse(enterRes); checkSuccessResponse(enterRes);
expect(enterRes.data.role).to.be.an('object'); expect(enterRes.data.role).to.be.an('object');
this._roleInfo = enterRes.data.role; this._roleInfo = enterRes.data.role;
this._client.request('role.roleHandler.initRole', { serverId: 1, token, roleName: genCode(8) }, (initRoleRes) => {
if (initRoleRes.code !== 0 && initRoleRes.code !== STATUS.ROLE_HAS_INIT.code) {
console.error('initRole error', initRoleRes.code, typeof initRoleRes.code);
}
});
}); });
});
}); });
} }
@@ -40,4 +86,18 @@ export class Client {
get client() { get client() {
return this._client; return this._client;
} }
private aesEncrypt(data, key, iv) {
const cipher = crypto.createCipheriv('aes-192-cbc', key, iv);
var crypted = cipher.update(data, 'utf8', 'hex');
crypted += cipher.final('hex');
return crypted;
}
private aesDecrypt(data, key, iv) {
const decipher = crypto.createDecipheriv('aes-192-cbc', key, iv);
var decrypted = decipher.update(data, 'hex', 'utf8');
decrypted += decipher.final('utf8');
return decrypted;
}
} }
game-server/test/app.test.ts
+1 -1
View File
@@ -17,6 +17,6 @@ describe('测试赵云传登录', function() {
expect(c.roleInfo).to.be.an('object'); expect(c.roleInfo).to.be.an('object');
pinusClient = c.client; pinusClient = c.client;
done(); done();
}, 500); }, 1000);
}); });
}); });
game-server/test/chat.test.ts
+7 -5
View File
@@ -111,7 +111,7 @@ describe('聊天测试', function () {
clearInterval(timer); clearInterval(timer);
done(); done();
} }
}, 500); }, 1000);
}); });
afterEach(function (done) { afterEach(function (done) {
@@ -231,6 +231,7 @@ describe('聊天测试', function () {
}); });
}); });
// 材料不足先跳过
it.skip('测试系统频道升六星消息', function (done) { it.skip('测试系统频道升六星消息', function (done) {
let msgReceiveCnt = 0; let msgReceiveCnt = 0;
pinusClientT.on(ON_GROUP_MSG_ROUTE, (res) => { pinusClientT.on(ON_GROUP_MSG_ROUTE, (res) => {
@@ -267,7 +268,8 @@ describe('聊天测试', function () {
}); });
}); });
it('测试系统频道升品消息', function (done) { // 材料不足先跳过
it.skip('测试系统频道升品消息', function (done) {
let msgReceiveCnt = 0; let msgReceiveCnt = 0;
function checkHeroInfoRes(res) { function checkHeroInfoRes(res) {
checkSuccessResponse(res); checkSuccessResponse(res);
@@ -350,7 +352,7 @@ describe('聊天测试', function () {
pinusClient.on(ON_GROUP_MSG_ROUTE, (res) => { pinusClient.on(ON_GROUP_MSG_ROUTE, (res) => {
checkNoticeRes(res); checkNoticeRes(res);
}); });
pinusClient.request('battle.guildHandler.getMyGuildInfo', {}, (res) => { pinusClient.request('guild.guildHandler.getMyGuildInfo', {}, (res) => {
checkSuccessResponse(res); checkSuccessResponse(res);
expect(res.data).to.have.deep.property('hasGuild').that.is.an('boolean'); expect(res.data).to.have.deep.property('hasGuild').that.is.an('boolean');
if (res.data.hasGuild) { if (res.data.hasGuild) {
@@ -361,7 +363,7 @@ describe('聊天测试', function () {
expect(res.data).to.have.deep.property('ceLimit').that.is.an('number'); expect(res.data).to.have.deep.property('ceLimit').that.is.an('number');
expect(res.data).to.have.deep.property('isAuto').that.is.an('boolean'); expect(res.data).to.have.deep.property('isAuto').that.is.an('boolean');
const { code, name, notice, introduce, ceLimit, isAuto } = res.data; const { code, name, notice, introduce, ceLimit, isAuto } = res.data;
pinusClient.request('battle.guildHandler.setGuildInfo', { code, name, notice: newNotice, introduce, ceLimit, isAuto }, (setRes) => { pinusClient.request('guild.guildHandler.setGuildInfo', { code, name, notice: newNotice, introduce, ceLimit, isAuto }, (setRes) => {
checkSuccessResponse(setRes); checkSuccessResponse(setRes);
expect(setRes.data.notice).to.be.equal(newNotice); expect(setRes.data.notice).to.be.equal(newNotice);
setTimeout(() => { setTimeout(() => {
@@ -369,7 +371,7 @@ describe('聊天测试', function () {
pinusClientT.off(ON_GROUP_MSG_ROUTE); pinusClientT.off(ON_GROUP_MSG_ROUTE);
pinusClient.off(ON_GROUP_MSG_ROUTE); pinusClient.off(ON_GROUP_MSG_ROUTE);
done(); done();
}, 50); }, 500);
}); });
} }
}); });
game-server/test/comBattle.test.ts
+8 -8
View File
@@ -62,7 +62,7 @@ describe('寻宝创建队伍', function() {
clearInterval(timer); clearInterval(timer);
done(); done();
} }
}, 500); }, 1000);
}); });
afterEach(function(done) { afterEach(function(done) {
@@ -91,7 +91,7 @@ describe('寻宝创建队伍', function() {
expect(res.data.teamCode).to.be.a('string'); expect(res.data.teamCode).to.be.a('string');
expect(res.data.roleStatus).to.be.an('array'); expect(res.data.roleStatus).to.be.an('array');
res.data.roleStatus.forEach(roleSt => { res.data.roleStatus.forEach(roleSt => {
expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio'); expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio', 'fixReward');
}); });
pinusClientT.request('battle.comBattleHandler.searchTeam', searchTeamParms, (searchRes) => { pinusClientT.request('battle.comBattleHandler.searchTeam', searchTeamParms, (searchRes) => {
// console.log('searchRes:', searchRes); // console.log('searchRes:', searchRes);
@@ -128,7 +128,7 @@ describe('寻宝创建队伍', function() {
expect(res.data.teamCode).to.be.a('string'); expect(res.data.teamCode).to.be.a('string');
expect(res.data.roleStatus).to.be.an('array'); expect(res.data.roleStatus).to.be.an('array');
res.data.roleStatus.forEach(roleSt => { res.data.roleStatus.forEach(roleSt => {
expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio'); expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio', 'fixReward');
}); });
const roleIds = res.data.roleStatus.map(roleSt => { return roleSt.roleId }); const roleIds = res.data.roleStatus.map(roleSt => { return roleSt.roleId });
if (roleIds.indexOf(roleInfoT.roleId) === -1) { if (roleIds.indexOf(roleInfoT.roleId) === -1) {
@@ -150,7 +150,7 @@ describe('寻宝创建队伍', function() {
expect(res.data.teamCode).to.be.a('string'); expect(res.data.teamCode).to.be.a('string');
expect(res.data.roleStatus).to.be.an('array'); expect(res.data.roleStatus).to.be.an('array');
res.data.roleStatus.forEach(roleSt => { res.data.roleStatus.forEach(roleSt => {
expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio'); expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio', 'fixReward');
}); });
pinusClient.request('battle.comBattleHandler.dismiss', {teamCode: res.data.teamCode}, (dismissRes) => { pinusClient.request('battle.comBattleHandler.dismiss', {teamCode: res.data.teamCode}, (dismissRes) => {
expect(dismissRes).to.be.an('object'); expect(dismissRes).to.be.an('object');
@@ -165,7 +165,7 @@ describe('寻宝创建队伍', function() {
let teamCode = ''; let teamCode = '';
function checkInviteRes(res) { function checkInviteRes(res) {
checkSuccessResponse(res); checkSuccessResponse(res);
expect(res.data.content).to.be.equal(teamCode); expect(JSON.parse(res.data.content).teamCode).to.be.equal(teamCode);
msgReceiveCnt += 1; msgReceiveCnt += 1;
} }
pinusClientT.on(ON_GROUP_MSG_ROUTE, (res) => { pinusClientT.on(ON_GROUP_MSG_ROUTE, (res) => {
@@ -180,7 +180,7 @@ describe('寻宝创建队伍', function() {
expect(teamCode).to.be.a('string'); expect(teamCode).to.be.a('string');
expect(res.data.roleStatus).to.be.an('array'); expect(res.data.roleStatus).to.be.an('array');
res.data.roleStatus.forEach(roleSt => { res.data.roleStatus.forEach(roleSt => {
expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio'); expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio', 'fixReward');
}); });
pinusClient.request('battle.comBattleHandler.autoInvite', {teamCode}, (inviteRes) => { pinusClient.request('battle.comBattleHandler.autoInvite', {teamCode}, (inviteRes) => {
checkSuccessResponse(inviteRes, false); checkSuccessResponse(inviteRes, false);
@@ -268,7 +268,7 @@ describe('寻宝创建队伍', function() {
expect(res.data.teamCode).to.be.a('string'); expect(res.data.teamCode).to.be.a('string');
expect(res.data.roleStatus).to.be.an('array'); expect(res.data.roleStatus).to.be.an('array');
res.data.roleStatus.forEach(roleSt => { res.data.roleStatus.forEach(roleSt => {
expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio'); expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio', 'fixReward');
}); });
const roleIds = res.data.roleStatus.map(roleSt => { return roleSt.roleId }); const roleIds = res.data.roleStatus.map(roleSt => { return roleSt.roleId });
if (roleIds.indexOf(roleInfoT.roleId) === -1) { if (roleIds.indexOf(roleInfoT.roleId) === -1) {
@@ -280,7 +280,7 @@ describe('寻宝创建队伍', function() {
setTimeout(() => { setTimeout(() => {
expect(msgReceiveCnt).to.be.equal(2); expect(msgReceiveCnt).to.be.equal(2);
comBattleProcess(pinusClient, res.data.teamCode, done); comBattleProcess(pinusClient, res.data.teamCode, done);
}, 50); }, 500);
}); });
}); });
} else { } else {
game-server/test/friend.test.ts
+1 -1
View File
@@ -25,7 +25,7 @@ describe('好友测试测试', function() {
clearInterval(timer); clearInterval(timer);
done(); done();
} }
}, 500); }, 1000);
}); });
afterEach(function(done) { afterEach(function(done) {
game-server/test/guild.test.ts
+5 -5
View File
@@ -24,7 +24,7 @@ describe('军团测试', function() {
}); });
it('获取军团列表', function(done) { it('获取军团列表', function(done) {
pinusClient.request('battle.guildHandler.getGuildList', {page:1, showPeopleMax: true, name: ""} , (res) => { pinusClient.request('guild.guildHandler.getGuildList', {page:1, showPeopleMax: true, name: ""} , (res) => {
// console.log(JSON.stringify(res)) // console.log(JSON.stringify(res))
// 消息回调 // 消息回调
checkSuccessResponse(res); checkSuccessResponse(res);
@@ -47,7 +47,7 @@ describe('军团测试', function() {
it('获取个人军团', function (done) { it('获取个人军团', function (done) {
pinusClient.request('battle.guildHandler.getMyGuildInfo', { }, (res) => { pinusClient.request('guild.guildHandler.getMyGuildInfo', { }, (res) => {
// 消息回调 // 消息回调
checkSuccessResponse(res); checkSuccessResponse(res);
expect(res.data).to.have.deep.property('hasGuild').that.is.an('boolean'); expect(res.data).to.have.deep.property('hasGuild').that.is.an('boolean');
@@ -92,7 +92,7 @@ describe('军团测试', function() {
}); });
it('获取申请列表', function (done) { it('获取申请列表', function (done) {
pinusClient.request('battle.guildHandler.getApplyList', { }, (res) => { pinusClient.request('guild.guildHandler.getApplyList', { }, (res) => {
// 消息回调 // 消息回调
checkSuccessResponse(res); checkSuccessResponse(res);
expect(res.data).to.have.deep.property('list').that.is.an('array'); expect(res.data).to.have.deep.property('list').that.is.an('array');
@@ -113,7 +113,7 @@ describe('军团测试', function() {
}); });
it('团长查看可邀请列表', function (done) { it('团长查看可邀请列表', function (done) {
pinusClient.request('battle.guildHandler.getInviteMemberList', { }, (res) => { pinusClient.request('guild.guildHandler.getInviteMemberList', { }, (res) => {
// 消息回调 // 消息回调
checkSuccessResponse(res); checkSuccessResponse(res);
expect(res.data).to.have.deep.property('list').that.is.an('array'); expect(res.data).to.have.deep.property('list').that.is.an('array');
@@ -137,7 +137,7 @@ describe('军团测试', function() {
if(guildList[index]) { if(guildList[index]) {
let code = guildList[index].code; let code = guildList[index].code;
pinusClient.request('battle.guildHandler.getGuildMember', { code }, (res) => { pinusClient.request('guild.guildHandler.getGuildMember', { code }, (res) => {
// 消息回调 // 消息回调
checkSuccessResponse(res); checkSuccessResponse(res);
expect(res.data).to.have.deep.property('list').that.is.an('array'); expect(res.data).to.have.deep.property('list').that.is.an('array');
game-server/test/task.test.ts
+1 -1
View File
@@ -20,7 +20,7 @@ describe('任务测试', function () {
clearInterval(timer); clearInterval(timer);
done(); done();
} }
}, 500); }, 1000);
}); });
afterEach(function (done) { afterEach(function (done) {