Test updates for 11.2 and also CDBs

cjbj · cjbj · commit b54046804264 · 2020-11-29T09:26:09.000+11:00
diff --git a/test/booleanBind.js b/test/booleanBind.js
@@ -30,12 +30,20 @@ const oracledb  = require('oracledb');
 const should    = require('should');
 const assert    = require('assert');
 const dbconfig  = require('./dbconfig.js');
+const testsUtil = require('./testsUtil.js');
 
-describe('224. booleanBind.js', () => {
+describe('224. booleanBind.js', function()  {
 
   let conn;
+  let isRunnable = false;
+
   const pkgName = 'NODB_PKG_TEST_BOOLEANS';
-  before(async () => {
+  before(async function() {
+    isRunnable = await testsUtil.checkPrerequisites(1200000000, 1200000000);
+    if(!isRunnable) {
+      this.skip();
+    }
+
     let plsqlPkg =`
       create or replace package ${pkgName} as
 
@@ -140,7 +148,11 @@ describe('224. booleanBind.js', () => {
     }
   }); // before()
 
-  after(async() => {
+  after(async function() {
+    if(!isRunnable) {
+      return;
+    }
+    
     try {
       let plsql = `drop package ${pkgName}`;
       await conn.execute(plsql);
@@ -150,7 +162,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // after()
 
-  it('224.1 IN bind boolean value', async() => {
+  it('224.1 IN bind boolean value', async function() {
 
     let binds = {
       inval: true,
@@ -166,7 +178,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.1
 
-  it('224.2 IN bind value "false"', async () => {
+  it('224.2 IN bind value "false"', async function() {
     let binds = {
       inval: false,
       outval: { dir: oracledb.BIND_OUT, type: oracledb.STRING, maxSize: 10 }
@@ -181,7 +193,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.2
 
-  it('224.3 IN bind value "null"', async () => {
+  it('224.3 IN bind value "null"', async function() {
     let binds = {
       inval: { type: oracledb.DB_TYPE_BOOLEAN, val: null },
       outval: { dir: oracledb.BIND_OUT, type: oracledb.STRING, maxSize: 10 }
@@ -196,7 +208,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.3
 
-  it('224.4 Negative - IN bind value type mismatch', async () => {
+  it('224.4 Negative - IN bind value type mismatch', async function() {
     let binds = {
       inval: { type: oracledb.DB_TYPE_BOOLEAN, val: 123 },
       outval: { dir: oracledb.BIND_OUT, type: oracledb.STRING, maxSize: 10 }
@@ -205,7 +217,7 @@ describe('224. booleanBind.js', () => {
 
     try {
       await assert.rejects(
-        async () => {
+        async function() {
           await conn.execute(sql, binds);
         },
         /NJS-011/
@@ -215,7 +227,7 @@ describe('224. booleanBind.js', () => {
     }
   });
 
-  it('224.5 OUT bind value "false"', async () => {
+  it('224.5 OUT bind value "false"', async function() {
     let binds = {
       inval: 12,
       outval: { dir: oracledb.BIND_OUT, type: oracledb.DB_TYPE_BOOLEAN }
@@ -230,7 +242,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.5
 
-  it('224.6 OUT bind value "true"', async () => {
+  it('224.6 OUT bind value "true"', async function() {
     let binds = {
       inval: 9,
       outval: { dir: oracledb.BIND_OUT, type: oracledb.DB_TYPE_BOOLEAN }
@@ -245,7 +257,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.6
 
-  it('224.7 IN bind array with boolean data', async () => {
+  it('224.7 IN bind array with boolean data', async function() {
     try {
       const cls = await conn.getDbObjectClass(`${pkgName}.UDT_BOOLEANLIST`);
       const arr = new cls([true, false, true, true, false, true, false, true]);
@@ -261,7 +273,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.7
 
-  it('224.8 OUT bind array with boolean data', async () => {
+  it('224.8 OUT bind array with boolean data', async function() {
     try {
       const cls = await conn.getDbObjectClass(`${pkgName}.UDT_BOOLEANLIST`);
       const arr = new cls([true, false, true, true, false, true, false, true]);
@@ -277,7 +289,7 @@ describe('224. booleanBind.js', () => {
     }
   }); // 224.8
 
-  it('224.9 INOUT bind record with boolean data', async () => {
+  it('224.9 INOUT bind record with boolean data', async function() {
     try {
       const cls = await conn.getDbObjectClass(`${pkgName}.UDT_DEMORECORD`);
       const obj = new cls();
diff --git a/test/dbObject18.js b/test/dbObject18.js
@@ -32,7 +32,7 @@ const assert    = require('assert');
 
 describe('242. dbObject18.js', () => {
 
-  describe('242.1 set oracledb.dbObjectAsPojon', () => {
+  describe('242.1 set oracledb.dbObjectAsPojo', () => {
 
     before(async () => {
       // Default value of oracledb.dbObjectAsPojo should be false
@@ -82,7 +82,7 @@ describe('242. dbObject18.js', () => {
       } catch (err) {
         should.not.exist(err);
         should.strictEqual(oracledb.dbObjectAsPojo, true);
-        console.log(oracledb.dbObjectAsPojo);
+        // console.log(oracledb.dbObjectAsPojo);
       }
     }); // 242.1.4
 
diff --git a/test/list.txt b/test/list.txt
@@ -4745,7 +4745,7 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
     240.4 PL/SQL syntax error
 
 242. dbObject18.js
-    242.1 set oracledb.dbObjectAsPojon
+    242.1 set oracledb.dbObjectAsPojo
         242.1.1 oracledb.dbObjectAsPojo could be set without connection
         242.1.2 oracledb.dbObjectAsPojo could be set without connection
         242.1.3 set oracledb.dbObjectAsPojo to value of oracledb.autoCommit
diff --git a/test/soda1.js b/test/soda1.js
@@ -40,41 +40,11 @@ describe('164. soda1.js', () => {
     if (!runnable) {
       this.skip();
       return;
-    } else {
-
-      try {
-
-        let credential = {
-          user:          dbconfig.test.DBA_user,
-          password:      dbconfig.test.DBA_password,
-          connectString: dbconfig.connectString,
-          privilege:     oracledb.SYSDBA
-        };
-        const connAsDBA = await oracledb.getConnection(credential);
-
-        let sql = `GRANT SODA_APP TO ${dbconfig.user}`;
-        await connAsDBA.execute(sql);
-        
-        try{
-          sql = `CREATE TABLESPACE tbs_nodesoda DATAFILE 'tbs_nodesoda.dbf' SIZE 300M EXTENT MANAGEMENT LOCAL SEGMENT SPACE MANAGEMENT AUTO`;
-          await connAsDBA.execute(sql);
-        } catch(err){
-          // console.log(err);
-        }
-        
-        sql = `ALTER USER ${dbconfig.user} QUOTA UNLIMITED ON tbs_nodesoda`;
-        await connAsDBA.execute(sql);
-
-        sql = `ALTER USER ${dbconfig.user} default tablespace tbs_nodesoda`;
-        await connAsDBA.execute(sql);
-
-      } catch (err) {
-        should.not.exist(err);
-      }
-
-    }
+    } 
 
     await sodaUtil.cleanup();
+
+    await sodaUtil.grantPrivilege();
   });
 
   it('164.1 getSodaDatabase() creates a sodaDatabase Object', async () => {
diff --git a/test/soda10.js b/test/soda10.js
@@ -51,6 +51,7 @@ describe('178. soda10.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
 
   }); // before()
 
diff --git a/test/soda11.js b/test/soda11.js
@@ -45,6 +45,7 @@ describe('179. soda11.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('179.1 create collection with metadata', async () => {
diff --git a/test/soda12.js b/test/soda12.js
@@ -54,6 +54,7 @@ describe('230. soda12.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   }); // before()
 
   function getMetadata(tableName) {
diff --git a/test/soda13.js b/test/soda13.js
@@ -54,6 +54,7 @@ describe('231. soda13.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   }); // before()
 
   it('231.1 example case', async () => {
diff --git a/test/soda14.js b/test/soda14.js
@@ -61,6 +61,7 @@ describe('238. soda14.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
 
     try {
       conn = await oracledb.getConnection(dbconfig);
diff --git a/test/soda2.js b/test/soda2.js
@@ -43,6 +43,7 @@ describe('165. soda2.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('165.1 create two sodaDatabase objects which point to the same instance', async () => {
diff --git a/test/soda3.js b/test/soda3.js
@@ -49,9 +49,11 @@ describe('167. soda3.js', () => {
       this.skip();
       return;
     }
-
+    
     await sodaUtil.cleanup();
 
+    await sodaUtil.grantPrivilege();
+
     try {
       conn = await oracledb.getConnection(dbconfig);
       sd = conn.getSodaDatabase();
diff --git a/test/soda4.js b/test/soda4.js
@@ -43,6 +43,7 @@ describe('168. soda4.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('168.1 insertOneAndGet() fetches attributes without content', async () => {
diff --git a/test/soda5.js b/test/soda5.js
@@ -45,6 +45,7 @@ describe('173. soda5.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('173.1 create index, basic case', async () => {
diff --git a/test/soda6.js b/test/soda6.js
@@ -45,6 +45,7 @@ describe('174. soda6.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('174.1 filter() basic case', async () => {
diff --git a/test/soda7.js b/test/soda7.js
@@ -45,6 +45,7 @@ describe('175. soda7.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('175.1 count(), basic case', async () => {
diff --git a/test/soda8.js b/test/soda8.js
@@ -45,6 +45,7 @@ describe('176. soda8.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('176.1 replaceOne(), basic case with document content', async () => {
diff --git a/test/soda9.js b/test/soda9.js
@@ -43,6 +43,7 @@ describe('177. soda9.js', () => {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('177.1 insertOne() with a document content', async () => {
diff --git a/test/sodaInstanceof.js b/test/sodaInstanceof.js
@@ -50,6 +50,7 @@ describe('186. sodaInstanceof.js', function() {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
   });
 
   it('186.1 instanceof checks for SODA classes', async function() {
diff --git a/test/sodaOverwrite.js b/test/sodaOverwrite.js
@@ -53,6 +53,7 @@ describe('189. sodaOverwrite.js', function() {
     }
 
     await sodaUtil.cleanup();
+    await sodaUtil.grantPrivilege();
 
     try {
       conn = await oracledb.getConnection(dbConfig);
diff --git a/test/sodaUtil.js b/test/sodaUtil.js
@@ -69,6 +69,37 @@ sodaUtil.cleanup = async function() {
 
 }; // cleanup()
 
+sodaUtil.grantPrivilege=async function(){
+  try {
+    let credential = {
+      user:          dbconfig.test.DBA_user,
+      password:      dbconfig.test.DBA_password,
+      connectString: dbconfig.connectString,
+      privilege:     oracledb.SYSDBA
+    };
+    const connAsDBA = await oracledb.getConnection(credential);
+
+    let sql = `GRANT SODA_APP TO ${dbconfig.user}`;
+    await connAsDBA.execute(sql);
+    
+    try{
+      sql = `CREATE TABLESPACE tbs_nodesoda DATAFILE 'tbs_nodesoda.dbf' SIZE 300M EXTENT MANAGEMENT LOCAL SEGMENT SPACE MANAGEMENT AUTO`;
+      await connAsDBA.execute(sql);
+    } catch(err){
+      // console.log(err);
+    }
+    
+    sql = `ALTER USER ${dbconfig.user} QUOTA UNLIMITED ON tbs_nodesoda container=current`;
+    await connAsDBA.execute(sql);
+
+    sql = `ALTER USER ${dbconfig.user} default tablespace tbs_nodesoda container=current`;
+    await connAsDBA.execute(sql);
+
+  } catch (err) {
+    should.not.exist(err);
+  }
+}; // grantPrivilege()
+
 
 sodaUtil.t_contents = [
   { id: 1001, name: "Gillian", office: "Shenzhen" },

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ describe('178. soda10.js', () => {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`await sodaUtil.cleanup();`
	`54`	`+ await sodaUtil.grantPrivilege();`
`54`	`55`
`55`	`56`	`}); // before()`
`56`	`57`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ describe('179. soda11.js', () => {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`await sodaUtil.cleanup();`
	`48`	`+ await sodaUtil.grantPrivilege();`
`48`	`49`	`});`
`49`	`50`
`50`	`51`	`it('179.1 create collection with metadata', async () => {`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ describe('230. soda12.js', () => {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`await sodaUtil.cleanup();`
	`57`	`+ await sodaUtil.grantPrivilege();`
`57`	`58`	`}); // before()`
`58`	`59`
`59`	`60`	`function getMetadata(tableName) {`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ describe('231. soda13.js', () => {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`await sodaUtil.cleanup();`
	`57`	`+ await sodaUtil.grantPrivilege();`
`57`	`58`	`}); // before()`
`58`	`59`
`59`	`60`	`it('231.1 example case', async () => {`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ describe('238. soda14.js', () => {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`await sodaUtil.cleanup();`
	`64`	`+ await sodaUtil.grantPrivilege();`
`64`	`65`
`65`	`66`	`try {`
`66`	`67`	`conn = await oracledb.getConnection(dbconfig);`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ describe('165. soda2.js', () => {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`await sodaUtil.cleanup();`
	`46`	`+ await sodaUtil.grantPrivilege();`
`46`	`47`	`});`
`47`	`48`
`48`	`49`	`it('165.1 create two sodaDatabase objects which point to the same instance', async () => {`