test(Natural Language Classifier): Update tests

Author: lpatino10

natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierIT.java

@@ -12,8 +12,8 @@
  */
 package com.ibm.watson.natural_language_classifier.v1;
 
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 import com.ibm.watson.common.WatsonServiceTest;
 import com.ibm.watson.natural_language_classifier.v1.model.Classification;
 import com.ibm.watson.natural_language_classifier.v1.model.ClassificationCollection;
@@ -64,12 +64,9 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    service = new NaturalLanguageClassifier();
+    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    service = new NaturalLanguageClassifier(authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
-    IamOptions iamOptions = new IamOptions.Builder()
-        .apiKey(apiKey)
-        .build();
-    service.setIamCredentials(iamOptions);
     service.setEndPoint(getProperty("natural_language_classifier.url"));
 
     preCreatedClassifierId = getProperty("natural_language_classifier.classifier_id");
@@ -86,7 +83,7 @@ public void aCreate() throws Exception {
     final File metadata = new File("src/test/resources/natural_language_classifier/metadata.json");
 
     CreateClassifierOptions createOptions = new CreateClassifierOptions.Builder()
-        .metadata(metadata)
+        .trainingMetadata(metadata)
         .trainingData(trainingData)
         .build();
     Classifier classifier = service.createClassifier(createOptions).execute().getResult();
@@ -179,10 +176,12 @@ public void eDelete() throws InterruptedException {
   @Test
   public void fClassifyCollection() {
     ClassificationCollection classificationCollection = null;
-    ClassifyInput input1 = new ClassifyInput();
-    input1.setText("How hot will it be today?");
-    ClassifyInput input2 = new ClassifyInput();
-    input2.setText("Is it hot outside?");
+    ClassifyInput input1 = new ClassifyInput.Builder()
+        .text("How hot will it be today?")
+        .build();
+    ClassifyInput input2 = new ClassifyInput.Builder()
+        .text("Is it hot outside?")
+        .build();
 
     try {
       ClassifyCollectionOptions classifyOptions = new ClassifyCollectionOptions.Builder()

natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierTest.java

@@ -13,7 +13,7 @@
 package com.ibm.watson.natural_language_classifier.v1;
 
 import com.google.gson.JsonObject;
-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_classifier.v1.model.Classification;
 import com.ibm.watson.natural_language_classifier.v1.model.ClassificationCollection;
@@ -62,11 +62,7 @@ public class NaturalLanguageClassifierTest extends WatsonServiceUnitTest {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    BasicAuthConfig authConfig = new BasicAuthConfig.Builder()
-        .username("")
-        .password("")
-        .build();
-    service = new NaturalLanguageClassifier(authConfig);
+    service = new NaturalLanguageClassifier(new NoAuthAuthenticator());
     service.setEndPoint(getMockWebServerUrl());
 
     classifierId = "foo";
@@ -114,10 +110,12 @@ public void testClassifyCollection() throws InterruptedException {
 
     server.enqueue(jsonResponse(classificationCollection));
 
-    ClassifyInput input1 = new ClassifyInput();
-    input1.setText("How hot will it be today?");
-    ClassifyInput input2 = new ClassifyInput();
-    input2.setText("Is it hot outside?");
+    ClassifyInput input1 = new ClassifyInput.Builder()
+        .text("How hot will it be today?")
+        .build();
+    ClassifyInput input2 = new ClassifyInput.Builder()
+        .text("Is it hot outside?")
+        .build();
     List<ClassifyInput> inputCollection = Arrays.asList(input1, input2);
 
     ClassifyCollectionOptions classifyOptions = new ClassifyCollectionOptions.Builder()
@@ -176,7 +174,7 @@ public void testCreateClassifier() throws InterruptedException, FileNotFoundExce
     File metadata = new File(RESOURCE + "metadata.json");
     File trainingData = new File(RESOURCE + "weather_data_train.csv");
     CreateClassifierOptions createOptions = new CreateClassifierOptions.Builder()
-        .metadata(metadata)
+        .trainingMetadata(metadata)
         .trainingData(trainingData)
         .build();
     final Classifier response = service.createClassifier(createOptions).execute().getResult();
@@ -241,7 +239,7 @@ public void testNullTrainingDataFile() throws FileNotFoundException {
     File metadata = new File(RESOURCE + "metadata.json");
     File trainingData = new File(RESOURCE + "notfound.txt");
     CreateClassifierOptions createOptions = new CreateClassifierOptions.Builder()
-        .metadata(metadata)
+        .trainingMetadata(metadata)
         .trainingData(trainingData)
         .build();
     service.createClassifier(createOptions).execute();