ibm_watson 0.14.0 → 0.15.0

data/test/integration/test_assistant_v1.rb

@@ -2,23 +2,29 @@
 
 require_relative("./../test_helper.rb")
 SimpleCov.command_name "test:integration"
+require("minitest/hooks/test")
 
-if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
+if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
   # Integration tests for the Watson Assistant V1 Service
   class AssistantV1Test < Minitest::Test
-    def test_create_update_delete_workspace
-      skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
+    include Minitest::Hooks
+    attr_accessor :service
+    def before_all
+      @service = IBMWatson::AssistantV1.new(
+        iam_apikey: ENV["ASSISTANT_APIKEY"],
+        url: ENV["ASSISTANT_URL"],
         version: "2018-02-16"
       )
-      service.add_default_headers(
+      @service.add_default_headers(
         headers: {
           "X-Watson-Learning-Opt-Out" => "1",
           "X-Watson-Test" => "1"
         }
       )
+    end
+
+    def test_create_update_delete_workspace
+      skip "Skip to allow for concurrent travis jobs"
       service_response = service.create_workspace(
         name: "Pizza app",
         description: "Pizza app",
@@ -44,17 +50,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_get_workspace
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.get_workspace(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         export: false
@@ -63,34 +58,12 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_workspaces
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_workspaces
       assert((200..299).cover?(service_response.status))
     end
 
     def test_create_update_delete_counterexample
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        version: "2018-02-16",
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"]
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.create_counterexample(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         text: "I want a large pizza please."
@@ -104,44 +77,20 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
       )
       assert((200..299).cover?(service_response.status))
 
-      service_response = service.delete_counterexample(
+      service_response = service.get_counterexample(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         text: "I want a large pizza please."
       )
-      assert(service_response.nil?)
-    end
+      assert((200..299).cover?(service_response.status))
 
-    def test_get_counterexample
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
-      service_response = service.get_counterexample(
+      service_response = service.delete_counterexample(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
-        text: "what is your nickname"
+        text: "I want a large pizza please."
       )
-      assert((200..299).cover?(service_response.status))
+      assert(service_response.nil?)
     end
 
     def test_list_counterexamples
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_counterexamples(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"]
       )
@@ -150,17 +99,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
 
     def test_create_update_delete_entity
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.create_entity(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "pizza_toppings",
@@ -186,17 +124,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_get_entity
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.get_entity(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -206,17 +133,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_entities
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_entities(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         export: true
@@ -226,17 +142,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
 
     def test_create_update_delete_example
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.create_example(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         intent: "Cancel",
@@ -261,17 +166,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_get_example
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.get_example(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         intent: "Cancel",
@@ -281,17 +175,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_examples
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_examples(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         intent: "Cancel"
@@ -301,17 +184,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
 
     def test_create_update_delete_intent
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.create_intent(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         intent: "pizza_order",
@@ -335,17 +207,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_get_intent
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.get_intent(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         intent: "Cancel",
@@ -355,17 +216,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_intents
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_intents(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         export: false
@@ -374,17 +224,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_logs
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_logs(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"]
       )
@@ -392,17 +231,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_all_logs
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_all_logs(
         filter: "language::en,request.context.metadata.deployment::deployment_1"
       )
@@ -410,17 +238,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_message
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.message(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         input: { "text" => "Turn on the lights" },
@@ -439,17 +256,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
 
     def test_create_update_delete_synonym
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.create_synonym(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -477,17 +283,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_get_synonym
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.get_synonym(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -498,17 +293,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_synonyms
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_synonyms(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -519,17 +303,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
 
     def test_create_update_delete_value
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.create_value(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -556,17 +329,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_get_value
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.get_value(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -577,17 +339,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_list_values
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_values(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
         entity: "holiday",
@@ -598,17 +349,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
 
     def test_dialog_nodes
       skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
 
       service_response = service.create_dialog_node(
         workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
@@ -635,17 +375,6 @@ if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_delete_user_data
-      service = IBMWatson::AssistantV1.new(
-        username: ENV["ASSISTANT_USERNAME"],
-        password: ENV["ASSISTANT_PASSWORD"],
-        version: "2018-02-16"
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.delete_user_data(
         customer_id: "id"
       )

data/test/integration/test_assistant_v2.rb

@@ -3,17 +3,17 @@
 require_relative("./../test_helper.rb")
 SimpleCov.command_name "test:integration"
 
-if !ENV["ASSISTANT_V2_USERNAME"].nil? && !ENV["ASSISTANT_V2_PASSWORD"].nil?
+if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
   # Integration tests for the Watson Assistant V2 Service
   class AssistantV2Test < Minitest::Test
-    def test_create_delete_session
-      # skip "Skip to allow for concurrent travis jobs"
-      service = IBMWatson::AssistantV2.new(
+    include Minitest::Hooks
+    attr_accessor :service
+    def before_all
+      @service = IBMWatson::AssistantV2.new(
         version: "2018-12-31",
-        username: ENV["ASSISTANT_V2_USERNAME"],
-        password: ENV["ASSISTANT_V2_PASSWORD"],
-        url: ENV["ASSISTANT_V2_URL"],
-        assistant_id: ENV["ASSISTANT_V2_ASSISTANT_ID"]
+        iam_apikey: ENV["ASSISTANT_APIKEY"],
+        url: ENV["ASSISTANT_URL"],
+        assistant_id: ENV["ASSISTANT_ASSISTANT_ID"]
       )
       service.add_default_headers(
         headers: {
@@ -21,33 +21,18 @@ if !ENV["ASSISTANT_V2_USERNAME"].nil? && !ENV["ASSISTANT_V2_PASSWORD"].nil?
           "X-Watson-Test" => "1"
         }
       )
+    end
+
+    def test_create_delete_session_and_message
       service_response = service.create_session(
-        assistant_id: ENV["ASSISTANT_V2_ASSISTANT_ID"]
+        assistant_id: ENV["ASSISTANT_ASSISTANT_ID"]
       )
       session_id = service_response.result["session_id"]
       assert((200..299).cover?(service_response.status))
-      service.delete_session(
-        assistant_id: ENV["ASSISTANT_V2_ASSISTANT_ID"],
-        session_id: session_id
-      )
-    end
 
-    def test_message
-      service = IBMWatson::AssistantV2.new(
-        username: ENV["ASSISTANT_V2_USERNAME"],
-        password: ENV["ASSISTANT_V2_PASSWORD"],
-        version: "2018-02-16",
-        url: ENV["ASSISTANT_V2_URL"]
-      )
-      service.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.message(
-        assistant_id: ENV["ASSISTANT_V2_ASSISTANT_ID"],
-        session_id: ENV["ASSISTANT_V2_SESSION_ID"],
+        assistant_id: ENV["ASSISTANT_ASSISTANT_ID"],
+        session_id: session_id,
         input: { "text" => "Turn on the lights" },
         context: nil
       )
@@ -55,12 +40,17 @@ if !ENV["ASSISTANT_V2_USERNAME"].nil? && !ENV["ASSISTANT_V2_PASSWORD"].nil?
 
       context = service_response.result["context"]
       service_response = service.message(
-        assistant_id: ENV["ASSISTANT_V2_ASSISTANT_ID"],
-        session_id: ENV["ASSISTANT_V2_SESSION_ID"],
+        assistant_id: ENV["ASSISTANT_ASSISTANT_ID"],
+        session_id: session_id,
         input: { "text" => "Turn on the lights" },
         context: context
       )
       assert((200..299).cover?(service_response.status))
+
+      service.delete_session(
+        assistant_id: ENV["ASSISTANT_ASSISTANT_ID"],
+        session_id: session_id
+      )
     end
   end
 end

data/test/integration/test_discovery_v1.rb

@@ -3,7 +3,7 @@
 require_relative("./../test_helper.rb")
 require("minitest/hooks/test")
 
-if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
+if !ENV["DISCOVERY_APIKEY"].nil? && !ENV["DISCOVERY_URL"].nil?
   # Integration tests for the Discovery V1 Service
   class DiscoveryV1Test < Minitest::Test
     include Minitest::Hooks
@@ -11,8 +11,8 @@ if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
 
     def before_all
       @service = IBMWatson::DiscoveryV1.new(
-        username: ENV["DISCOVERY_USERNAME"],
-        password: ENV["DISCOVERY_PASSWORD"],
+        iam_apikey: ENV["DISCOVERY_APIKEY"],
+        url: ENV["DISCOVERY_URL"],
         version: "2018-03-05"
       )
       @environment_id = ENV["DISCOVERY_ENVIRONMENT_ID"]
@@ -32,11 +32,6 @@ if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
         environment_id: envs["environments"][0]["environment_id"]
       )
       refute(env.nil?)
-      fields = @service.list_fields(
-        environment_id: @environment_id,
-        collection_ids: [@collection_id]
-      )
-      refute(fields.nil?)
     end
 
     def test_configurations
@@ -75,7 +70,7 @@ if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
       assert_equal("deleted", deleted_config["status"])
     end
 
-    def test_collections_and_expansions
+    def test_collections_fields_query_and_expansions
       skip "Time consuming"
       name = "Example collection for ruby" + ("A".."Z").to_a.sample
       new_collection_id = @service.create_collection(
@@ -104,6 +99,20 @@ if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
       updated_collection = updated_collection
       assert_equal("Updating description", updated_collection["description"])
 
+      fields = @service.list_fields(
+        environment_id: @environment_id,
+        collection_ids: [new_collection_id]
+      )
+      refute(fields.nil?)
+
+      query_results = @service.query(
+        environment_id: @environment_id,
+        collection_id: new_collection_id,
+        filter: "extracted_metadata.sha1::9181d244*",
+        return_fields: "extracted_metadata.sha1"
+      ).result
+      refute(query_results.nil?)
+
       @service.create_expansions(
         environment_id: @environment_id,
         collection_id: new_collection_id,
@@ -191,15 +200,8 @@ if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
       assert_equal("deleted", delete_doc["status"])
     end
 
-    def test_queries
-      query_results = @service.query(
-        environment_id: @environment_id,
-        collection_id: @collection_id,
-        filter: "extracted_metadata.sha1::9181d244*",
-        return_fields: "extracted_metadata.sha1"
-      ).result
-      refute(query_results.nil?)
-    end
+    # def test_queries
+    # end
 
     def test_list_credentials
       credentials = @service.list_credentials(
@@ -216,6 +218,7 @@ if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
     end
 
     def test_create_get_delete_gateways
+      skip
       gateway = @service.create_gateway(
         environment_id: @environment_id,
         name: "test"

data/test/integration/test_language_translator_v3.rb

@@ -4,15 +4,15 @@ require("json")
 require_relative("./../test_helper.rb")
 require("minitest/hooks/test")
 
-if !ENV["LANGUAGE_TRANSLATOR_V3_USERNAME"].nil? && !ENV["LANGUAGE_TRANSLATOR_V3_PASSWORD"].nil?
+if !ENV["LANGUAGE_TRANSLATOR_APIKEY"].nil? && !ENV["LANGUAGE_TRANSLATOR_URL"].nil?
   # Integration tests for the Language Translator V3 Service
   class LanguageTranslatorV3Test < Minitest::Test
     include Minitest::Hooks
     attr_accessor :service
     def before_all
       @service = IBMWatson::LanguageTranslatorV3.new(
-        username: ENV["LANGUAGE_TRANSLATOR_V3_USERNAME"],
-        password: ENV["LANGUAGE_TRANSLATOR_V3_PASSWORD"],
+        iam_apikey: ENV["LANGUAGE_TRANSLATOR_APIKEY"],
+        url: ENV["LANGUAGE_TRANSLATOR_URL"],
         version: "2018-05-01"
       )
       @service.add_default_headers(