Skip to content

Commit e81df91

Browse files
committed
Correct the condition check for client version in some tests
1 parent e5062e9 commit e81df91

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

test/executeMany1.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2018, 2022, Oracle and/or its affiliates. */
1+
/* Copyright (c) 2018, 2024, Oracle and/or its affiliates. */
22

33
/******************************************************************************
44
*
@@ -221,7 +221,7 @@ describe('163. executeMany1.js', function() {
221221

222222
it('163.6 shows dmlRowCounts', async function() {
223223

224-
if ((testsUtil.getClientVersion < 1201000200)
224+
if ((testsUtil.getClientVersion() < 1201000200)
225225
|| (conn.oracleServerVersion < 1201000200)) {
226226
return this.skip();
227227
}
@@ -241,7 +241,7 @@ describe('163. executeMany1.js', function() {
241241

242242
it('163.7 shows batchErrors behavior', async function() {
243243

244-
if ((testsUtil.getClientVersion < 1201000200)
244+
if ((testsUtil.getClientVersion() < 1201000200)
245245
|| (conn.oracleServerVersion < 1201000200)) {
246246
return this.skip();
247247
}
@@ -283,7 +283,7 @@ describe('163. executeMany1.js', function() {
283283

284284
it('163.8 Negative - batchErrors with non-DML statement', async function() {
285285

286-
if (testsUtil.getClientVersion < 1201000200) {
286+
if (testsUtil.getClientVersion() < 1201000200) {
287287
return this.skip();
288288
}
289289

@@ -309,7 +309,7 @@ describe('163. executeMany1.js', function() {
309309

310310
it('163.9 if batchErrors is disabled', async function() {
311311

312-
if (testsUtil.getClientVersion < 1201000200) {
312+
if (testsUtil.getClientVersion() < 1201000200) {
313313
return this.skip();
314314
}
315315

@@ -346,7 +346,7 @@ describe('163. executeMany1.js', function() {
346346
}); // 163.9
347347

348348
it('163.10 Negative - dmlRowCounts with non-DML statement', async function() {
349-
if (testsUtil.getClientVersion < 1201000200) {
349+
if (testsUtil.getClientVersion() < 1201000200) {
350350
return this.skip();
351351
}
352352

@@ -526,7 +526,7 @@ describe('163. executeMany1.js', function() {
526526

527527
it('163.18 Negative - executeMany with SELECT query, positional bind', async function() {
528528

529-
if (testsUtil.getClientVersion < 1201000200) {
529+
if (testsUtil.getClientVersion() < 1201000200) {
530530
return this.skip();
531531
}
532532

@@ -544,7 +544,7 @@ describe('163. executeMany1.js', function() {
544544

545545
it('163.19 Negative - executeMany with SELECT query, named bind', async function() {
546546

547-
if (testsUtil.getClientVersion < 1201000200) {
547+
if (testsUtil.getClientVersion() < 1201000200) {
548548
return this.skip();
549549
}
550550

@@ -562,7 +562,7 @@ describe('163. executeMany1.js', function() {
562562

563563
it('163.20 Negative - executeMany with WITH SQL clause, positional bind', async function() {
564564

565-
if (testsUtil.getClientVersion < 1201000200) {
565+
if (testsUtil.getClientVersion() < 1201000200) {
566566
return this.skip();
567567
}
568568

@@ -580,7 +580,7 @@ describe('163. executeMany1.js', function() {
580580

581581
it('163.21 Negative - executeMany with WITH SQL clause, named bind', async function() {
582582

583-
if (testsUtil.getClientVersion < 1201000200) {
583+
if (testsUtil.getClientVersion() < 1201000200) {
584584
return this.skip();
585585
}
586586

@@ -598,7 +598,7 @@ describe('163. executeMany1.js', function() {
598598

599599
it('163.22 Negative - executeMany with SELECT query, multiple positional binds', async function() {
600600

601-
if (testsUtil.getClientVersion < 1201000200) {
601+
if (testsUtil.getClientVersion() < 1201000200) {
602602
return this.skip();
603603
}
604604

@@ -616,7 +616,7 @@ describe('163. executeMany1.js', function() {
616616

617617
it('163.23 Negative - executeMany with WITH SQL clause and multiple positional binds', async function() {
618618

619-
if (testsUtil.getClientVersion < 1201000200) {
619+
if (testsUtil.getClientVersion() < 1201000200) {
620620
return this.skip();
621621
}
622622

@@ -634,7 +634,7 @@ describe('163. executeMany1.js', function() {
634634

635635
it('163.24 Negative - executeMany with SELECT query and invalid bind variable', async function() {
636636

637-
if (testsUtil.getClientVersion < 1201000200) {
637+
if (testsUtil.getClientVersion() < 1201000200) {
638638
return this.skip();
639639
}
640640

@@ -653,7 +653,7 @@ describe('163. executeMany1.js', function() {
653653
it('163.25 Negative - executeMany with DDL - CREATE TABLE', async function() {
654654

655655
// Does not throw the proper error in Thin mode yet
656-
if (testsUtil.getClientVersion < 1201000200 || oracledb.thin) {
656+
if (testsUtil.getClientVersion() < 1201000200 || oracledb.thin) {
657657
return this.skip();
658658
}
659659

test/listIndexes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ describe('286. listIndexes.js', function() {
4545
let runnable = await testsUtil.isSodaRunnable();
4646
// For listIndexes, Oracle Client library version 19.13 (or later DBRU)
4747
// or version 21.3 (or higher) is needed
48-
runnable = runnable && (testsUtil.getClientVersion >= 1913000000 ||
49-
(testsUtil.getClientVersion >= 2100000000 && testsUtil.getClientVersion >= 2103000000));
50-
if (!oracledb.thin && testsUtil.getClientVersion >= 1803000000) {
48+
runnable = runnable && (testsUtil.getClientVersion() >= 1913000000 ||
49+
(testsUtil.getClientVersion() >= 2100000000 && testsUtil.getClientVersion() >= 2103000000));
50+
if (!oracledb.thin && testsUtil.getClientVersion() >= 1803000000) {
5151
await sodaUtil.cleanup();
5252
}
5353
if (!runnable) {

0 commit comments

Comments
 (0)