Skip to content

Commit d054166

Browse files
sravani1510sravani1510
authored
test: Replace xml2js with fast-xml-parser (#399)
1 parent e0db8f3 commit d054166

6 files changed

+568
-455
lines changed

‎test/functional/CommandCallFunctional.js

+33-24
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: MIT
33

44
const { expect } = require('chai');
5-
const { parseString } = require('xml2js');
5+
const { XMLParser } = require('fast-xml-parser');
66
const { CommandCall, Connection, ProgramCall } = require('../../lib/itoolkit');
77
const { config, printConfig } = require('./config');
88
const { isQSHSupported } = require('./checkVersion');
@@ -18,11 +18,11 @@ describe('CommandCall Functional Tests', function () {
1818
connection.add(new CommandCall({ command: 'RTVJOBA USRLIBL(?) SYSLIBL(?)', type: 'cl' }));
1919
connection.run((error, xmlOut) => {
2020
expect(error).to.equal(null);
21-
parseString(xmlOut, (parseError, result) => {
22-
expect(parseError).to.equal(null);
23-
expect(result.myscript.cmd[0].success[0]).to.include('+++ success RTVJOBA USRLIBL(?) SYSLIBL(?)');
24-
done();
25-
});
21+
const parser = new XMLParser();
22+
let result = parser.parse(xmlOut);
23+
expect(Object.keys(result).length).gt(0);
24+
expect(result.myscript.cmd.success).to.include('+++ success RTVJOBA USRLIBL(?) SYSLIBL(?)');
25+
done();
2626
});
2727
});
2828
});
@@ -35,11 +35,12 @@ describe('CommandCall Functional Tests', function () {
3535
expect(error).to.equal(null);
3636
// xs does not return success property for sh or qsh command calls
3737
// but on error sh or qsh node will not have any inner data
38-
parseString(xmlOut, (parseError, result) => {
39-
expect(parseError).to.equal(null);
40-
expect(result.myscript.sh[0]._).to.match(/(System\sStatus\sInformation)/);
41-
done();
42-
});
38+
39+
const parser = new XMLParser();
40+
let result = parser.parse(xmlOut);
41+
expect(Object.keys(result).length).gt(0);
42+
expect(result.myscript.sh).to.match(/(System\sStatus\sInformation)/);
43+
done();
4344
});
4445
});
4546
});
@@ -53,20 +54,28 @@ describe('CommandCall Functional Tests', function () {
5354
expect(error).to.equal(null);
5455
// xs does not return success property for sh or qsh command calls
5556
// but on error sh or qsh node will not have any inner data
56-
parseString(xmlOut, (parseError, result) => {
57-
expect(parseError).to.equal(null);
58-
const match = result.myscript.pgm[0].version[0].match(/\d\.\d\.\d/);
59-
if (!match) {
60-
throw Error('Unable to determine XMLSERVICE version');
61-
}
62-
if (!isQSHSupported(match[0])) {
63-
// skip if QSH is unsupported
64-
console.log(`XMLSERVICE version ${match[0]} does not support QSH`);
65-
this.skip();
66-
}
67-
expect(result.myscript.qsh[0]._).to.match(/(System\sStatus\sInformation)/);
57+
58+
const parser = new XMLParser();
59+
let result = parser.parse(xmlOut);
60+
expect(Object.keys(result).length).gt(0);
61+
const { version } = result.myscript.pgm;
62+
const match = version.match(/\d\.\d\.\d/);
63+
64+
if (!match) {
65+
done(new Error('Unable to determine XMLSERVICE version'));
66+
return;
67+
}
68+
69+
if (!isQSHSupported(match[0])) {
70+
console.log(`XMLSERVICE version ${match[0]} does not support QSH`);
71+
this.skip();
6872
done();
69-
});
73+
return;
74+
}
75+
const qshContent = result.myscript.qsh;
76+
expect(qshContent).to.match(/(System\sStatus\sInformation)/);
77+
78+
done();
7079
});
7180
});
7281
});

‎test/functional/ProgramCallFunctional.js

+17-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: MIT
33

