Fixing older automl tests

nirupa-kumar · nirupa-kumar · commit cf37185e3581 · 2019-04-23T08:59:15.000-07:00
diff --git a/language/automl/src/main/java/com/google/cloud/language/samples/ModelApi.java b/language/automl/src/main/java/com/google/cloud/language/samples/ModelApi.java
@@ -47,7 +47,7 @@
 
 /**
  * Google Cloud AutoML Natural Language API sample application. Example usage: mvn package exec:java
- * -Dexec.mainClass ='com.google.cloud.vision.samples.automl.ModelApi' -Dexec.args='create_model
+ * -Dexec.mainClass ='com.google.cloud.language.samples.automl.ModelApi' -Dexec.args='create_model
  * [datasetId] test_model'
  */
 public class ModelApi {
@@ -168,10 +168,10 @@ public static void getModel(String projectId, String computeRegion, String model
     AutoMlClient client = AutoMlClient.create();
 
     // Get the full path of the model.
-    ModelName modelFullId = ModelName.of(projectId, computeRegion, modelId);
+    ModelName modelName = ModelName.of(projectId, computeRegion, modelId);
 
     // Get complete detail of the model.
-    Model model = client.getModel(modelFullId);
+    Model model = client.getModel(modelName.toString());
 
     // Display the model information.
     System.out.println(String.format("Model name: %s", model.getName()));
@@ -183,6 +183,9 @@ public static void getModel(String projectId, String computeRegion, String model
     System.out.println(String.format("\tseconds: %s", model.getCreateTime().getSeconds()));
     System.out.println(String.format("\tnanos: %s", model.getCreateTime().getNanos()));
     System.out.println(String.format("Model deployment state: %s", model.getDeploymentState()));
+
+    // Deploy model so it can be used for Prediction
+    client.deployModelAsync(modelName.toString());
   }
   // [END automl_language_get_model]
 
diff --git a/language/automl/src/test/java/com/google/cloud/language/samples/DatasetApiIT.java b/language/automl/src/test/java/com/google/cloud/language/samples/DatasetApiIT.java
@@ -41,7 +41,7 @@ public class DatasetApiIT {
   private PrintStream out;
   private DatasetApi app;
   private String datasetId;
-  private String getdatasetId = "8477830379477056918";
+  private String getdatasetId = "TCN8477830379477056918";
 
   @Before
   public void setUp() {
diff --git a/language/automl/src/test/java/com/google/cloud/language/samples/ModelApiIT.java b/language/automl/src/test/java/com/google/cloud/language/samples/ModelApiIT.java
@@ -33,12 +33,10 @@
 public class ModelApiIT {
   private static final String PROJECT_ID = "java-docs-samples-testing";
   private static final String COMPUTE_REGION = "us-central1";
+  private static final String MODEL_ID = "TCN342705131419266916";
+  private static final String MODEL_EVALUATION_ID = "3666189665418739402";
   private ByteArrayOutputStream bout;
   private PrintStream out;
-  private ModelApi app;
-  private String modelId;
-  private String modelIdGetevaluation = "342705131419266916";
-  private String modelEvaluationId = "3666189665418739402";
 
   @Before
   public void setUp() {
@@ -60,18 +58,17 @@ public void testModelApi() throws Exception {
 
     // Assert
     String got = bout.toString();
-    modelId = got.split("\n")[1].split("/")[got.split("\n")[1].split("/").length - 1];
     assertThat(got).contains("Model id:");
 
     // Act
-    ModelApi.getModel(PROJECT_ID, COMPUTE_REGION, modelId);
+    ModelApi.getModel(PROJECT_ID, COMPUTE_REGION, MODEL_ID);
 
     // Assert
     got = bout.toString();
     assertThat(got).contains("Model name:");
 
     // Act
-    ModelApi.listModelEvaluations(PROJECT_ID, COMPUTE_REGION, modelId, "");
+    ModelApi.listModelEvaluations(PROJECT_ID, COMPUTE_REGION, MODEL_ID, "");
 
     // Assert
     got = bout.toString();
@@ -83,7 +80,7 @@ public void testGetModelEvaluation() throws Exception {
 
     // Act
     ModelApi.getModelEvaluation(
-        PROJECT_ID, COMPUTE_REGION, modelIdGetevaluation, modelEvaluationId);
+        PROJECT_ID, COMPUTE_REGION, MODEL_ID, MODEL_EVALUATION_ID);
 
     // Assert
     String got = bout.toString();
diff --git a/language/automl/src/test/java/com/google/cloud/language/samples/PredictionApiIT.java b/language/automl/src/test/java/com/google/cloud/language/samples/PredictionApiIT.java
@@ -33,7 +33,7 @@
 public class PredictionApiIT {
   private static final String COMPUTE_REGION = "us-central1";
   private static final String PROJECT_ID = "java-docs-samples-testing";
-  private static final String modelId = "342705131419266916";
+  private static final String modelId = "TCN342705131419266916";
   private static final String filePath = "./resources/input.txt";
   private ByteArrayOutputStream bout;
   private PrintStream out;
