test(Natural Language Understanding): Update tests

Author: lpatino10

natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingIT.java

@@ -13,7 +13,7 @@
 package com.ibm.watson.natural_language_understanding.v1;
 
 
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.RetryRunner;
 import com.ibm.watson.common.WatsonServiceTest;
 import com.ibm.watson.natural_language_understanding.v1.model.AnalysisResults;
@@ -77,12 +77,9 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    service = new NaturalLanguageUnderstanding("2018-11-16");
+    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    service = new NaturalLanguageUnderstanding("2018-11-16", authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
-    IamOptions iamOptions = new IamOptions.Builder()
-        .apiKey(apiKey)
-        .build();
-    service.setIamCredentials(iamOptions);
     service.setEndPoint(getProperty("natural_language_understanding.url"));
   }
 
@@ -340,7 +337,7 @@ public void analyzeHtmlForMetadataIsSuccessful() throws Exception {
     String fileDate = "2016-05-23T20:13:00";
     String fileAuthor = "Annalee Newitz";
     Features features = new Features.Builder()
-        .metadata(new MetadataOptions())
+        .metadata(new MetadataOptions.Builder().build())
         .build();
     AnalyzeOptions parameters = new AnalyzeOptions.Builder()
         .html(html)

natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingTest.java

@@ -13,7 +13,7 @@
 package com.ibm.watson.natural_language_understanding.v1;
 
 
-import com.ibm.cloud.sdk.core.security.basicauth.BasicAuthConfig;
+import com.ibm.cloud.sdk.core.security.NoAuthAuthenticator;
 import com.ibm.watson.common.WatsonServiceUnitTest;
 import com.ibm.watson.natural_language_understanding.v1.model.AnalysisResults;
 import com.ibm.watson.natural_language_understanding.v1.model.AnalyzeOptions;
@@ -68,11 +68,7 @@ public class NaturalLanguageUnderstandingTest extends WatsonServiceUnitTest {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    BasicAuthConfig authConfig = new BasicAuthConfig.Builder()
-        .username("")
-        .password("")
-        .build();
-    service = new NaturalLanguageUnderstanding("2018-11-16", authConfig);
+    service = new NaturalLanguageUnderstanding("2018-11-16", new NoAuthAuthenticator());
     service.setEndPoint(getMockWebServerUrl());
 
     modelId = "foo";
@@ -152,7 +148,7 @@ public void testModelOptions() throws InterruptedException {
     keywordsOptions.newBuilder();
 
     // MetadataOptions
-    MetadataOptions metadataOptions = new MetadataOptions();
+    MetadataOptions metadataOptions = new MetadataOptions.Builder().build();
     assertNotNull(metadataOptions);
 
     // RelationsOptions
@@ -298,7 +294,7 @@ public void testNullModelId() {
   @Test(expected = IllegalArgumentException.class)
   public void testNullVersion() {
     @SuppressWarnings("unused")
-    NaturalLanguageUnderstanding service2 = new NaturalLanguageUnderstanding(null);
+    NaturalLanguageUnderstanding service2 = new NaturalLanguageUnderstanding(null, new NoAuthAuthenticator());
   }
 
 }