44
const { expect } = require('chai');
5-
const { parseString } = require('xml2js');
5+
const { XMLParser } = require('fast-xml-parser');
66
const { ProgramCall, Connection } = require('../../lib/itoolkit');
77
const { config, printConfig } = require('./config');
88

@@ -57,11 +57,12 @@ describe('ProgramCall Functional Tests', function () {
5757
connection.add(program);
5858
connection.run((error, xmlOut) => {
5959
expect(error).to.equal(null);
60-
parseString(xmlOut, (parseError, result) => {
61-
expect(parseError).to.equal(null);
62-
expect(result.myscript.pgm[0].success[0]).to.include('+++ success QSYS QWCRSVAL');
63-
done();
64-
});
60+
61+
const parser = new XMLParser();
62+
let result = parser.parse(xmlOut);
63+
expect(Object.keys(result).length).gt(0);
64+
expect(result.myscript.pgm.success).to.include('+++ success QSYS QWCRSVAL');
65+
done();
6566
});
6667
});
6768
});
@@ -76,16 +77,19 @@ describe('ProgramCall Functional Tests', function () {
7677

7778
program.addParam({ type: '10A', varying: '4', value: 'Gill' });
7879
const testValue = 'NEW_NAME';
79-
program.addReturn('0', '20A', { varying: '4', name: testValue });
80+
// program.addReturn('0', '20A', { varying: '4', name: testValue });
81+
program.addReturn({
82+
varying: '4', name: testValue, value: '0', type: '20A',
83+
});
8084
connection.add(program);
8185
connection.run((error, xmlOut) => {
8286
expect(error).to.equal(null);
83-
parseString(xmlOut, (parseError, result) => {
84-
expect(parseError).to.equal(null);
85-
expect(result.myscript.pgm[0].success[0]).to.include('+++ success');
86-
expect(result.myscript.pgm[0].return[0].data[0]._).to.equal('my name is Gill');
87-
done();
88-
});
87+
const parser = new XMLParser();
88+
let result = parser.parse(xmlOut);
89+
expect(Object.keys(result).length).gt(0);
90+
expect(result.myscript.pgm.success).to.include('+++ success');
91+
expect(result.myscript.pgm.return.data).to.equal('my name is Gill');
92+
done();
8993
});
9094
});
9195
});

‎test/functional/deprecated/commandsFunctional.js

+30-25
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* eslint-disable new-cap */
55

66
const { expect } = require('chai');
7-
const { parseString } = require('xml2js');
7+
const { XMLParser } = require('fast-xml-parser');
88
const {
99
iCmd, iSh, iQsh, iConn, iPgm,
1010
} = require('../../../lib/itoolkit');
@@ -41,11 +41,11 @@ describe('iSh, iCmd, iQsh, Functional Tests', function () {
4141
const connection = new iConn(database, username, password, restOptions);
4242
connection.add(iCmd('RTVJOBA USRLIBL(?) SYSLIBL(?)'));
4343
connection.run((xmlOut) => {
44-
parseString(xmlOut, (parseError, result) => {
45-
expect(parseError).to.equal(null);
46-
expect(result.myscript.cmd[0].success[0]).to.include('+++ success RTVJOBA USRLIBL(?) SYSLIBL(?)');
47-
done();
48-
});
44+
const parser = new XMLParser();
45+
let result = parser.parse(xmlOut);
46+
expect(Object.keys(result).length).gt(0);
47+
expect(result.myscript.cmd.success).to.include('+++ success RTVJOBA USRLIBL(?) SYSLIBL(?)');
48+
done();
4949
});
5050
});
5151
});
@@ -57,11 +57,11 @@ describe('iSh, iCmd, iQsh, Functional Tests', function () {
5757
connection.run((xmlOut) => {
5858
// xs does not return success property for sh or qsh command calls
5959
// but on error sh or qsh node will not have any inner data
60-
parseString(xmlOut, (parseError, result) => {
61-
expect(parseError).to.equal(null);
62-
expect(result.myscript.sh[0]._).to.match(/(System\sStatus\sInformation)/);
63-
done();
64-
});
60+
const parser = new XMLParser();
61+
let result = parser.parse(xmlOut);
62+
expect(Object.keys(result).length).gt(0);
63+
expect(result.myscript.sh).to.match(/(System\sStatus\sInformation)/);
64+
done();
6565
});
6666
});
6767
});
@@ -74,20 +74,25 @@ describe('iSh, iCmd, iQsh, Functional Tests', function () {
7474
connection.run((xmlOut) => {
7575
// xs does not return success property for sh or qsh command calls
7676
// but on error sh or qsh node will not have any inner data
77-
parseString(xmlOut, (parseError, result) => {
78-
expect(parseError).to.equal(null);
79-
const match = result.myscript.pgm[0].version[0].match(/\d\.\d\.\d/);
80-
if (!match) {
81-
throw Error('Unable to determine XMLSERVICE version');
82-
}
83-
if (!isQSHSupported(match[0])) {
84-
// skip if QSH is unsupported
85-
console.log(`XMLSERVICE version ${match[0]} does not support QSH`);
86-
this.skip();
87-
}
88-
expect(result.myscript.qsh[0]._).to.match(/(System\sStatus\sInformation)/);
89-
done();
90-
});
77+
const parser = new XMLParser();
78+
let result = parser.parse(xmlOut);
79+
expect(Object.keys(result).length).gt(0);
80+
const { version } = result.myscript.pgm;
81+
const match = version.match(/\d\.\d\.\d/);
82+
83+
if (!match) {
84+
done(new Error('Unable to determine XMLSERVICE version'));
85+
return;
86+
}
87+
88+
if (!isQSHSupported(match[0])) {
89+
// skip if QSH is unsupported
90+
console.log(`XMLSERVICE version ${match[0]} does not support QSH`);
91+
this.skip();
92+
}
93+
const qshContent = result.myscript.qsh;
94+
expect(qshContent).to.match(/(System\sStatus\sInformation)/);
95+
done();
9196
});
9297
});
9398
});

