Merge pull request #636 from watson-developer-cloud/mdk/fix-version-date-part3

germanattanasio · web-flow · commit 49663ba567ff · 2018-02-18T20:02:42.000-05:00
Change examples and tests to use version to pass version date
diff --git a/examples/browserify/public/client.js b/examples/browserify/public/client.js
@@ -28,7 +28,7 @@ function getToken() {
 function analyze(token) {
   var toneAnalyzer = new ToneAnalyzerV3({
     token: token,
-    version_date: '2016-05-19'
+    version: '2016-05-19'
   });
   toneAnalyzer.tone(
     {
diff --git a/examples/conversation.v1.js b/examples/conversation.v1.js
@@ -8,7 +8,7 @@ var ConversationV1 = require('watson-developer-cloud/conversation/v1');
 var conversation = new ConversationV1({
   username: process.env.CONVERSATION_USERNAME || '<conversation_username>',
   password: process.env.CONVERSATION_PASSWORD || '<conversation_password>',
-  version_date: '2017-05-26'
+  version: '2017-05-26'
 });
 
 /**
diff --git a/examples/conversation_tone_analyzer_integration/tone_conversation_integration.v1.js b/examples/conversation_tone_analyzer_integration/tone_conversation_integration.v1.js
@@ -41,7 +41,7 @@ require('dotenv').config({ silent: true });
 var conversation = new ConversationV1({
   username: process.env.CONVERSATION_USERNAME || '<conversation_username>',
   password: process.env.CONVERSATION_PASSWORD || '<conversation_password>',
-  version_date: '2017-05-26'
+  version: '2017-05-26'
 });
 
 /**
@@ -50,7 +50,7 @@ var conversation = new ConversationV1({
 var toneAnalyzer = new ToneAnalyzerV3({
   username: process.env.TONE_ANALYZER_USERNAME || '<tone_analyzer_username>',
   password: process.env.TONE_ANALYZER_PASSWORD || '<tone_analyzer_password>',
-  version_date: '2017-09-21'
+  version: '2017-09-21'
 });
 
 /**
diff --git a/examples/discovery.v1.js b/examples/discovery.v1.js
@@ -10,7 +10,7 @@ var discovery = new DiscoveryV1({
   // password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE'
   username: 'YOUR USERNAME',
   password: 'YOUR PASSWORD',
-  version_date: '2017_04_27',
+  version: '2017_04_27',
   url: 'https://gateway.watsonplatform.net/discovery/api/'
 });
 
diff --git a/examples/natural_language_understanding.v1.js b/examples/natural_language_understanding.v1.js
@@ -9,7 +9,7 @@ var nlu = new NaturalLanguageUnderstandingV1({
   // NATURAL_LANGUAGE_UNDERSTANDING_USERNAME &  NATURAL_LANGUAGE_UNDERSTANDING_PASSWORD
   // username: '<username>'.
   // password: '<password>',
-  version_date: '2017-02-27',
+  version: '2017-02-27',
   url: 'https://gateway.watsonplatform.net/natural-language-understanding/api/'
 });
 
diff --git a/examples/personality_insights.v3.js b/examples/personality_insights.v3.js
@@ -6,7 +6,7 @@ var fs = require('fs');
 var personalityInsights = new PersonalityInsightsV3({
   username: 'INSERT YOUR USERNAME FOR THE SERVICE HERE',
   password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE',
-  version_date: '2016-10-19',
+  version: '2016-10-19',
   url: 'https://gateway.watsonplatform.net/personality-insights/api/'
 });
 
diff --git a/examples/tone_analyzer.v3.js b/examples/tone_analyzer.v3.js
@@ -5,7 +5,7 @@ var ToneAnalyzerV3 = require('watson-developer-cloud/tone-analyzer/v3');
 var toneAnalyzer = new ToneAnalyzerV3({
   username: 'INSERT YOUR USERNAME FOR THE SERVICE HERE',
   password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE',
-  version_date: '2017-09-21',
+  version: '2017-09-21',
   url: 'https://gateway.watsonplatform.net/tone-analyzer/api/'
 });
 
diff --git a/examples/visual_recognition.v3.js b/examples/visual_recognition.v3.js
@@ -5,7 +5,7 @@ var fs = require('fs');
 
 var visualRecognition = new VisualRecognitionV3({
   api_key: 'INSERT YOUR API KEY HERE',
-  version_date: '2016-05-20'
+  version: '2016-05-20'
 });
 
 var params = {
diff --git a/examples/webpack/public/client.js b/examples/webpack/public/client.js
@@ -28,7 +28,7 @@ function getToken() {
 function analyze(token) {
   var toneAnalyzer = new ToneAnalyzerV3({
     token: token,
-    version_date: '2016-05-19'
+    version: '2016-05-19'
   });
   toneAnalyzer.tone(
     {
diff --git a/test/integration/test.adapter.conversation.js b/test/integration/test.adapter.conversation.js
@@ -7,7 +7,6 @@ const authHelper = require('./auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const assign = require('object.assign'); // for node v0.12 compatibility
-const ConversationV1 = require('../../conversation/v1');
 
 const extend = require('extend');
 
@@ -102,16 +101,19 @@ const test_dialog_node_update = 'updated_node';
 // changing language is forbidden starting with VERSION_DATE_2017_05_26
 const workspace1 = extend(true, {}, workspace, intents, { language: workspace.language });
 
-describe('conversation_integration', function() {
+describe('conversation_adapter_integration', function() {
   this.timeout(TEN_SECONDS);
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
   // this.retries(1);
 
   let conversation;
 
   before(function() {
-    auth.conversation.version_date = ConversationV1.VERSION_DATE_2017_05_26;
-    conversation = watson.conversation(auth.conversation);
+    const constructorParams = assign({}, auth.conversation, {
+      version: 'v1',
+      version_date: '2017-05-26'
+    });
+    conversation = watson.conversation(constructorParams);
     nock.enableNetConnect();
   });
 
@@ -140,7 +142,8 @@ describe('conversation_integration', function() {
 
     it('dialog_stack with 2017-02-03 version_date', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2017_02_03
+        version: 'v1',
+        version_date: '2017-02-03'
       });
       const conversation = watson.conversation(constructorParams);
 
@@ -162,7 +165,8 @@ describe('conversation_integration', function() {
 
     it('dialog_stack with 2016-09-20 version_date', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_09_20
+        version: 'v1',
+        version_date: '2016-09-20'
       });
       const conversation = watson.conversation(constructorParams);
 
@@ -184,7 +188,8 @@ describe('conversation_integration', function() {
 
     it('dialog_stack with 2016-07-11 version_date', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_07_11
+        version: 'v1',
+        version_date: '2016-07-11'
       });
       const conversation = watson.conversation(constructorParams);
 
diff --git a/test/integration/test.adapter.personality_insights.v3.js b/test/integration/test.adapter.personality_insights.v3.js
@@ -10,7 +10,7 @@ const describe = authHelper.describe; // this runs describe.skip if there is no
 const TWENTY_SECONDS = 20000;
 const TWO_SECONDS = 2000;
 
-describe('personality_insights_v3_integration', function() {
+describe('personality_insights_v3_adapter_integration', function() {
   this.retries(1);
 
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
@@ -20,6 +20,8 @@ describe('personality_insights_v3_integration', function() {
 
   before(function() {
     mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
+    auth.personality_insights.v3.version = 'v3';
+    auth.personality_insights.v3.version_date = '2016-10-19';
     personality_insights = watson.personality_insights(auth.personality_insights.v3);
     nock.enableNetConnect();
   });
diff --git a/test/integration/test.adapter.tone_analyzer.js b/test/integration/test.adapter.tone_analyzer.js
@@ -10,14 +10,16 @@ const describe = authHelper.describe; // this runs describe.skip if there is no
 const TWENTY_SECONDS = 20000;
 const TWO_SECONDS = 2000;
 
-describe('tone_analyzer_integration', function() {
+describe('tone_analyzer_adapter_integration', function() {
   this.timeout(TWENTY_SECONDS);
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
   this.retries(1);
 
   let tone_analyzer;
 
   before(function() {
+    auth.tone_analyzer.version = 'v3';
+    auth.tone_analyzer.version_date = '2016-06-19';
     tone_analyzer = watson.tone_analyzer(auth.tone_analyzer);
     nock.enableNetConnect();
   });
diff --git a/test/integration/test.conversation.js b/test/integration/test.conversation.js
@@ -111,8 +111,8 @@ describe('conversation_integration', function() {
   let conversation;
 
   before(function() {
-    auth.conversation.version_date = '2017-05-26';
-    conversation = watson.conversation(auth.conversation);
+    auth.conversation.version = '2017-05-26';
+    conversation = new watson.ConversationV1(auth.conversation);
     nock.enableNetConnect();
   });
 
@@ -139,11 +139,11 @@ describe('conversation_integration', function() {
       });
     });
 
-    it('dialog_stack with 2017-02-03 version_date', function(done) {
+    it('dialog_stack with 2017-02-03 version', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2017_02_03
+        version: ConversationV1.VERSION_DATE_2017_02_03
       });
-      const conversation = watson.conversation(constructorParams);
+      const conversation = new watson.ConversationV1(constructorParams);
 
       const params = {
         input: {
@@ -161,11 +161,11 @@ describe('conversation_integration', function() {
       });
     });
 
-    it('dialog_stack with 2016-09-20 version_date', function(done) {
+    it('dialog_stack with 2016-09-20 version', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_09_20
+        version: ConversationV1.VERSION_DATE_2016_09_20
       });
-      const conversation = watson.conversation(constructorParams);
+      const conversation = new watson.ConversationV1(constructorParams);
 
       const params = {
         input: {
@@ -183,11 +183,11 @@ describe('conversation_integration', function() {
       });
     });
 
-    it('dialog_stack with 2016-07-11 version_date', function(done) {
+    it('dialog_stack with 2016-07-11 version', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_07_11
+        version: ConversationV1.VERSION_DATE_2016_07_11
       });
-      const conversation = watson.conversation(constructorParams);
+      const conversation = new watson.ConversationV1(constructorParams);
 
       const params = {
         input: {
diff --git a/test/integration/test.dialog.js b/test/integration/test.dialog.js
@@ -19,6 +19,7 @@ describe('dialog_integration', function() {
   const client_id = 31;
 
   before(function() {
+    auth.dialog.version = 'v1';
     dialog = watson.dialog(auth.dialog);
     dialog_id = auth.dialog.dialog_id;
     nock.enableNetConnect();
diff --git a/test/integration/test.discovery.js b/test/integration/test.discovery.js
@@ -26,7 +26,7 @@ describe.skip('discovery_integration', function() {
     nock.enableNetConnect();
     discovery = new DiscoveryV1(
       Object.assign({}, auth.discovery, {
-        version_date: DiscoveryV1.VERSION_DATE_2017_04_27
+        version: DiscoveryV1.VERSION_DATE_2017_04_27
       })
     );
     environment_id = auth.discovery.environment_id;
diff --git a/test/integration/test.personality_insights.v2.js b/test/integration/test.personality_insights.v2.js
@@ -20,6 +20,7 @@ describe('personality_insights_v2_integration', function() {
 
   before(function() {
     mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
+    auth.personality_insights.v2.version = 'v2';
     personality_insights = watson.personality_insights(auth.personality_insights.v2);
     nock.enableNetConnect();
   });
diff --git a/test/integration/test.personality_insights.v3.js b/test/integration/test.personality_insights.v3.js
@@ -20,7 +20,8 @@ describe('personality_insights_v3_integration', function() {
 
   before(function() {
     mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
-    personality_insights = watson.personality_insights(auth.personality_insights.v3);
+    auth.personality_insights.v3.version = '2016-10-19';
+    personality_insights = new watson.PersonalityInsightsV3(auth.personality_insights.v3);
     nock.enableNetConnect();
   });
 
diff --git a/test/integration/test.text_to_speech.js b/test/integration/test.text_to_speech.js
@@ -17,7 +17,7 @@ describe('text_to_speech_integration', function() {
   let text_to_speech;
 
   before(function() {
-    text_to_speech = watson.text_to_speech(auth.text_to_speech);
+    text_to_speech = new watson.TextToSpeechV1(auth.text_to_speech);
     nock.enableNetConnect();
   });
 
diff --git a/test/integration/test.tone_analyzer.js b/test/integration/test.tone_analyzer.js
@@ -19,7 +19,8 @@ describe('tone_analyzer_integration', function() {
   let tone_analyzer;
 
   before(function() {
-    tone_analyzer = watson.tone_analyzer(auth.tone_analyzer);
+    auth.tone_analyzer.version = '2016-06-19';
+    tone_analyzer = new watson.ToneAnalyzerV3(auth.tone_analyzer);
     nock.enableNetConnect();
   });
 
diff --git a/test/integration/test.visual_recognition.custom_classifiers.js b/test/integration/test.visual_recognition.custom_classifiers.js
@@ -26,9 +26,9 @@ describe('visual_recognition_integration_custom_classifiers', function() {
   let visual_recognition;
 
   before(function(done) {
-    visual_recognition = watson.visual_recognition(
+    visual_recognition = new watson.VisualRecognitionV3(
       Object.assign({}, auth.visual_recognition.v3, {
-        version_date: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20
+        version: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20
       })
     );
     nock.enableNetConnect();
diff --git a/test/integration/test.visual_recognition.js b/test/integration/test.visual_recognition.js
@@ -19,9 +19,9 @@ describe('visual_recognition_integration', function() {
   let visual_recognition;
 
   before(function() {
-    visual_recognition = watson.visual_recognition(
+    visual_recognition = new watson.VisualRecognitionV3(
       Object.assign({}, auth.visual_recognition.v3, {
-        version_date: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20
+        version: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20
       })
     );
     nock.enableNetConnect();
diff --git a/test/resources/auth.example.js b/test/resources/auth.example.js
diff --git a/test/unit/test.conversation.v1.js b/test/unit/test.conversation.v1.js
diff --git a/test/unit/test.discovery.v1.js b/test/unit/test.discovery.v1.js
diff --git a/test/unit/test.language_translator.v2.js b/test/unit/test.language_translator.v2.js
diff --git a/test/unit/test.natural_language_classifier.v1.js b/test/unit/test.natural_language_classifier.v1.js
diff --git a/test/unit/test.natural_language_understanding.v1.js b/test/unit/test.natural_language_understanding.v1.js
diff --git a/test/unit/test.personality_insights.v3.js b/test/unit/test.personality_insights.v3.js
diff --git a/test/unit/test.requestWrapper.js b/test/unit/test.requestWrapper.js
diff --git a/test/unit/test.tone_analyzer.v3.js b/test/unit/test.tone_analyzer.v3.js
diff --git a/test/unit/test.visual_recognition.v3.js b/test/unit/test.visual_recognition.v3.js

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ function getToken() {`
`28`	`28`	`function analyze(token) {`
`29`	`29`	`var toneAnalyzer = new ToneAnalyzerV3({`
`30`	`30`	`token: token,`
`31`		`- version_date: '2016-05-19'`
	`31`	`+ version: '2016-05-19'`
`32`	`32`	`});`
`33`	`33`	`toneAnalyzer.tone(`
`34`	`34`	`{`