Refactor metadata tests

Author: Christopher Jones

test/binding.js

@@ -794,6 +794,7 @@ describe('4. binding.js', function() {
                sql,
                binds,
                function ( err, result ) {
+                 (result.rows[0][0]).should.be.a.Date();
                  should.not.exist ( err );
                  done ();
                }
@@ -815,6 +816,7 @@ describe('4. binding.js', function() {
                sql,
                binds,
                function ( err, result ) {
+                 (result.rows[0][0]).should.be.a.Date();
                  should.not.exist ( err );
                  done ();
                } );
@@ -835,6 +837,7 @@ describe('4. binding.js', function() {
                sql,
                binds,
                function ( err, result ) {
+                 (result.rows[0][0]).should.be.a.Date();
                  should.not.exist ( err );
                  done ();
                } );
@@ -855,6 +858,7 @@ describe('4. binding.js', function() {
                sql,
                binds,
                function ( err, result ) {
+                 (result.rows[0][0]).should.be.a.Date();
                  should.not.exist ( err );
                  done ();
                } );
@@ -875,7 +879,7 @@ describe('4. binding.js', function() {
               binds,
               function ( err, result ) {
                 should.exist ( err );
-                (err.message).should.startWith ( 'NJS-044');
+                (err.message).should.startWith ( 'NJS-044:');
                 done ();
              } );
          });
@@ -895,7 +899,7 @@ describe('4. binding.js', function() {
               binds,
               function ( err, result ) {
                 should.exist ( err );
-                (err.message).should.startWith ( 'NJS-044');
+                (err.message).should.startWith ( 'NJS-044:');
                 done ();
               } );
          });
@@ -915,10 +919,10 @@ describe('4. binding.js', function() {
               binds,
               function ( err, result ) {
                 should.exist ( err );
-                (err.message).should.startWith ( 'NJS-044');
+                (err.message).should.startWith ( 'NJS-044:');
                 done ();
               } );
           });
-      });
-  });
+      }); // 4.7.7
+  }); // 4.7
 })

test/extendedMetaData.js

@@ -1455,6 +1455,7 @@ describe('17. extendedMetaData.js', function() {
             [],
             { outFormat: oracledb.OBJECT, extendedMetaData: true },
             function(err, result) {
+              oracledb.fetchAsString = [];
               should.not.exist(err);
               (result.rows[0]).DT.should.be.a.String();
               (result.rows[0]).NUM.should.be.a.String();
@@ -1475,13 +1476,13 @@ describe('17. extendedMetaData.js', function() {
               cb();
             }
           );
+        },
+        function(cb) {
+          var defaultValue = [];
+          (oracledb.fetchAsString).should.eql(defaultValue);
+          cb();
         }
-      ], function(err) {
-        should.not.exist(err);
-        var defaultValue = [];
-        oracledb.fetchAsString = defaultValue;
-        done();
-      });
+      ], done);
 
     }); // 17.6.2
 
@@ -1498,6 +1499,7 @@ describe('17. extendedMetaData.js', function() {
             [],
             { outFormat: oracledb.OBJECT, extendedMetaData: true },
             function(err, result) {
+              oracledb.fetchAsString = [];
               should.not.exist(err);
               (result.rows[0]).DT.should.be.a.String();
               (result.rows[0]).NUM.should.be.a.String();
@@ -1518,12 +1520,13 @@ describe('17. extendedMetaData.js', function() {
               cb();
             }
           );
+        },
+        function(cb) {
+          var defaultValue = [];
+          (oracledb.fetchAsString).should.eql(defaultValue);
+          cb();
         }
-      ], function(err) {
-        var defaultValue = [];
-        oracledb.fetchAsString = defaultValue;
-        done();
-      });
+      ], done);
 
     }); // 17.6.3