‎test/functional/deprecated/iPgmFunctional.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* eslint-disable new-cap */
55

66
const { expect } = require('chai');
7-
const { parseString } = require('xml2js');
7+
const { XMLParser } = require('fast-xml-parser');
88
const { iPgm, iConn } = require('../../../lib/itoolkit');
99
const { config, printConfig } = require('../config');
1010

@@ -31,7 +31,7 @@ if (config.transport === 'rest') {
3131
describe('iPgm Functional Tests', function () {
3232
before(function () {
3333
printConfig();
34-
});
34+
});
3535

3636
describe('addParam', function () {
3737
it('calls QWCRSVAL program checks if it ran successfully', function (done) {
@@ -56,11 +56,11 @@ describe('iPgm Functional Tests', function () {
5656
program.addParam(this.errno, { io: 'both', len: 'rec2' });
5757
connection.add(program);
5858
connection.run((xmlOut) => {
59-
parseString(xmlOut, (parseError, result) => {
60-
expect(parseError).to.equal(null);
61-
expect(result.myscript.pgm[0].success[0]).to.include('+++ success QSYS QWCRSVAL');
62-
done();
63-
});
59+
const parser = new XMLParser();
60+
let result = parser.parse(xmlOut);
61+
expect(Object.keys(result).length).gt(0);
62+
expect(result.myscript.pgm.success).to.include('+++ success QSYS QWCRSVAL');
63+
done();
6464
});
6565
});
6666
});
@@ -78,12 +78,12 @@ describe('iPgm Functional Tests', function () {
7878
program.addReturn('0', '20A', { varying: '4', name: testValue });
7979
connection.add(program);
8080
connection.run((xmlOut) => {
81-
parseString(xmlOut, (parseError, result) => {
82-
expect(parseError).to.equal(null);
83-
expect(result.myscript.pgm[0].success[0]).to.include('+++ success');
84-
expect(result.myscript.pgm[0].return[0].data[0]._).to.equal('my name is Gill');
85-
done();
86-
});
81+
const parser = new XMLParser();
82+
let result = parser.parse(xmlOut);
83+
expect(Object.keys(result).length).gt(0);
84+
expect(result.myscript.pgm.success).to.include('+++ success');
85+
expect(result.myscript.pgm.return.data).to.equal('my name is Gill');
86+
done();
8787
});
8888
});
8989
});

0 commit comments

Comments
 (0)