LOB test portability changes

cjbj · cjbj · commit aba946781179 · 2015-11-17T11:33:05.000+11:00
diff --git a/test/dataTypeClob.js b/test/dataTypeClob.js
@@ -36,7 +36,7 @@
  *     51 onwards are for other tests  
  * 
  *****************************************************************************/
-"use strict"
+"use strict";
 
 var oracledb = require('oracledb');
 var fs       = require('fs');
@@ -222,45 +222,6 @@ describe('40. dataTypeClob.js', function() {
      
     }) // 40.1.1
 
-    it('40.1.2 catches Error event correctly', function(done) {
-      var lobErrorEvent = false;
-      setTimeout( function() {
-        lobErrorEvent.should.equal(true, "LOB should catch the 'error' event!");
-        done();
-      }, 1000);
-
-      connection.execute(
-        "INSERT INTO oracledb_myclobs (num, content) VALUES (:n, EMPTY_CLOB()) RETURNING content INTO :lobbv",
-        { n: 2, lobbv: {type: oracledb.CLOB, dir: oracledb.BIND_OUT} },
-        { autoCommit: true },
-        function(err, result) {
-          should.not.exist(err);
-          (result.rowsAffected).should.be.exactly(1);
-          (result.outBinds.lobbv.length).should.be.exactly(1);
-
-          var inStream = fs.createReadStream(inFileName);
-          var lob = result.outBinds.lobbv[0];
-
-          lob.on('error', function(err) {
-            should.exist(err, "lob.on 'error' event");
-            (err.message).should.startWith('ORA-22990');
-            // ORA-22990: LOB locators cannot span transactions
-            lobErrorEvent = true;
-          });
-
-          inStream.on('error', function(err) {
-            should.not.exist(err, "inStream.on 'error' event");
-          });
-
-          inStream.on('end', function() {
-            connection.commit( function(err) {
-              should.not.exist(err);
-            });
-          });
-          inStream.pipe(lob); 
-        }
-      );
-    })
   }) // 40.1
 
   describe('40.2 stores null value correctly', function() {
diff --git a/test/list.txt b/test/list.txt
@@ -374,7 +374,6 @@
 40. dataTypeClob.js
     40.1 testing CLOB data type
         40.1.1 stores CLOB value correctly 
-        40.1.2 catches Error event correctly
     40.2 stores null value correctly
         40.2.1 testing Null, Empty string and Undefined
 
@@ -489,17 +488,8 @@
         58.3.4 action (write-only)
         58.3.5 module (write-only)
         58.3.6 oracleServerVersion (read-only)
-    58.4 Lob Class
-        58.4.1 chunkSize (read-only)
-        58.4.2 length (read-only)
-        58.4.3 pieceSize - default value is chunkSize
-        58.4.4 pieceSize - can be increased
-        58.4.5 pieceSize - can be decreased
-        58.4.6 pieceSize - can be zero
-        58.4.6 pieceSize - cannot be less than zero
-        58.4.7 type (read-only)
-    58.5 ResultSet Class
-        58.5.1 metaData (read-only)
+    58.4 ResultSet Class
+        58.4.1 metaData (read-only)
 
 59. lobResultSet.js
     59.1 CLOB data
@@ -509,4 +499,11 @@
     60.1 PL/SQL OUT CLOB parameters can also be bound as STRING
     60.2 The returned length is limited to the maximum size
 
-61. 
+61. checkClassesTypes.js
+     61.1 Oracledb class
+     61.2 Connection class
+     61.3 Lob Class
+
+62. lobProperties.js
+
+63. lobErrorEvent.js
diff --git a/test/properties.js b/test/properties.js
@@ -398,288 +398,7 @@ describe('58. properties.js', function() {
 
   }) // 58.3
 
-  describe('58.4 Lob Class', function() {
-    
-    var connection = null;
-    var clobTableName = "oracledb_myclobs";
-    var blobTableName = "oracledb_myblobs";
-    var clob = null,
-        blob = null;
-    var defaultValues = {};
-
-    beforeEach('prepare CLOB/BLOB tables', function(done) {
-      async.series([
-        function(cb) {
-          oracledb.getConnection(credential, function(err, conn) {
-            should.not.exist(err);
-            connection = conn;
-            cb();
-          });
-        },
-        function(cb) {
-          assist.createTable(connection, clobTableName, cb);
-        },
-        function(cb) {
-          assist.createTable(connection, blobTableName, cb);
-        },
-        function insertClobData(cb) {
-          
-          var sql = "INSERT INTO " + clobTableName + 
-                 " VALUES (:n, EMPTY_CLOB()) RETURNING content INTO :lobbv";
-          var id = 1;
-          var bindVar = { n: id, lobbv: { type: oracledb.CLOB, dir: oracledb.BIND_OUT } };
-          var inFileName = './test/clobexample.txt';
-          
-          insertLob(sql, bindVar, inFileName, cb);
-        },
-        function insertBlobData(cb) {
- 
-          var sql = "INSERT INTO " + blobTableName + 
-                " VALUES(:n, EMPTY_BLOB()) RETURNING content INTO :lobbv";
-          var id = 1;
-          var bindVar = { n: id, lobbv: { type: oracledb.BLOB, dir: oracledb.BIND_OUT } };
-          var inFileName = './test/fuzzydinosaur.jpg';
-
-          insertLob(sql, bindVar, inFileName, cb);
-        },
-        function getClobData(cb) {
-          getLob(clobTableName, cb);
-        },
-        function getBlobData(cb) {
-          getLob(blobTableName, cb);
-        },
-        function keepOriginalValue(cb) {
-          defaultValues.chunkSize = clob.chunkSize;
-          cb();
-        }
-      ], done);
-    }) // before
-
-    afterEach('drop tables, release connection', function(done) {
-      async.series([
-        function(cb) {
-          clob.pieceSize = defaultValues.chunkSize;
-          blob.pieceSize = defaultValues.chunkSize;
-          cb();
-        },
-        function(cb) {
-          dropTable(clobTableName, cb);
-        },
-        function(cb) {
-          dropTable(blobTableName, cb);
-        },
-        function(cb) {
-          connection.release( function(err) {
-            should.not.exist(err);
-            cb();
-          });
-        }
-      ], done);
-    }) // after
-
-
-    it('58.4.1 chunkSize (read-only)', function() {
-      var t1 = clob.chunkSize,
-          t2 = blob.chunkSize;
-
-      t1.should.be.a.Number;
-      t2.should.be.a.Number;
-      t1.should.eql(defaultValues.chunkSize); 
-      t1.should.eql(t2);
-
-      try {
-        clob.chunkSize = t1 + 1;
-      } catch(err) {
-        should.exist(err);
-        // console.log(err.message);
-        // Cannot assign to read only property 'chunkSize' of #<Lob>
-      }
-
-      try {
-        blob.chunkSize = t2 + 1;
-      } catch(err) {
-        should.exist(err);
-        // console.log(err.message);
-        // Cannot assign to read only property 'chunkSize' of #<Lob>
-      }
-    }) // 58.4.1
-
-    it('58.4.2 length (read-only)', function() {
-      var t1 = clob.length,
-          t2 = blob.length;
-      
-      t1.should.be.a.Number;
-      t2.should.be.a.Number;
-
-      t1.should.not.eql(t2);
-      
-      try {
-        clob.length = t1 + 1;
-      } catch(err) {
-        should.exist(err);
-        //console.log(err.message);
-        // Cannot set property length of #<Lob> which has only a getter
-      }
-
-      try {
-        blob.length = t2 + 1;
-      } catch(err) {
-        should.exist(err);
-        //console.log(err.message);
-        // Cannot set property length of #<Lob> which has only a getter
-      }
-
-    })
-
-    it('58.4.3 pieceSize - default value is chunkSize', function() {
-      var t1 = clob.pieceSize,
-          t2 = blob.pieceSize;
-
-      t1.should.eql(defaultValues.chunkSize);
-      t2.should.eql(defaultValues.chunkSize);
-    })
-
-    it('58.4.4 pieceSize - can be increased', function() {
-      var defaultChunkSize = defaultValues.chunkSize;
-      var incresedVal = defaultChunkSize * 5;
-
-      clob.pieceSize *= 5; 
-      blob.pieceSize *= 5;
-      (clob.pieceSize).should.eql(incresedVal);
-      (blob.pieceSize).should.eql(incresedVal);
-    })
-
-    it('58.4.5 pieceSize - can be decreased', function() {
-      var defaultChunkSize = defaultValues.chunkSize;
-      
-      defaultChunkSize.should.greaterThan(500);
-      var decreaseVal = defaultChunkSize - 500;
-
-      clob.pieceSize -= 500;
-      blob.pieceSize -= 500;
-      (clob.pieceSize).should.eql(decreaseVal);
-      (blob.pieceSize).should.eql(decreaseVal);
-    })
-
-    it('58.4.6 pieceSize - can be zero', function() {
-      clob.pieceSize = 0;
-      blob.pieceSize = 0;
-
-      (clob.pieceSize).should.eql(0);
-      (blob.pieceSize).should.eql(0);
-    })
-
-    it('58.4.6 pieceSize - cannot be less than zero', function() {
-      try {
-        clob.pieceSize = -100;
-      } catch(err) {
-        should.exist(err);
-        (err.message).should.startWith('NJS-004');
-        // NJS-004: invalid value for property pieceSize
-      }    
-
-      try {
-        blob.pieceSize = -100;
-      } catch(err) {
-        should.exist(err);
-        (err.message).should.startWith('NJS-004');
-        // NJS-004: invalid value for property pieceSize
-      }   
-    })
-
-    it('58.4.7 type (read-only)', function() {
-      var t1 = clob.type,
-          t2 = blob.type;
-
-      t1.should.eql(oracledb.CLOB);
-      t2.should.eql(oracledb.BLOB);
-
-      try {
-        clob.type = t2;
-      } catch(err) {
-        should.exist(err);
-        // console.log(err);
-        // [TypeError: Cannot set property type of #<Lob> which has only a getter]
-      }
-
-      try {
-        blob.type = t1;
-      } catch(err) {
-        should.exist(err);
-        // console.log(err);
-        // [TypeError: Cannot set property type of #<Lob> which has only a getter]
-      }
-    })
-
-    function getLob(tableName, cb)
-    {
-      connection.execute(
-        "SELECT content FROM " + tableName + " WHERE num = : id",
-        { id: 1 },
-        function(err, result) {
-          should.not.exist(err);
-          var lob = result.rows[0][0];
-          should.exist(lob);
-
-          if (tableName == clobTableName) {
-            clob = lob;
-            // console.log("Get clob data");
-          } else if (tableName == blobTableName) {
-            blob = lob;
-            // console.log("Get blob data");
-          } else {
-            console.log("passing wrong table name.");
-          }
-
-          cb();
-        }
-      );
-    }
-
-    function dropTable(tableName, cb) 
-    {
-      connection.execute(
-        "DROP TABLE " + tableName,
-        function(err) {
-          should.not.exist(err);
-          cb();
-        }
-      );
-    }
-
-    function insertLob(sql, bindVar, inFileName, cb) 
-    { 
-      connection.execute(
-        sql,
-        bindVar,
-        function(err, result) {
-          should.not.exist(err);
-          var lob = result.outBinds.lobbv[0];
-          var inStream = fs.createReadStream(inFileName);
-
-          inStream.on('end', function() {
-            connection.commit( function(err) {
-              should.not.exist(err);
-              cb();
-            });
-          });
-
-          inStream.on('error', function(err) {
-            should.not.exist(err);
-          });
-
-          lob.on('error', function(err) {
-            should.not.exist(err);
-          });
-
-          inStream.pipe(lob);
-        }
-      );
-    }
-
-  }) // 58.4
-
-  describe('58.5 ResultSet Class', function() {
+  describe('58.4 ResultSet Class', function() {
     
     var tableName = "oracledb_number";
     var numbers = assist.data.numbers;
@@ -727,7 +446,7 @@ describe('58. properties.js', function() {
       );
     })
 
-    it('58.5.1 metaData (read-only)', function() {
+    it('58.4.1 metaData (read-only)', function() {
       should.exist(resultSet.metaData);
       var t = resultSet.metaData;
       t.should.eql( [ { name: 'NUM' }, { name: 'CONTENT' } ] );
