Skip to content

Commit

Permalink
More example and test updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@sharadraju
sharadraju committed Jun 5, 2023
1 parent fbeda64 commit f189de2
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 25 deletions.
2 changes: 1 addition & 1 deletion examples/typehandlernum.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ async function run() {
v = parseFloat(v);
return v;
};
return {type: oracledb.STRING, converter: converter};
return {type: oracledb.DB_TYPE_VARCHAR, converter: converter};
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions test/dbObject9.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ describe('208. dbObject9.js', function() {
END;
`;

(dbConfig.test.isCmanTdm ? it : it.skip)('208.2 Implicit results that fetch objects', async () => {
it('208.2 Implicit results that fetch objects', async function() {
if (dbConfig.test.isCmanTdm) this.skip();
const result = await conn.execute(queryImpres);
const rows = result.implicitResults[0];
for (let i = 0; i < PEOPLE.length; i++) {
Expand All @@ -159,7 +160,8 @@ describe('208. dbObject9.js', function() {
}
}); // 208.2

(dbConfig.test.isCmanTdm ? it : it.skip)('208.3 Implicit results that fetch objects with Result Set', async () => {
it('208.3 Implicit results that fetch objects with Result Set', async function() {
if (dbConfig.test.isCmanTdm) this.skip();
const result = await conn.execute(queryImpres, [], { resultSet: true});
const rows = await result.implicitResults[0].getRows(PEOPLE.length);
for (let i = 0; i < PEOPLE.length; i++) {
Expand Down
12 changes: 8 additions & 4 deletions test/dbType01.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,26 +121,30 @@ describe('226. dbType01.js', function() {
assert.match(result.rows[0][0], /Typ=2 Len=2/);
});

(dbConfig.test.isCmanTdm ? it : it.skip)('226.10 DB_TYPE_BINARY_FLOAT', async () => {
it('226.10 DB_TYPE_BINARY_FLOAT', async function() {
if (dbConfig.test.isCmanTdm) this.skip();
const bindVal = { BIND1: {val: numInVal, type: oracledb.DB_TYPE_BINARY_FLOAT}};
const result = await conn.execute(SQL, bindVal);
assert.match(result.rows[0][1], /Typ=100 Len=4/);
});

(dbConfig.test.isCmanTdm ? it : it.skip)('226.11 DB_TYPE_BINARY_DOUBLE', async () => {
it('226.11 DB_TYPE_BINARY_DOUBLE', async function() {
if (dbConfig.test.isCmanTdm) this.skip();
const bindVal = { BIND1: {val: numInVal, type: oracledb.DB_TYPE_BINARY_DOUBLE}};
const result = await conn.execute(SQL, bindVal);
assert.match(result.rows[0][1], /Typ=101 Len=8/);
});

(dbConfig.test.isCmanTdm ? it : it.skip)('226.12 Infinity, DB_TYPE_BINARY_FLOAT', async () => {
it('226.12 Infinity, DB_TYPE_BINARY_FLOAT', async function() {
if (dbConfig.test.isCmanTdm) this.skip();
const num = 1 / 0;
const bindVal = { BIND1: {val: num, type: oracledb.DB_TYPE_BINARY_FLOAT}};
const result = await conn.execute(SQL, bindVal);
assert.match(result.rows[0][1], /Typ=100 Len=4/);
});

(dbConfig.test.isCmanTdm ? it : it.skip)('226.13 Infinity, DB_TYPE_BINARY_DOUBLE', async () => {
it('226.13 Infinity, DB_TYPE_BINARY_DOUBLE', async function() {
if (dbConfig.test.isCmanTdm) this.skip();
const num = 1 / 0;
const bindVal = { BIND1: {val: num, type: oracledb.DB_TYPE_BINARY_DOUBLE}};
const result = await conn.execute(SQL, bindVal);
Expand Down
6 changes: 3 additions & 3 deletions test/jsonDualityViews1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ describe('272. jsonDualityView1.js', function() {
});
});

(dbConfig.test.isCmanTdm ? describe : describe.skip)('272.3.11 Create view without privilege ', function() {
describe('272.3.11 Create view without privilege ', function() {
let connection = null;
let conn = null;
const pwd = testsUtil.generateRandomPassword();
Expand All @@ -753,7 +753,7 @@ describe('272. jsonDualityView1.js', function() {
)`;

before(async function() {
if (dbConfig.test.drcp) {
if (dbConfig.test.drcp || dbConfig.test.isCmanTdm) {
this.skip();
}
const credential = {
Expand All @@ -771,7 +771,7 @@ describe('272. jsonDualityView1.js', function() {
});

after(async function() {
if (dbConfig.test.drcp) {
if (dbConfig.test.drcp || dbConfig.test.isCmanTdm) {
return;
}
await connection.execute(`drop user njs_test1 cascade`);
Expand Down
6 changes: 3 additions & 3 deletions test/jsonDualityViews2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const assert = require('assert');
const dbConfig = require('./dbconfig.js');
const testsUtil = require('./testsUtil.js');

(dbConfig.test.isCmanTdm ? describe : describe.skip)('273. jsonDualityView2.js', function() {
describe('273. jsonDualityView2.js', function() {

let connection = null;
let dbaConn = null;
Expand All @@ -47,7 +47,7 @@ const testsUtil = require('./testsUtil.js');
if (isRunnable) {
isRunnable = await testsUtil.checkPrerequisites(2100000000, 2300000000);
}
if (!isRunnable) {
if (!isRunnable || dbConfig.test.isCmanTdm) {
this.skip();
}

Expand All @@ -70,7 +70,7 @@ const testsUtil = require('./testsUtil.js');
});

after(async function() {
if (!isRunnable) return;
if (!isRunnable || dbConfig.test.isCmanTdm) return;

await connection.close();
await dbaConn.execute(`drop user jsonDv2 CASCADE`);
Expand Down
6 changes: 3 additions & 3 deletions test/jsonDualityViews3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const assert = require('assert');
const dbConfig = require('./dbconfig.js');
const testsUtil = require('./testsUtil.js');

(dbConfig.test.isCmanTdm ? describe : describe.skip)('274 jsonDualityView3.js', function() {
describe('274 jsonDualityView3.js', function() {

let connection = null;
let dbaConn = null;
Expand All @@ -47,7 +47,7 @@ const testsUtil = require('./testsUtil.js');
if (isRunnable) {
isRunnable = await testsUtil.checkPrerequisites(2100000000, 2300000000);
}
if (!isRunnable) {
if (!isRunnable || dbConfig.test.isCmanTdm) {
this.skip();
}

Expand All @@ -69,7 +69,7 @@ const testsUtil = require('./testsUtil.js');
});

after(async function() {
if (!isRunnable) return;
if (!isRunnable || dbConfig.test.isCmanTdm) return;

await connection.close();
await dbaConn.execute(`drop user njs_jsonDv3 CASCADE`);
Expand Down
6 changes: 3 additions & 3 deletions test/jsonDualityViews4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const assert = require('assert');
const dbConfig = require('./dbconfig.js');
const testsUtil = require('./testsUtil.js');

(dbConfig.test.isCmanTdm ? describe : describe.skip)('275. jsonDualityView4.js', function() {
describe('275. jsonDualityView4.js', function() {

let connection = null;
let dbaConn = null;
Expand All @@ -47,7 +47,7 @@ const testsUtil = require('./testsUtil.js');
if (isRunnable) {
isRunnable = await testsUtil.checkPrerequisites(2100000000, 2300000000);
}
if (!isRunnable) {
if (!isRunnable || dbConfig.test.isCmanTdm) {
this.skip();
}

Expand Down Expand Up @@ -99,7 +99,7 @@ const testsUtil = require('./testsUtil.js');
});

after(async function() {
if (!isRunnable) return;
if (!isRunnable || dbConfig.test.isCmanTdm) return;

await connection.execute(`drop table student PURGE`);
await connection.execute(`drop table class PURGE`);
Expand Down
6 changes: 3 additions & 3 deletions test/jsonDualityViews5.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const assert = require('assert');
const dbConfig = require('./dbconfig.js');
const testsUtil = require('./testsUtil.js');

(dbConfig.test.isCmanTdm ? describe : describe.skip)('276. jsonDualityView5.js', function() {
describe('276. jsonDualityView5.js', function() {

let connection = null;
let dbaConn = null;
Expand All @@ -47,7 +47,7 @@ const testsUtil = require('./testsUtil.js');
if (isRunnable) {
isRunnable = await testsUtil.checkPrerequisites(2100000000, 2300000000);
}
if (!isRunnable) {
if (!isRunnable || dbConfig.test.isCmanTdm) {
this.skip();
}

Expand Down Expand Up @@ -98,7 +98,7 @@ const testsUtil = require('./testsUtil.js');
});

after(async function() {
if (!isRunnable) return;
if (!isRunnable || dbConfig.test.isCmanTdm) return;

//await connection.execute(`drop table student_class PURGE`);
await connection.execute(`drop table student_class PURGE`);
Expand Down
6 changes: 3 additions & 3 deletions test/jsonDualityViews6.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ const assert = require('assert');
const dbConfig = require('./dbconfig.js');
const testsUtil = require('./testsUtil.js');

(dbConfig.test.isCmanTdm ? describe : describe.skip)('277. jsonDualityView6.js', function() {
describe('277. jsonDualityView6.js', function() {

let connection = null;
let dbaConn = null;
let isRunnable = false;

before(async function() {
isRunnable = await testsUtil.checkPrerequisites(2100000000, 2300000000);
if (dbConfig.test.drcp || !(isRunnable && dbConfig.test.DBA_PRIVILEGE)) {
if (dbConfig.test.drcp || !(isRunnable && dbConfig.test.DBA_PRIVILEGE) || dbConfig.test.isCmanTdm) {
this.skip();
}

Expand All @@ -65,7 +65,7 @@ const testsUtil = require('./testsUtil.js');
});

after(async function() {
if (dbConfig.test.drcp || !isRunnable) return;
if (dbConfig.test.drcp || !isRunnable || dbConfig.test.isCmanTdm) return;
await connection.close();

await dbaConn.execute(`drop user njs_jsonDv6 cascade`);
Expand Down

0 comments on commit f189de2

Please sign in to comment.