ibm_watson 1.0.0.rc2 → 1.0.0.rc3

data/test/unit/test_assistant_v1.rb

@@ -29,7 +29,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -63,7 +63,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -98,7 +98,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 429, body: error_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -138,7 +138,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 407, body: error_response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -169,7 +169,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: {}.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -201,7 +201,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -245,7 +245,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -278,7 +278,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -317,7 +317,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -348,7 +348,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -384,7 +384,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -431,7 +431,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -469,7 +469,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -504,7 +504,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -533,7 +533,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -566,7 +566,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -611,7 +611,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -645,7 +645,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -683,7 +683,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -711,7 +711,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -744,7 +744,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -786,7 +786,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -821,7 +821,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -901,7 +901,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -986,7 +986,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1001,7 +1001,7 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_message
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1095,7 +1095,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1124,7 +1124,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1158,7 +1158,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1207,7 +1207,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1242,7 +1242,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1281,7 +1281,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1309,7 +1309,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1346,7 +1346,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1394,7 +1394,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1433,7 +1433,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1475,7 +1475,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1505,7 +1505,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1542,7 +1542,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1586,7 +1586,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1621,7 +1621,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1641,7 +1641,7 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_dialog_nodes
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1724,7 +1724,7 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1739,7 +1739,7 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_update_dialog_node
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1767,7 +1767,7 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_list_mentions
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_assistant_v2.rb

@@ -10,7 +10,7 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the Watson Assistant V1 Service
 class AssistantV2Test < Minitest::Test
   def test_message
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -109,7 +109,7 @@ class AssistantV2Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: {})
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -132,7 +132,7 @@ class AssistantV2Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: {})
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )

data/test/unit/test_compare_comply_v1.rb

@@ -11,7 +11,7 @@ WebMock.disable_net_connect!(allow_localhost: true)
 class CompareComplyV1 < Minitest::Test
   def test_convert_to_html
     # service.set_default_headers("x-watson-learning-opt-out" => true)
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -31,7 +31,7 @@ class CompareComplyV1 < Minitest::Test
 
   def test_classify_elements
     # service.set_default_headers("x-watson-learning-opt-out" => true)
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -54,7 +54,7 @@ class CompareComplyV1 < Minitest::Test
 
   def test_extract_tables
     # service.set_default_headers("x-watson-learning-opt-out" => true)
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -77,7 +77,7 @@ class CompareComplyV1 < Minitest::Test
 
   def test_compare_documents
     # service.set_default_headers("x-watson-learning-opt-out" => true)
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -101,7 +101,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_list_feedback
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -133,7 +133,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_add_feedback
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -162,7 +162,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_get_feedback
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -191,7 +191,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_delete_feedback
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -215,7 +215,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_create_batch
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -240,7 +240,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_list_batches
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -267,7 +267,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_get_batch
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(
@@ -291,7 +291,7 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_update_batch
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::CompareComplyV1.new(

data/test/unit/test_configure_http_client.rb

@@ -9,7 +9,7 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the configure_http_client customizations, such as proxies and timeouts
 class HTTPConfigTest < Minitest::Test
   def test_proxy_address_port
-    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
       bearer_token: "token"
     )
     service = IBMWatson::NaturalLanguageUnderstandingV1.new(
@@ -28,11 +28,15 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_proxy_username_password
-    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
-      version: "2018-03-16",
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -49,11 +53,15 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_proxy_headers
-    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
-      version: "2018-03-16",
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -70,11 +78,15 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_proxy_username_password_headers
-    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
-      version: "2018-03-16",
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -95,11 +107,15 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_timeout_per_operation
-    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
-      version: "2018-03-16",
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       timeout: {
         per_operation: {
@@ -122,11 +138,15 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_timeout_global
-    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
-      version: "2018-03-16",
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       timeout: {
         global: 20
@@ -143,11 +163,15 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_disable_ssl_verification
-    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
-      version: "2018-03-16",
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(disable_ssl_verification: true)
     refute_nil(service.conn.default_options.ssl_context)
   end