test: update tests to include authenticators internally

Author: mamoonraja

test/integration/test_assistant_v1.rb

@@ -11,7 +11,7 @@ class AssistantV1Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["ASSISTANT_APIKEY"],
         version: "2018-02-16"
       )

test/integration/test_assistant_v2.rb

@@ -11,7 +11,7 @@ class AssistantV2Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["ASSISTANT_APIKEY"]
       )
       @service = IBMWatson::AssistantV2.new(

test/integration/test_compare_comply_v1.rb

@@ -11,7 +11,7 @@ class CompareComplyV1Test < Minitest::Test
     attr_accessor :service, :environment_id, :collection_id
 
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["ASSISTANT_APIKEY"]
       )
       @service = IBMWatson::CompareComplyV1.new(

test/integration/test_discovery_v1.rb

@@ -10,7 +10,7 @@ class DiscoveryV1Test < Minitest::Test
     attr_accessor :service, :environment_id, :collection_id
 
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["DISCOVERY_APIKEY"]
       )
       @service = IBMWatson::DiscoveryV1.new(
@@ -203,9 +203,6 @@ def test_documents
       assert_equal("deleted", delete_doc["status"])
     end
 
-    # def test_queries
-    # end
-
     def test_list_credentials
       credentials = @service.list_credentials(
         environment_id: @environment_id

test/integration/test_language_translator_v3.rb

@@ -10,7 +10,7 @@ class LanguageTranslatorV3Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["LANGUAGE_TRANSLATOR_APIKEY"]
       )
       @service = IBMWatson::LanguageTranslatorV3.new(

test/integration/test_natural_language_classifier_v1.rb

@@ -10,7 +10,7 @@ class NaturalLanguageClassifierV1Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["NATURAL_LANGUAGE_CLASSIFIER_APIKEY"]
       )
       @service = IBMWatson::NaturalLanguageClassifierV1.new(

test/integration/test_natural_language_understanding_v1.rb

@@ -9,7 +9,7 @@ class NaturalLanguageUnderstandingV1Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["NATURAL_LANGUAGE_UNDERSTANDING_APIKEY"]
       )
       @service = IBMWatson::NaturalLanguageUnderstandingV1.new(

test/integration/test_personality_insights_v3.rb

@@ -9,7 +9,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["PERSONALITY_INSIGHTS_APIKEY"]
       )
       @service = IBMWatson::PersonalityInsightsV3.new(

test/integration/test_speech_to_text_v1.rb

@@ -28,7 +28,7 @@ class SpeechToTextV1Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["SPEECH_TO_TEXT_APIKEY"]
       )
       @service = IBMWatson::SpeechToTextV1.new(
@@ -246,7 +246,7 @@ def test_invalid_auth_using_websocket
       audio_file = File.open(Dir.getwd + "/resources/speech.wav")
       atomic_boolean = Concurrent::AtomicBoolean.new
       mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
-      authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      authenticator = IBMWatson::Auth::BearerTokenAuthenticator.new(
         bearer_token: "bogus_iam_access_token"
       )
       temp_service = IBMWatson::SpeechToTextV1.new(

test/integration/test_text_to_speech_v1.rb

@@ -9,7 +9,7 @@ class TextToSpeechV1Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      authenticator = IBMWatson::Auth::IamAuthenticator.new(
         apikey: ENV["TEXT_TO_SPEECH_APIKEY"]
       )
       @service = IBMWatson::TextToSpeechV1.new(