Skip to content

Commit 231830b

Browse files
sharadrajusharadraju
committed
More refactoring and test file changes
1 parent ac5d0d9 commit 231830b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3955
-6982
lines changed

‎test/binding.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -746,10 +746,10 @@ describe('4. binding.js', function() {
746746
nullable: true,
747747
byteSize: 1
748748
};
749-
assert.deepEqual(cursor.metaData, [expectedBind]);
749+
assert.deepStrictEqual(cursor.metaData, [expectedBind]);
750750

751751
const rows = await cursor.getRows();
752-
assert.deepEqual(rows, [ [ 'X' ] ]);
752+
assert.deepStrictEqual(rows, [ [ 'X' ] ]);
753753
});
754754
});
755755
});

‎test/binding_buffer_string.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* limitations under the License.
2424
*
2525
* NAME
26-
* 263.binding_buffer_string.js
26+
* 270.binding_buffer_string.js
2727
*
2828
* DESCRIPTION
2929
* Test case for bug 33943738
@@ -34,7 +34,7 @@
3434
const oracledb = require('oracledb');
3535
const dbConfig = require('./dbconfig.js');
3636

37-
describe('263. binding_buffer_string.js', function() {
37+
describe('270. binding_buffer_string.js', function() {
3838
let connection = null;
3939

4040
const proc_blob_in_tab = "BEGIN \n" +
@@ -65,9 +65,9 @@ describe('263. binding_buffer_string.js', function() {
6565
await connection.close();
6666
});
6767

68-
describe('263.1 BLOB, PLSQL, BIND_IN', function() {
68+
describe('270.1 BLOB, PLSQL, BIND_IN', function() {
6969

70-
it('263.1.1 works with buffer', async function() {
70+
it('270.1.1 works with buffer', async function() {
7171
const data = [
7272
{a: 1, b: Buffer.from("Dummy data 1".repeat(5000), "utf-8")},
7373
{a: 2, b: Buffer.from("Dummy data 2".repeat(7500), "utf-8")}

‎test/binding_defaultBindIn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
const oracledb = require('oracledb');
3838
const assert = require('assert');
39-
const sql = require('./sqlClone.js');
39+
const sql = require('./sql.js');
4040
const dbConfig = require('./dbconfig.js');
4141

4242
describe('100.binding_defaultBindIn.js', function() {

‎test/binding_functionBindIn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
const oracledb = require('oracledb');
3737
const assert = require('assert');
38-
const sql = require('./sqlClone.js');
38+
const sql = require('./sql.js');
3939
const dbConfig = require('./dbconfig.js');
4040
const assist = require('./dataTypeAssist.js');
4141

‎test/binding_functionBindInout.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
const oracledb = require('oracledb');
3737
const assert = require('assert');
38-
const sql = require('./sqlClone.js');
38+
const sql = require('./sql.js');
3939
const dbConfig = require('./dbconfig.js');
4040
const assist = require('./dataTypeAssist.js');
4141

‎test/binding_functionBindOut.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
const oracledb = require('oracledb');
3737
const assert = require('assert');
38-
const sql = require('./sqlClone.js');
38+
const sql = require('./sql.js');
3939
const dbConfig = require('./dbconfig.js');
4040
const assist = require('./dataTypeAssist.js');
4141

‎test/binding_procedureBindIn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
const oracledb = require('oracledb');
3737
const assert = require('assert');
38-
const sql = require('./sqlClone.js');
38+
const sql = require('./sql.js');
3939
const dbConfig = require('./dbconfig.js');
4040
const assist = require('./dataTypeAssist.js');
4141

‎test/binding_procedureBindInout.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
const oracledb = require('oracledb');
3737
const assert = require('assert');
38-
const sql = require('./sqlClone.js');
38+
const sql = require('./sql.js');
3939
const dbConfig = require('./dbconfig.js');
4040
const assist = require('./dataTypeAssist.js');
4141

‎test/binding_procedureBindOut.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
const oracledb = require('oracledb');
3737
const assert = require('assert');
38-
const sql = require('./sqlClone.js');
38+
const sql = require('./sql.js');
3939
const dbConfig = require('./dbconfig.js');
4040
const assist = require('./dataTypeAssist.js');
4141

‎test/blobDMLReturningMultipleRowsAsBuffer.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
const oracledb = require('oracledb');
3535
const assert = require('assert');
3636
const dbConfig = require('./dbconfig.js');
37-
const sql = require('./sql.js');
3837

3938
describe('137. blobDMLReturningMultipleRowsAsBuffer.js', function() {
4039

@@ -73,12 +72,12 @@ describe('137. blobDMLReturningMultipleRowsAsBuffer.js', function() {
7372
let tabsize = 10;
7473

7574
before(async function() {
76-
await sql.executeSql(connection, blob_table_create, {}, {});
75+
await connection.execute(blob_table_create);
7776
await insertData(tabsize);
7877
});
7978

8079
after(async function() {
81-
await sql.executeSql(connection, blob_table_drop, {}, {});
80+
await connection.execute(blob_table_drop);
8281
});
8382

8483
it('137.1.1 BLOB DML returning multiple rows as buffer', async function() {

‎test/blobDMLReturningMultipleRowsAsStream.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
const oracledb = require('oracledb');
3535
const assert = require('assert');
3636
const dbConfig = require('./dbconfig.js');
37-
const sql = require('./sql.js');
38-
const assist = require('./dataTypeAssist.js');
3937

4038
describe('138. blobDMLReturningMultipleRowsAsStream.js', function() {
4139

@@ -71,13 +69,12 @@ describe('138. blobDMLReturningMultipleRowsAsStream.js', function() {
7169

7270
describe('138.1 BLOB DML returning multiple rows as stream', function() {
7371
before(async function() {
74-
75-
await sql.executeSql(connection, blob_table_create, {}, {});
76-
insertData(10);
72+
await connection.execute(blob_table_create);
73+
await insertData(10);
7774
});
7875

7976
after(async function() {
80-
await sql.executeSql(connection, blob_table_drop, {}, {});
77+
await connection.execute(blob_table_drop);
8178
});
8279

8380
it('138.1.1 BLOB DML returning multiple rows as stream', async function() {
@@ -140,7 +137,7 @@ describe('138. blobDMLReturningMultipleRowsAsStream.js', function() {
140137
lob.on('end', function(err) {
141138
assert(err);
142139
let expected = Buffer.from(String(id - 10), "utf-8");
143-
assert.strictEqual(assist.compare2Buffers(blobData, expected), true);
140+
assert.deepStrictEqual(blobData, expected);
144141
});
145142
};
146143
});

‎test/blobPlsqlBindAsBuffer_bindin.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const assert = require('assert');
3636
const fs = require('fs');
3737
const dbConfig = require('./dbconfig.js');
3838
const random = require('./random.js');
39-
const assist = require('./dataTypeAssist.js');
4039

4140
describe('77. blobPlsqlBindAsBuffer_bindin.js', function() {
4241

@@ -203,7 +202,7 @@ describe('77. blobPlsqlBindAsBuffer_bindin.js', function() {
203202
assert.strictEqual(resultVal.toString('utf8', 0, specStrLength), specialStr);
204203
assert.strictEqual(resultVal.toString('utf8', (totalLength - specStrLength), totalLength), specialStr);
205204
}
206-
assert.strictEqual(assist.compare2Buffers(resultVal, originalBuffer), true);
205+
assert.strictEqual(resultVal, originalBuffer);
207206
};
208207

209208
// execute the bind in plsql procedure

‎test/blobPlsqlBindAsBuffer_bindinout.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const assert = require('assert');
3636
const fs = require('fs');
3737
const dbConfig = require('./dbconfig.js');
3838
const random = require('./random.js');
39-
const assist = require('./dataTypeAssist.js');
4039

4140
describe('79. blobPlsqlBindAsBuffer_bindinout.js', function() {
4241

@@ -152,7 +151,7 @@ describe('79. blobPlsqlBindAsBuffer_bindinout.js', function() {
152151
assert.strictEqual(resultVal.toString('utf8', 0, specStrLength), specialStr);
153152
assert.strictEqual(resultVal.toString('utf8', (resultLength - specStrLength), resultLength), specialStr);
154153
}
155-
assert.strictEqual(assist.compare2Buffers(resultVal, originalBuffer), true);
154+
assert.deepStrictEqual(resultVal, originalBuffer);
156155
};
157156

158157
// execute plsql bind in out procedure, and verify the plsql bind out buffer

‎test/blobPlsqlBindAsBuffer_bindout.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const assert = require('assert');
3636
const fs = require('fs');
3737
const dbConfig = require('./dbconfig.js');
3838
const random = require('./random.js');
39-
const assist = require('./dataTypeAssist.js');
4039

4140
describe('78. blobPlsqlBindAsBuffer_bindout.js', function() {
4241

@@ -116,7 +115,7 @@ describe('78. blobPlsqlBindAsBuffer_bindout.js', function() {
116115
b: { val: insertBuffer, dir: oracledb.BIND_IN, type: oracledb.BUFFER }
117116
};
118117

119-
if (insertBuffer == 'EMPTY_LOB') {
118+
if (insertBuffer === 'EMPTY_LOB') {
120119
sql = "INSERT INTO nodb_tab_blob_in (id, blob_1) VALUES (:i, EMPTY_BLOB())";
121120
bindVar = {
122121
i: { val: id, dir: oracledb.BIND_IN, type: oracledb.NUMBER }
@@ -160,10 +159,10 @@ describe('78. blobPlsqlBindAsBuffer_bindout.js', function() {
160159
assert.deepEqual(originalData, blobData);
161160
};
162161

163-
const verifyBlobValueWithBuffer = async function(selectSql, oraginalBuffer, specialStr) {
162+
const verifyBlobValueWithBuffer = async function(selectSql, originalBuffer, specialStr) {
164163
const result = await connection.execute(selectSql);
165164
const lob = result.rows[0][0];
166-
if (oraginalBuffer == null | oraginalBuffer == '' || oraginalBuffer == undefined) {
165+
if (originalBuffer == null | originalBuffer == '' || originalBuffer == undefined) {
167166
assert(lob);
168167
} else {
169168
const blobData = await lob.getData();
@@ -183,12 +182,12 @@ describe('78. blobPlsqlBindAsBuffer_bindout.js', function() {
183182
assert.strictEqual(resultVal.toString('utf8', 0, specStrLength), specialStr);
184183
assert.strictEqual(resultVal.toString('utf8', (resultLength - specStrLength), resultLength), specialStr);
185184
}
186-
assert.strictEqual(assist.compare2Buffers(resultVal, originalBuffer), true);
185+
assert.deepStrictEqual(resultVal, originalBuffer);
187186
};
188187

189188
const verifyBindOutResult = async function(sqlRun, bindVar, originalBuf, specialStr) {
190189
const result = await connection.execute(sqlRun, bindVar);
191-
if (originalBuf == "EMPTY_LOB" || originalBuf == undefined || originalBuf == null || originalBuf == "") {
190+
if (originalBuf === "EMPTY_LOB" || originalBuf == undefined || originalBuf == null || originalBuf == "") {
192191
assert.strictEqual(result.outBinds.b, null);
193192
} else {
194193
const resultVal = result.outBinds.b;

0 commit comments

Comments
 (0)