converting tests to only read csv files once and pass into json2csv and csv2json test files

Author: mrodrig

test/testCsv2Json.js

@@ -2,14 +2,11 @@ var should = require('should'),
     assert = require('assert'),
     converter = require('../lib/converter'),
     constants = require('../lib/constants'),
-    fs = require('fs'),
     _ = require('underscore'),
     Promise = require('bluebird'),
-    async = require('async'),
     defaultOptions = constants.DefaultOptions,
-    jsonTestData = require('./testJsonFilesList'),
-    csvTestData  = {unQuoted: {}, quoted: {}}, // Document where all csv files will be loaded into
-    csvFiles = require('./testCsvFilesList'),
+    jsonTestData,
+    csvTestData,
     options;
 
 var csv2jsonTests = function () {
@@ -1226,27 +1223,12 @@ var csv2jsonTests = function () {
     });
 };
 
-var readCsvFile = function (masterKey, fileInfo, callback) {
-    csvTestData[masterKey][fileInfo.key] = fs.readFileSync(fileInfo.file).toString();
-    return callback(null, csvTestData[masterKey][fileInfo.key]);
-};
-
 module.exports = {
-    runTests: function () {
-        describe('csv2json', function() {
-            before(function(done) {
-                async.parallel(
-                    _.flatten(_.map(csvFiles, function (grouping) {
-                        return _.map(grouping.files, function (fileInfo) {
-                            return _.partial(readCsvFile, grouping.key, fileInfo);
-                        });
-                    })),
-                    function(err, results) {
-                        if (err) throw err;
-                        done();
-                    });
-            });
+    runTests: function (testData) {
+        jsonTestData = testData.jsonTestData;
+        csvTestData  = testData.csvTestData;
 
+        describe('csv2json', function() {
             beforeEach(function () {
                 options = null;
             });

test/testJson2Csv.js

@@ -2,14 +2,11 @@ var should = require('should'),
     assert = require('assert'),
     converter = require('../lib/converter'),
     constants = require('../lib/constants'),
-    fs = require('fs'),
     _ = require('underscore'),
     Promise = require('bluebird'),
-    async = require('async'),
     defaultOptions = constants.DefaultOptions,
-    jsonTestData = require('./testJsonFilesList'),
-    csvTestData  = {unQuoted: {}, quoted: {}}, // Document where all csv files will be loaded into
-    csvFiles = require('./testCsvFilesList'),
+    jsonTestData,
+    csvTestData,
     options;
 
 var json2csvTests = function () {
@@ -1450,27 +1447,12 @@ var json2csvTests = function () {
     });
 };
 
-var readCsvFile = function (masterKey, fileInfo, callback) {
-    csvTestData[masterKey][fileInfo.key] = fs.readFileSync(fileInfo.file).toString();
-    return callback(null, csvTestData[masterKey][fileInfo.key]);
-};
-
 module.exports = {
-    runTests: function () {
-        describe('json2csv', function() {
-            before(function(done) {
-                async.parallel(
-                    _.flatten(_.map(csvFiles, function (grouping) {
-                        return _.map(grouping.files, function (fileInfo) {
-                            return _.partial(readCsvFile, grouping.key, fileInfo);
-                        });
-                    })),
-                    function(err, results) {
-                        if (err) throw err;
-                        done();
-                    });
-            });
+    runTests: function (testData) {
+        jsonTestData = testData.jsonTestData;
+        csvTestData  = testData.csvTestData;
 
+        describe('json2csv', function() {
             beforeEach(function () {
                 options = null;
             });

test/tests.js

@@ -1,7 +1,31 @@
 var json2csvTests = require('./testJson2Csv'),
-    csv2jsonTests = require('./testCsv2Json');
+    csv2jsonTests = require('./testCsv2Json'),
+    jsonTestData = require('./testJsonFilesList'),
+    async = require('async'),
+    fs = require('fs'),
+    _ = require('underscore'),
+    csvTestData  = {unQuoted: {}, quoted: {}}, // Document where all csv files will be loaded into
+    csvFiles = require('./testCsvFilesList');
+
+var readCsvFile = function (masterKey, fileInfo, callback) {
+    csvTestData[masterKey][fileInfo.key] = fs.readFileSync(fileInfo.file).toString();
+    return callback(null, csvTestData[masterKey][fileInfo.key]);
+};
 
 describe('json-2-csv Module', function() {
-    json2csvTests.runTests();
-    csv2jsonTests.runTests();
+    before(function(done) {
+        async.parallel(
+            _.flatten(_.map(csvFiles, function (grouping) {
+                return _.map(grouping.files, function (fileInfo) {
+                    return _.partial(readCsvFile, grouping.key, fileInfo);
+                });
+            })),
+            function(err, results) {
+                if (err) throw err;
+                done();
+            });
+    });
+
+    json2csvTests.runTests({jsonTestData: jsonTestData, csvTestData: csvTestData});
+    csv2jsonTests.runTests({jsonTestData: jsonTestData, csvTestData: csvTestData});
 });