update test scripts per changes in the semantic and model validator (A…

…zure#978)
mestew · Mar 2, 2017 · dc4216e · dc4216e
1 parent e4b285e
commit dc4216e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/test/linter.js b/test/linter.js
@@ -9,6 +9,11 @@ var _ = require('lodash'),
 describe('AutoRest Linter validation:', function () {
   var autoRestLocation = './AutoRest.*/tools/AutoRest.exe';
   let swaggersToProcess = utils.getFilesChangedInPR();
+  // Useful when debugging a test for a particular swagger. 
+  // Just update the regex. That will return an array of filtered items.
+  // swaggersToProcess = swaggersToProcess.filter(function(item) {
+  //   return (item.match(/.arm-containerregistry.*2017-03-01.*/ig) !== null);
+  // });
   _(swaggersToProcess).each(function (swagger) {
     it(swagger + ' should honor linter validation rules.', function (done) {
       var cmd = utils.clrCmd(autoRestLocation + ' -CodeGenerator None -I ' + swagger);

diff --git a/test/model.js b/test/model.js
@@ -9,12 +9,18 @@ var _ = require('lodash'),
 
 describe('Azure swagger model validation using x-ms-examples and examples in spec', function () {
   let swaggersToProcess = utils.getFilesChangedInPR();
+  // Useful when debugging a test for a particular swagger. 
+  // Just update the regex. That will return an array of filtered items.
+  // swaggersToProcess = swaggersToProcess.filter(function(item) {
+  //   return (item.match(/.arm-containerregistry.*2017-03-01.*/ig) !== null);
+  // });
   _(swaggersToProcess).each(function (swagger) {
     it(swagger + ' should have valid examples.', function (done) {
-      oav.validateExamples(swagger, null, false, 'error').then(function (validationResult) {
+      oav.validateExamples(swagger, null, 'error').then(function (validationResult) {
+        //console.dir(validationResult, {depth: null, colors: true});
         done(assert(validationResult.validityStatus === true, `swagger "${swagger}" contains model validation errors.`));
       }).catch(function (err) {
-        console.log(err);
+        console.dir(err, {depth: null, colors: true});
         done(err);
       });
     });

diff --git a/test/semantic.js b/test/semantic.js
@@ -9,12 +9,20 @@ var _ = require('lodash'),
 
 describe('Azure swagger semantic validation:', function () {
   let swaggersToProcess = utils.getFilesChangedInPR();
+  // Useful when debugging a test for a particular swagger. 
+  // Just update the regex. That will return an array of filtered items.
+  // swaggersToProcess = swaggersToProcess.filter(function(item) {
+  //   return (item.match(/.arm-containerregistry.*2017-03-01.*/ig) !== null);
+  // });
+
   _(swaggersToProcess).each(function (swagger) {
     it(swagger + ' should be semantically valid.', function (done) {
-      oav.validateSpec(swagger, false, 'error').then(function (validationResult) {
-        done(assert(validationResult.errors && validationResult.errors.length === 0, `swagger "${swagger}" contains semantic validation errors.`));
+      oav.validateSpec(swagger, 'error').then(function (validationResult) {
+        //console.dir(validationResult, {depth: null, colors: true});
+        done(assert(validationResult.validateSpec && validationResult.validateSpec.errors && validationResult.validateSpec.errors.length === 0, 
+        `swagger "${swagger}" contains semantic validation errors.`));
       }).catch(function (err) {
-        console.log(err);
+        console.dir(err, {depth: null, colors: true});
         done(err);
       });
     });