ibm_watson 1.0.0.rc2 → 1.0.0.rc3

data/test/unit/test_discovery_v1.rb

@@ -46,7 +46,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: discovery_response_body.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -67,7 +67,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -92,7 +92,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -118,7 +118,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -143,7 +143,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -166,7 +166,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "body" => "hello" }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -181,7 +181,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_collection
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -270,7 +270,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_query
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -295,60 +295,6 @@ class DiscoveryV1Test < Minitest::Test
     assert_equal({ "body" => "hello" }, service_response.result)
   end
 
-  def test_query_relations
-    stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/query_relations?version=2018-03-05")
-      .with(
-        body: "{\"count\":10}",
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Content-Type" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: { body: "hello" }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::DiscoveryV1.new(
-      version: "2018-03-05",
-      authenticator: authenticator
-    )
-    service_response = service.query_relations(
-      environment_id: "envid",
-      collection_id: "collid",
-      count: 10
-    )
-    assert_equal({ "body" => "hello" }, service_response.result)
-  end
-
-  def test_query_entities
-    stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/query_entities?version=2018-03-05")
-      .with(
-        body: "{\"count\":10}",
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Content-Type" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: { body: "hello" }.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::DiscoveryV1.new(
-      version: "2018-03-05",
-      authenticator: authenticator
-    )
-    service_response = service.query_entities(
-      environment_id: "envid",
-      collection_id: "collid",
-      count: 10
-    )
-    assert_equal({ "body" => "hello" }, service_response.result)
-  end
-
   def test_configs
     results = {
       "configurations" => [
@@ -358,7 +304,7 @@ class DiscoveryV1Test < Minitest::Test
         }
       ]
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -442,7 +388,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_document
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -450,44 +396,6 @@ class DiscoveryV1Test < Minitest::Test
       version: "2018-03-05",
       authenticator: authenticator
     )
-    stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/preview?configuration_id=bogus&version=2018-03-05")
-      .with(
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: { configurations: [] }.to_json, headers: { "Content-Type" => "application/json" })
-    File.open(Dir.getwd + "/resources/simple.html") do |file_info|
-      service_response = service.test_configuration_in_environment(
-        environment_id: "envid",
-        configuration_id: "bogus",
-        file: file_info,
-        filename: "simple.html"
-      )
-      refute(service_response.nil?)
-
-      service_response = service.test_configuration_in_environment(
-        environment_id: "envid",
-        configuration_id: "bogus",
-        file: "file_info"
-      )
-      refute(service_response.nil?)
-
-      stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/preview?version=2018-03-05")
-        .with(
-          headers: {
-            "Accept" => "application/json",
-            "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-            "Host" => "gateway.watsonplatform.net"
-          }
-        ).to_return(status: 200, body: { configurations: [] }.to_json, headers: { "Content-Type" => "application/json" })
-      service_response = service.test_configuration_in_environment(
-        environment_id: "envid",
-        file: file_info
-      )
-      refute(service_response.nil?)
-    end
     doc_status = {
       "document_id" => "45556e23-f2b1-449d-8f27-489b514000ff",
       "configuration_id" => "2e079259-7dd2-40a9-998f-3e716f5a7b88",
@@ -597,7 +505,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_all_training_data
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -620,7 +528,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_training_data
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -687,7 +595,7 @@ class DiscoveryV1Test < Minitest::Test
         }
       ]
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -716,7 +624,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_training_data
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -760,7 +668,7 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: mock_response.to_json, headers: { "Content-Type" => "application/json" })
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -785,7 +693,7 @@ class DiscoveryV1Test < Minitest::Test
       "cross_reference" => "string",
       "relevance" => 0
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -815,7 +723,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_training_example
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -845,7 +753,7 @@ class DiscoveryV1Test < Minitest::Test
       "cross_reference" => "string",
       "relevance" => 0
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -878,7 +786,7 @@ class DiscoveryV1Test < Minitest::Test
       "cross_reference" => "string",
       "relevance" => 0
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -908,7 +816,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_expansions
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -967,7 +875,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_tokenization_dictionary
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1026,7 +934,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_user_data
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1048,7 +956,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_query_notices
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1072,7 +980,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_federated_query
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1098,7 +1006,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_federated_query_notices
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1122,7 +1030,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_training_examples
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1157,7 +1065,7 @@ class DiscoveryV1Test < Minitest::Test
       "type" => "click",
       "data" => "data"
     }
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1184,7 +1092,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_query_log
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1209,7 +1117,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1234,7 +1142,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query_event
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1259,7 +1167,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query_token_event
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1283,7 +1191,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_event_rate
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1308,7 +1216,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query_no_results
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1333,7 +1241,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_credentials
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1356,7 +1264,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_create_credentials
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1382,7 +1290,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_get_credentials
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1406,7 +1314,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_update_credentials
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1433,7 +1341,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_credentials
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1457,7 +1365,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_update_collection
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1485,7 +1393,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_get_stopword_list_status
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1509,7 +1417,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_fields
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1533,7 +1441,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_create_stopword_list
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1555,7 +1463,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_stopword_list
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1578,7 +1486,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_gateways
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1601,7 +1509,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_create_gateway
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1624,7 +1532,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_get_gateway
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
@@ -1648,7 +1556,7 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_gateway
-    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )