refactor: migrate tests to use correct import mechanism

dpopp07 · dpopp07 · commit cc698c46bdb9 · 2019-03-21T11:26:18.000-05:00
diff --git a/index.ts b/index.ts
@@ -95,40 +95,3 @@ Object.keys(servicesByVersion).forEach(serviceName => {
     }
   });
 });
-
-// removed services
-// we don't want these services listed (so non-enumerable), but we do want a clear error message
-// if old code happens to try using one
-[
-  'concept_insights',
-  'relationship_extraction',
-  'message_resonance',
-  'question_and_answer',
-  'visual_insights',
-  'concept_expansion',
-  'retrieve_and_rank',
-  'alchemy_language',
-  'alchemy_data_news',
-  'tradeoff_analytics'
-].forEach(serviceName => {
-  Object.defineProperty(exports, serviceName, {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value() {
-      throw new Error('The ' + serviceName + ' service is no longer available');
-    }
-  });
-});
-['AlchemyVisionV1', 'alchemy_vision'].forEach(serviceName => {
-  Object.defineProperty(exports, serviceName, {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value() {
-      throw new Error(
-        'The Alchemy Vision service is no longer available, please use Visual Recognition instead.'
-      );
-    }
-  });
-});
diff --git a/test/integration/assistant.v1.test.js b/test/integration/assistant.v1.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const watson = require('../../index');
+const AssistantV1 = require('../../assistant/v1');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
@@ -102,7 +102,7 @@ const workspace1 = extend(true, {}, workspace, intents, { language: workspace.la
 describe('assistant_integration', function() {
   jest.setTimeout(TEN_SECONDS);
   auth.conversation.version = '2018-02-16';
-  const assistant = new watson.AssistantV1(auth.conversation);
+  const assistant = new AssistantV1(auth.conversation);
 
   describe('message()', function() {
     it('alternate_intents with custom headers', function(done) {
@@ -132,7 +132,7 @@ describe('assistant_integration', function() {
       const constructorParams = assign({}, auth.assistant, {
         version: '2017-02-03',
       });
-      const assistant = new watson.AssistantV1(constructorParams);
+      const assistant = new AssistantV1(constructorParams);
 
       const params = {
         input: {
@@ -156,7 +156,7 @@ describe('assistant_integration', function() {
       const constructorParams = assign({}, auth.assistant, {
         version: '2016-09-20',
       });
-      const assistant = new watson.AssistantV1(constructorParams);
+      const assistant = new AssistantV1(constructorParams);
 
       const params = {
         input: {
@@ -180,7 +180,7 @@ describe('assistant_integration', function() {
       const constructorParams = assign({}, auth.assistant, {
         version: '2016-07-11',
       });
-      const assistant = new watson.AssistantV1(constructorParams);
+      const assistant = new AssistantV1(constructorParams);
 
       const params = {
         input: {
diff --git a/test/integration/assistant.v2.test.js b/test/integration/assistant.v2.test.js
@@ -1,13 +1,13 @@
 'use strict';
 
-const watson = require('../../index');
+const AssistantV2 = require('../../assistant/v2');
 const authHelper = require('../resources/auth_helper.js');
 
 const auth = authHelper.auth.assistant;
 auth.version = '2018-09-19';
 
 describe('assistant v2 integration', function() {
-  const assistant = new watson.AssistantV2(auth);
+  const assistant = new AssistantV2(auth);
   const assistant_id = auth.assistant_id;
   let session_id;
 
diff --git a/test/integration/discovery.test.js b/test/integration/discovery.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const DiscoveryV1 = require('../../discovery/v1-generated');
+const DiscoveryV1 = require('../../discovery/v1');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
diff --git a/test/integration/language_translator.v3.test.js b/test/integration/language_translator.v3.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const watson = require('../../index');
+const LanguageTranslatorV3 = require('../../language-translator/v3');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
@@ -11,7 +11,7 @@ describe('language_translator_integration', function() {
   jest.setTimeout(TWENTY_SECONDS * 2);
 
   auth.language_translator.v3.version = '2018-05-01';
-  const language_translator = new watson.LanguageTranslatorV3(auth.language_translator.v3);
+  const language_translator = new LanguageTranslatorV3(auth.language_translator.v3);
 
   it('listModels()', function(done) {
     language_translator.listModels(null, done);
diff --git a/test/integration/natural_language_classifier.test.js b/test/integration/natural_language_classifier.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const watson = require('../../index');
-const assert = require('assert');
+const NaturalLanguageClassifierV1 = require('../../natural-language-classifier/v1');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
@@ -10,7 +9,7 @@ const TWENTY_SECONDS = 20000;
 describe('natural_language_classifier_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  const natural_language_classifier = new watson.NaturalLanguageClassifierV1(
+  const natural_language_classifier = new NaturalLanguageClassifierV1(
     auth.natural_language_classifier
   );
 
@@ -22,7 +21,7 @@ describe('natural_language_classifier_integration', function() {
       if (err) {
         return done(err);
       }
-      assert.equal(result.classifier_id, params.classifier_id);
+      expect(result.classifier_id).toBe(params.classifier_id);
       done();
     });
   });
@@ -36,7 +35,7 @@ describe('natural_language_classifier_integration', function() {
       if (err) {
         return done(err);
       }
-      assert.equal(result.classifier_id, params.classifier_id);
+      expect(result.classifier_id).toBe(params.classifier_id);
       done();
     });
   });
diff --git a/test/integration/personality_insights.v3.test.js b/test/integration/personality_insights.v3.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs');
-const watson = require('../../index');
+const PersonalityInsightsV3 = require('../../personality-insights/v3');
 const path = require('path');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
@@ -13,7 +13,7 @@ describe('personality_insights_v3_integration', function() {
 
   const mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
   auth.personality_insights.version = '2016-10-19';
-  const personality_insights = new watson.PersonalityInsightsV3(auth.personality_insights);
+  const personality_insights = new PersonalityInsightsV3(auth.personality_insights);
 
   it('profile with text content', function(done) {
     const params = {
diff --git a/test/integration/speech_to_text.test.js b/test/integration/speech_to_text.test.js
@@ -3,7 +3,7 @@
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
-const watson = require('../../index');
+const SpeechToTextV1 = require('../../speech-to-text/v1');
 const fs = require('fs');
 const concat = require('concat-stream');
 const path = require('path');
@@ -15,8 +15,8 @@ const TWO_MINUTES = 2 * 60 * 1000;
 describe('speech_to_text_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  const speech_to_text = new watson.SpeechToTextV1(auth.speech_to_text);
-  const speech_to_text_rc = new watson.SpeechToTextV1(auth.speech_to_text_rc);
+  const speech_to_text = new SpeechToTextV1(auth.speech_to_text);
+  const speech_to_text_rc = new SpeechToTextV1(auth.speech_to_text_rc);
 
   it('recognize() (RC) @slow', function(done) {
     const params = {
@@ -120,7 +120,7 @@ describe('speech_to_text_integration', function() {
     it('transcribes audio over a websocket, credentials from environment', function(done) {
       process.env.SPEECH_TO_TEXT_IAM_APIKEY = auth.speech_to_text_rc.iam_apikey;
       process.env.SPEECH_TO_TEXT_URL = auth.speech_to_text_rc.url;
-      const speech_to_text_env = new watson.SpeechToTextV1({});
+      const speech_to_text_env = new SpeechToTextV1({});
       const recognizeStream = speech_to_text_env.recognizeUsingWebSocket();
       recognizeStream.setEncoding('utf8');
       fs.createReadStream(path.join(__dirname, '../resources/weather.flac'))
@@ -148,7 +148,7 @@ describe('speech_to_text_integration', function() {
           },
         ],
       });
-      const speech_to_text_vcap = new watson.SpeechToTextV1({});
+      const speech_to_text_vcap = new SpeechToTextV1({});
       const recognizeStream = speech_to_text_vcap.recognizeUsingWebSocket();
       recognizeStream.setEncoding('utf8');
       fs.createReadStream(path.join(__dirname, '../resources/weather.flac'))
@@ -229,7 +229,7 @@ describe('speech_to_text_integration', function() {
         speech_to_text.whenCustomizationReady(
           { customization_id: customization_id, interval: 250, times: 400 },
           function(err) {
-            if (err && err.code !== watson.SpeechToTextV1.ERR_NO_CORPORA) {
+            if (err && err.code !== SpeechToTextV1.ERR_NO_CORPORA) {
               return done(err);
             }
             test(done);
@@ -239,7 +239,7 @@ describe('speech_to_text_integration', function() {
     }
 
     beforeAll(function(done) {
-      const speech_to_text = new watson.SpeechToTextV1(auth.speech_to_text);
+      const speech_to_text = new SpeechToTextV1(auth.speech_to_text);
       speech_to_text.listLanguageModels({}, function(err, result) {
         if (err) {
           // eslint-disable-next-line no-console
diff --git a/test/integration/text_to_speech.test.js b/test/integration/text_to_speech.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const watson = require('../../index');
+const TextToSpeechV1 = require('../../text-to-speech/v1');
 const wav = require('wav');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
@@ -10,7 +10,7 @@ const TWENTY_SECONDS = 20000;
 describe('text_to_speech_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  const text_to_speech = new watson.TextToSpeechV1(auth.text_to_speech);
+  const text_to_speech = new TextToSpeechV1(auth.text_to_speech);
 
   it('listVoices()', function(done) {
     text_to_speech.listVoices(null, done);
diff --git a/test/integration/tone_analyzer.test.js b/test/integration/tone_analyzer.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs');
-const watson = require('../../index');
+const ToneAnalyzerV3 = require('../../tone-analyzer/v3');
 const path = require('path');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
@@ -12,7 +12,7 @@ describe('tone_analyzer_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
   auth.tone_analyzer.version = '2016-06-19';
-  const tone_analyzer = new watson.ToneAnalyzerV3(auth.tone_analyzer);
+  const tone_analyzer = new ToneAnalyzerV3(auth.tone_analyzer);
 
   it('tone()', function(done) {
     const mobydick = fs.readFileSync(path.join(__dirname, '../resources/tweet.txt'), 'utf8');
diff --git a/test/integration/visual_recognition.custom_classifiers.test.js b/test/integration/visual_recognition.custom_classifiers.test.js
@@ -1,6 +1,6 @@
 'use strict';
 const fs = require('fs');
-const watson = require('../../index');
+const VisualRecognitionV3 = require('../../visual-recognition/v3');
 const path = require('path');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
@@ -18,7 +18,7 @@ describe.skip('visual_recognition_integration_custom_classifiers @slow', functio
   // ugh.
   jest.setTimeout(THIRTY_SECONDS * 8);
 
-  const visual_recognition = new watson.VisualRecognitionV3(
+  const visual_recognition = new VisualRecognitionV3(
     Object.assign({}, auth.visual_recognition_rc.v3, {
       version: '2018-03-19',
     })
diff --git a/test/integration/visual_recognition.test.js b/test/integration/visual_recognition.test.js
@@ -1,6 +1,6 @@
 'use strict';
 const fs = require('fs');
-const watson = require('../../index');
+const VisualRecognitionV3 = require('../../visual-recognition/v3');
 const authHelper = require('../resources/auth_helper.js');
 const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
@@ -11,7 +11,7 @@ describe('visual_recognition_integration', function() {
   // ugh.
   jest.setTimeout(THIRTY_SECONDS * 4);
 
-  const visual_recognition = new watson.VisualRecognitionV3(
+  const visual_recognition = new VisualRecognitionV3(
     Object.assign({}, auth.visual_recognition_rc.v3, {
       version: '2018-10-01',
     })
diff --git a/text-to-speech/v1-generated.ts b/text-to-speech/v1-generated.ts
@@ -16,16 +16,8 @@
 
 import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-<<<<<<< HEAD
-import { BaseService } from '../lib/base_service';
-import { getDefaultHeaders } from '../lib/common';
-import { getMissingParams } from '../lib/helper';
-import { FileObject } from '../lib/helper';
-=======
 import { BaseService, FileObject, getMissingParams} from 'ibm-cloud-sdk-core';
-import { RequestResponse } from 'request';
 import { getSdkHeaders } from '../lib/common';
->>>>>>> master
 
 /**
  * ### Service Overview The IBM&reg; Text to Speech service provides APIs that use IBM's speech-synthesis capabilities to synthesize text into natural-sounding speech in a variety of languages, dialects, and voices. The service supports at least one male or female voice, sometimes both, for each language. The audio is streamed back to the client with minimal delay.   For speech synthesis, the service supports a synchronous HTTP Representational State Transfer (REST) interface. It also supports a WebSocket interface that provides both plain text and SSML input, including the SSML &lt;mark&gt; element and word timings. SSML is an XML-based markup language that provides text annotation for speech-synthesis applications.   The service also offers a customization interface. You can use the interface to define sounds-like or phonetic translations for words. A sounds-like translation consists of one or more words that, when combined, sound like the word. A phonetic translation is based on the SSML phoneme format for representing a word. You can specify a phonetic translation in standard International Phonetic Alphabet (IPA) representation or in the proprietary IBM Symbolic Phonetic Representation (SPR).
