ibm_watson 1.0.0.rc2 → 1.0.0.rc3

data/test/unit/test_language_translator_v3.rb

@@ -40,7 +40,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -49,7 +48,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -86,7 +85,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -95,7 +93,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -135,7 +133,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -144,7 +141,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -190,7 +187,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -199,7 +195,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -252,7 +248,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -261,7 +256,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -320,7 +315,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -329,7 +323,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -360,7 +354,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -369,7 +362,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -409,7 +402,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -418,7 +410,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -472,7 +464,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -481,7 +472,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -508,7 +499,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -517,7 +507,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -540,7 +530,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -549,7 +538,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -576,7 +565,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -585,7 +573,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -612,7 +600,6 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -621,7 +608,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: token_response.to_json,
         headers: {}
       )
-    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
       apikey: "iam_apikey"
     )
     service = IBMWatson::LanguageTranslatorV3.new(

data/test/unit/test_natural_language_classifier_v1.rb

@@ -9,7 +9,7 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the Natural Language Classifier V1 Service
 class NaturalLanguageClassifierV1Test < Minitest::Test
   def test_success
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -129,7 +129,7 @@ class NaturalLanguageClassifierV1Test < Minitest::Test
   end
 
   def test_classify_collection
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_natural_language_understanding_v1.rb

@@ -9,7 +9,7 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the Natural Language Understanding V1 Service
 class NaturalLanguageUnderstandingV1Test < Minitest::Test
   def test_text_analyze
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -37,7 +37,7 @@ class NaturalLanguageUnderstandingV1Test < Minitest::Test
   end
 
   def test_html_analyze
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -68,7 +68,7 @@ class NaturalLanguageUnderstandingV1Test < Minitest::Test
   end
 
   def test_url_analyze
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -101,7 +101,7 @@ class NaturalLanguageUnderstandingV1Test < Minitest::Test
   end
 
   def test_list_models
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -123,7 +123,7 @@ class NaturalLanguageUnderstandingV1Test < Minitest::Test
 
   def test_delete_model
     model_id = "invalid_model_id"
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_personality_insights_v3.rb

@@ -14,7 +14,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
+    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
       .with(
         body: personality_text,
@@ -25,7 +25,7 @@ class PersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -69,7 +69,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
+    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -80,7 +80,7 @@ class PersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -109,7 +109,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "text/csv"
     }
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&csv_headers=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -120,7 +120,7 @@ class PersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -150,7 +150,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
       .with(
         body: personality_text,
@@ -163,7 +163,7 @@ class PersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_speech_to_text_v1.rb

@@ -36,7 +36,7 @@ class SpeechToTextV1Test < Minitest::Test
         }
       ]
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -93,7 +93,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_recognize_using_websocket_disable_ssl_verification
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -127,7 +127,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_get_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -159,7 +159,7 @@ class SpeechToTextV1Test < Minitest::Test
         }
       ]
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -220,7 +220,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_callbacks
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -253,7 +253,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_custom_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -328,7 +328,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_acoustic_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -404,7 +404,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_custom_corpora
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -476,7 +476,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_custom_words
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -623,7 +623,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_list_grammars
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -645,7 +645,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_add_grammar
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -670,7 +670,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_get_grammar
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -693,7 +693,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_delete_grammar
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -716,7 +716,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_custom_audio_resources
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -784,7 +784,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_delete_user_data
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -805,7 +805,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_recognize_await
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -844,7 +844,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_recognize_async
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -884,7 +884,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_reset_language_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -904,7 +904,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_upgrade_language_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -924,7 +924,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_upgrade_acoustic_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -944,7 +944,7 @@ class SpeechToTextV1Test < Minitest::Test
   end
 
   def test_reset_acoustic_model
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_text_to_speech_v1.rb

@@ -55,7 +55,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "stream.watsonplatform.net"
         }
       ).to_return(status: 200, body: voices_response.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -99,7 +99,7 @@ class TextToSpeechV1Test < Minitest::Test
     response = {
       "pronunciation" => "pronunciation info"
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -153,7 +153,7 @@ class TextToSpeechV1Test < Minitest::Test
 
   def test_custom_voice_models
     response = { "customizations" => "yep" }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -247,7 +247,7 @@ class TextToSpeechV1Test < Minitest::Test
 
   def test_custom_words
     response = { "customizations" => "yep" }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -333,7 +333,7 @@ class TextToSpeechV1Test < Minitest::Test
   end
 
   def test_delete_user_data
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_tone_analyzer_v3.rb

@@ -13,7 +13,7 @@ class ToneAnalyzerV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, headers: headers, body: tone_response)
+    expected_response = IBMWatson::DetailedResponse.new(status: 200, headers: headers, body: tone_response)
     tone_text = File.read(Dir.getwd + "/resources/personality.txt")
     stub_request(:post, "https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone?version=2017-09-21")
       .with(
@@ -25,7 +25,7 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -48,7 +48,7 @@ class ToneAnalyzerV3Test < Minitest::Test
       "Content-Type" => "application/json"
     }
     tone_text = File.read(Dir.getwd + "/resources/personality.txt")
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, headers: headers, body: tone_response)
+    expected_response = IBMWatson::DetailedResponse.new(status: 200, headers: headers, body: tone_response)
     stub_request(:post, "https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone?sentences=false&version=2017-09-21")
       .with(
         body: tone_text,
@@ -59,7 +59,7 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -81,7 +81,7 @@ class ToneAnalyzerV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = IBMCloudSdkCore::DetailedResponse.new(body: tone_response, status: 200, headers: headers)
+    expected_response = IBMWatson::DetailedResponse.new(body: tone_response, status: 200, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone_chat?version=2017-09-21")
       .with(
         body: "{\"utterances\":[{\"text\":\"I am very happy\",\"user\":\"glenn\"}]}",
@@ -92,7 +92,7 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -137,7 +137,7 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 400, body: tone_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -172,7 +172,7 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Custom-Header-One" => "yes"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -203,7 +203,7 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )