Updated common newman tests in call codegens

Author: umeshp7

codegens/csharp-restsharp/test/unit/convert.test.js

@@ -1,8 +1,7 @@
 var expect = require('chai').expect,
   path = require('path'),
   sdk = require('postman-collection'),
-  newmanTestUtil = require('../../../../test/codegen/newman/newmanTestUtil'),
-  async = require('async'),
+  runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
   convert = require('../../lib/index').convert,
   mainCollection = require('./fixtures/testcollection/collection.json'),
   testCollection = require('./fixtures/testcollection/collectionForEdge.json'),
@@ -13,55 +12,17 @@ var expect = require('chai').expect,
 
 describe('csharp restsharp function', function () {
   describe('convert for different request types', function () {
-    var headerSnippet = 'using System;\n' +
-                            'using RestSharp;\n' +
-                            'namespace HelloWorldApplication {\n' +
-                            'class HelloWorld {\n' +
-                            'static void Main(string[] args) {\n',
-      footerSnippet = '}\n}\n}\n',
-      depedenciesPath = path.resolve(__dirname, 'fixtures/dependencies'),
+    var depedenciesPath = path.resolve(__dirname, 'fixtures/dependencies'),
       testConfig = {
         compileScript: `mcs -reference:${depedenciesPath}/RestSharp.dll` +
         ` -out:${depedenciesPath}/main.exe ${depedenciesPath}/main.cs`,
         runScript: `mono  ${depedenciesPath}/main.exe`,
         fileName: `${depedenciesPath}/main.cs`
       },
       options = {
-        indentCount: 1,
-        indentType: 'Tab'
+        includeBoilerplate: true
       };
-    async.waterfall([
-      function (next) {
-        newmanTestUtil.generateSnippet(convert, options, function (error, snippets) {
-          if (error) {
-            expect.fail(null, null, error);
-            return next(error);
-          }
-
-          return next(null, snippets);
-        });
-      },
-      function (snippets, next) {
-        snippets.forEach((item, index) => {
-          it(item.name, function (done) {
-            newmanTestUtil.runSnippet(headerSnippet + item.snippet + footerSnippet, index, testConfig,
-              function (err, result) {
-                if (err) {
-                  expect.fail(null, null, err);
-                }
-                if (typeof result[1] !== 'object' || typeof result[0] !== 'object') {
-                  expect(result[0].toString().trim()).to.include(result[1].toString().trim());
-                }
-                else {
-                  expect(result[0]).deep.equal(result[1]);
-                }
-                return done(null);
-              });
-          });
-        });
-        return next(null);
-      }
-    ]);
+    runNewmanTest(convert, options, testConfig);
   });
 
   describe('csharp-restsharp convert function', function () {

codegens/curl/test/unit/convert.test.js

@@ -1,7 +1,6 @@
 var expect = require('chai').expect,
   sdk = require('postman-collection'),
-  newmanTestUtil = require('../../../../test/codegen/newman/newmanTestUtil'),
-  async = require('async'),
+  runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
   convert = require('../../index').convert,
   getUrlStringfromUrlObject = require('../../lib/util').getUrlStringfromUrlObject;
 
@@ -18,37 +17,8 @@ describe('curl convert function', function () {
         silent: true,
         lineContinuationCharacter: '\\'
       };
-    async.waterfall([
-      function (next) {
-        newmanTestUtil.generateSnippet(convert, options, function (error, snippets) {
-          if (error) {
-            expect.fail(null, null, error);
-            return next(error);
-          }
-
-          return next(null, snippets);
-        });
-      },
-      function (snippets, next) {
-        snippets.forEach((item, index) => {
-          it(item.name, function (done) {
-            newmanTestUtil.runSnippet(item.snippet, index, testConfig,
-              function (err, result) {
-                if (err) {
-                  expect.fail(null, null, err);
-                }
-                if (typeof result[1] !== 'object' || typeof result[0] !== 'object') {
-                  expect(result[0].toString().trim()).to.include(result[1].toString().trim());
-                }
 
-                expect(result[0]).deep.equal(result[1]);
-                return done(null);
-              });
-          });
-        });
-        return next(null);
-      }
-    ]);
+    runNewmanTest(convert, options, testConfig);
   });
 
   describe('Convert function', function () {

codegens/golang/test/unit/convert.test.js

@@ -1,7 +1,6 @@
 var expect = require('chai').expect,
   sdk = require('postman-collection'),
-  newmanTestUtil = require('../../../../test/codegen/newman/newmanTestUtil'),
-  async = require('async'),
+  runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
   convert = require('../../index').convert;
 
 describe('Golang convert function', function () {
@@ -13,43 +12,9 @@ describe('Golang convert function', function () {
       },
       options = {
         indentCount: 1,
-        indentType: 'Tab',
-        requestTimeout: 5000,
-        followRedirect: true,
-        trimRequestBody: false
+        indentType: 'Tab'
       };
-    async.waterfall([
-      function (next) {
-        newmanTestUtil.generateSnippet(convert, options, function (error, snippets) {
-          if (error) {
-            expect.fail(null, null, error);
-            return next(error);
-          }
-
-          return next(null, snippets);
-        });
-      },
-      function (snippets, next) {
-        snippets.forEach((item, index) => {
-          it(item.name, function (done) {
-            newmanTestUtil.runSnippet(item.snippet, index, testConfig,
-              function (err, result) {
-                if (err) {
-                  expect.fail(null, null, err);
-                }
-                if (typeof result[1] !== 'object' || typeof result[0] !== 'object') {
-                  expect(result[0].toString().trim()).to.include(result[1].toString().trim());
-                }
-                else {
-                  expect(result[0]).deep.equal(result[1]);
-                }
-                return done(null);
-              });
-          });
-        });
-        return next(null);
-      }
-    ]);
+    runNewmanTest(convert, options, testConfig);
   });
 
   describe('Convert function', function () {

codegens/java-okhttp/test/unit/convert.test.js

@@ -3,55 +3,18 @@ var expect = require('chai').expect,
   sanitize = require('../../lib/util').sanitize,
   convert = require('../../lib/index').convert,
   getOptions = require('../../lib/index').getOptions,
-  async = require('async'),
-  newmanTestUtil = require('../../../../test/codegen/newman/newmanTestUtil'),
+  runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
   mainCollection = require('../../../../test/codegen/newman/fixtures/testCollection.json');
 
 describe('okhttp convert function', function () {
   describe('convert for different request types', function () {
-    var headerSnippet = 'import java.io.*;\n' +
-                            'import okhttp3.*;\n' +
-                            'public class main {\n' +
-                            'public static void main(String []args) throws IOException{\n',
-      footerSnippet = 'System.out.println(response.body().string());\n}\n}\n',
-      options = {indentCount: 3, indentType: 'Space'},
+    var options = {indentCount: 3, indentType: 'Space', includeBoilerplate: true},
       testConfig = {
         compileScript: 'javac -cp *: main.java',
         runScript: 'java -cp *: main',
         fileName: 'main.java'
       };
-    async.waterfall([
-      function (next) {
-        newmanTestUtil.generateSnippet(convert, options, function (error, snippets) {
-          if (error) {
-            expect.fail(null, null, error);
-            return next(error);
-          }
-
-          return next(null, snippets);
-        });
-      },
-      function (snippets, next) {
-        snippets.forEach((item, index) => {
-          it(item.name, function (done) {
-            newmanTestUtil.runSnippet(headerSnippet + item.snippet + footerSnippet, index, testConfig,
-              function (err, result) {
-                if (err) {
-                  expect.fail(null, null, err);
-                }
-                if (typeof result[1] !== 'object' || typeof result[0] !== 'object') {
-                  expect(result[0].toString().trim()).to.include(result[1].toString().trim());
-                }
-                else {
-                  expect(result[0]).deep.equal(result[1]);
-                }
-                return done(null);
-              });
-          });
-        });
-        return next(null);
-      }
-    ]);
+    runNewmanTest(convert, options, testConfig);
   });
 
   describe('convert function', function () {

codegens/java-unirest/test/unit/convert.test.js

@@ -1,57 +1,22 @@
 var expect = require('chai').expect,
   sdk = require('postman-collection'),
-  async = require('async'),
   convert = require('../../lib/index').convert,
   sanitize = require('../../lib/util').sanitize,
   getUrlStringfromUrlObject = require('../../lib/parseRequest').getUrlStringfromUrlObject,
   getOptions = require('../../index').getOptions,
-  newmanTestUtil = require('../../../../test/codegen/newman/newmanTestUtil'),
+  runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
   mainCollection = require('./fixtures/testcollection/collection.json');
 
 describe('java unirest convert function for test collection', function () {
-  var headerSnippet = 'import com.mashape.unirest.http.*;\n' +
-                        'import java.io.*;\n' +
-                        'public class main {\n' +
-                        'public static void main(String []args) throws Exception{\n',
-    footerSnippet = 'System.out.println(response.getBody());\n}\n}\n',
-    testConfig = {
+  var testConfig = {
       runScript: 'java -cp *: main',
       compileScript: 'javac -cp *: main.java',
       fileName: 'main.java'
     },
-    options = {indentCount: 3, indentType: 'Space'};
-  async.waterfall([
-    function (next) {
-      newmanTestUtil.generateSnippet(convert, options, function (error, snippets) {
-        if (error) {
-          expect.fail(null, null, error);
-          return next(error);
-        }
+    options = {includeBoilerplate: true};
+
+  runNewmanTest(convert, options, testConfig);
 
-        return next(null, snippets);
-      });
-    },
-    function (snippets, next) {
-      snippets.forEach((item, index) => {
-        it(item.name, function (done) {
-          newmanTestUtil.runSnippet(headerSnippet + item.snippet + footerSnippet, index, testConfig,
-            function (err, result) {
-              if (err) {
-                expect.fail(null, null, err);
-              }
-              if (typeof result[1] !== 'object' || typeof result[0] !== 'object') {
-                expect(result[0].toString().trim()).to.include(result[1].toString().trim());
-              }
-              else {
-                expect(result[0]).deep.equal(result[1]);
-              }
-              return done(null);
-            });
-        });
-      });
-      return next(null);
-    }
-  ]);
   describe('convert function', function () {
     var request,
       reqObject,

codegens/js-fetch/test/unit/convert.test.js

@@ -1,7 +1,6 @@
 var expect = require('chai').expect,
   sdk = require('postman-collection'),
-  async = require('async'),
-  newmanTestUtil = require('../../../../test/codegen/newman/newmanTestUtil'),
+  runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
   sanitize = require('../../lib/util').sanitize,
   getOptions = require('../../index').getOptions,
   convert = require('../../index').convert,
@@ -15,47 +14,12 @@ describe('js-fetch convert function for test collection', function () {
       fileName: 'snippet.js'
     },
     options = {
-      indentCount: 2,
-      indentType: 'Tab',
-      multiLine: true,
-      followRedirect: true,
-      longFormat: true
+      multiLine: true
     };
   testSnippet += 'Headers = require(\'node-fetch\').Headers,\n';
   testSnippet += 'URLSearchParams = require(\'url\').URLSearchParams;\n\n';
-
-  async.waterfall([
-    function (next) {
-      newmanTestUtil.generateSnippet(convert, options, function (error, snippets) {
-        if (error) {
-          expect.fail(null, null, error);
-          return next(error);
-        }
-
-        return next(null, snippets);
-      });
-    },
-    function (snippets, next) {
-      snippets.forEach((item, index) => {
-        it(item.name, function (done) {
-          newmanTestUtil.runSnippet(testSnippet + item.snippet, index, testConfig,
-            function (err, result) {
-              if (err) {
-                expect.fail(null, null, err);
-              }
-              if (typeof result[1] !== 'object' || typeof result[0] !== 'object') {
-                expect(result[0].toString().trim()).to.include(result[1].toString().trim());
-              }
-              else {
-                expect(result[0]).deep.equal(result[1]);
-              }
-              return done(null);
-            });
-        });
-      });
-      return next(null);
-    }
-  ]);
+  testConfig.headerSnippet = testSnippet;
+  runNewmanTest(convert, options, testConfig);
 
   describe('Convert function', function () {
     var request,