@@ -75,6 +75,7 @@ describe('273. jsonDualityView2.js', function() {
7575 const pwd = testsUtil . generateRandomPassword ( ) ;
7676
7777 dbaConn = await oracledb . getConnection ( dbaCredential ) ;
78+ 7879 await dbaConn . execute ( `CREATE USER jsonDv2 IDENTIFIED BY ${ pwd } ` ) ;
7980 await dbaConn . execute ( `GRANT CREATE SESSION, RESOURCE, CONNECT,
8081 UNLIMITED TABLESPACE TO jsonDv2` ) ;
@@ -87,9 +88,12 @@ describe('273. jsonDualityView2.js', function() {
8788 after ( async function ( ) {
8889 if ( ! isRunnable ) return ;
8990
90- await connection . close ( ) ;
91- await dbaConn . execute ( `DROP USER jsonDv2 CASCADE` ) ;
92- await dbaConn . close ( ) ;
91+ if ( connection ) await connection . close ( ) ;
92+ 93+ if ( dbaConn ) {
94+ await dbaConn . execute ( `DROP USER jsonDv2 CASCADE` ) ;
95+ await dbaConn . close ( ) ;
96+ }
9397 } ) ;
9498
9599 it ( '273.1 without base table being available (use force option at view creation)' , async function ( ) {
@@ -339,6 +343,7 @@ describe('273. jsonDualityView2.js', function() {
339343 if ( dbConfig . test . drcp ) {
340344 this . skip ( ) ;
341345 }
346+ 342347 await dbaConn . execute ( createUser1 ) ;
343348 await dbaConn . execute ( grantPriv1 ) ;
344349 await dbaConn . execute ( createUser2 ) ;
@@ -358,10 +363,15 @@ describe('273. jsonDualityView2.js', function() {
358363 if ( dbConfig . test . drcp ) {
359364 return ;
360365 }
361- await conn2 . close ( ) ;
362- await conn1 . close ( ) ;
363- await dbaConn . execute ( `DROP USER njs_test1 CASCADE` ) ;
364- await dbaConn . execute ( `DROP USER njs_test2 CASCADE` ) ;
366+ 367+ if ( conn2 ) await conn2 . close ( ) ;
368+ 369+ if ( conn1 ) await conn1 . close ( ) ;
370+ 371+ if ( dbaConn ) {
372+ await dbaConn . execute ( `DROP USER njs_test1 CASCADE` ) ;
373+ await dbaConn . execute ( `DROP USER njs_test2 CASCADE` ) ;
374+ }
365375 } ) ;
366376
367377 it ( '273.9.1 Base table in one schema and View in another schema' , async function ( ) {
@@ -508,6 +518,7 @@ describe('273. jsonDualityView2.js', function() {
508518 if ( dbConfig . test . drcp ) {
509519 this . skip ( ) ;
510520 }
521+ 511522 await dbaConn . execute ( `CREATE USER njs_testuser1 IDENTIFIED BY ${ pwd } ` ) ;
512523 await dbaConn . execute ( `GRANT CREATE SESSION, RESOURCE, CREATE TABLE,
513524 UNLIMITED TABLESPACE TO njs_testuser1` ) ;
@@ -518,7 +529,10 @@ describe('273. jsonDualityView2.js', function() {
518529 if ( dbConfig . test . drcp ) {
519530 return ;
520531 }
521- await dbaConn . execute ( `DROP USER njs_testuser1 CASCADE` ) ;
532+ 533+ if ( dbaConn ) {
534+ await dbaConn . execute ( `DROP USER njs_testuser1 CASCADE` ) ;
535+ }
522536 } ) ;
523537
524538 it ( '273.10.1 redaction enabled on a base table' , async function ( ) {
0 commit comments