samples: automl: use fake model ids for deployment testing so that tests do no… (#1929)

* automl: use fake model ids for deployment testing so that tests do not take a long time to run

* remove bom from automl until bom is released with v1 of client library

* Fix typo

* Remove score threshold

Author: nnegrey

…geEntityExtractionModelManagementIT.java …/com/example/automl/DeployModelTest.javaautoml/snippets/src/test/java/com/example/automl/LanguageEntityExtractionModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/DeployModelTest.java automl/snippets/src/test/java/com/example/automl/LanguageEntityExtractionModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/DeployModelTest.java

@@ -27,32 +27,27 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-// Tests for Automl natural language entity extraction models.
 @RunWith(JUnit4.class)
-@Ignore
-public class LanguageEntityExtractionModelManagementIT {
+public class DeployModelTest {
   private static final String PROJECT_ID = System.getenv("AUTOML_PROJECT_ID");
-  private static final String MODEL_ID = System.getenv("ENTITY_EXTRACTION_MODEL_ID");
+  private static final String MODEL_ID = "TEN0000000000000000000";
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-            System.getenv(varName),
-            "Environment variable '%s' is required to perform these tests.".format(varName)
-    );
+        System.getenv(varName),
+        "Environment variable '%s' is required to perform these tests.".format(varName));
   }
 
   @BeforeClass
   public static void checkRequirements() {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("AUTOML_PROJECT_ID");
-    requireEnvVar("ENTITY_EXTRACTION_MODEL_ID");
   }
 
   @Before
@@ -68,14 +63,16 @@ public void tearDown() {
   }
 
   @Test
-  public void testDeployUndeployModel()
-      throws IOException, ExecutionException, InterruptedException {
-    UndeployModel.undeployModel(PROJECT_ID, MODEL_ID);
-    String got = bout.toString();
-    assertThat(got).contains("Model undeployment finished");
-
-    DeployModel.deployModel(PROJECT_ID, MODEL_ID);
-    got = bout.toString();
-    assertThat(got).contains("Model deployment finished");
+  public void testDeployModel() {
+    // As model deployment can take a long time, instead try to deploy a
+    // nonexistent model and confirm that the model was not found, but other
+    // elements of the request were valid.
+    try {
+      DeployModel.deployModel(PROJECT_ID, MODEL_ID);
+      String got = bout.toString();
+      assertThat(got).contains("The model does not exist");
+    } catch (IOException | ExecutionException | InterruptedException e) {
+      assertThat(e.getMessage()).contains("The model does not exist");
+    }
   }
 }

…eSentimentAnalysisModelManagementIT.java …om/example/automl/UndeployModelTest.javaautoml/snippets/src/test/java/com/example/automl/LanguageSentimentAnalysisModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/UndeployModelTest.java automl/snippets/src/test/java/com/example/automl/LanguageSentimentAnalysisModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/UndeployModelTest.java

@@ -27,32 +27,27 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-// Tests for Automl natural language sentiment analysis models.
 @RunWith(JUnit4.class)
-@Ignore
-public class LanguageSentimentAnalysisModelManagementIT {
+public class UndeployModelTest {
   private static final String PROJECT_ID = System.getenv("AUTOML_PROJECT_ID");
-  private static final String MODEL_ID = System.getenv("SENTIMENT_ANALYSIS_MODEL_ID");
+  private static final String MODEL_ID = "TEN0000000000000000000";
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-            System.getenv(varName),
-            "Environment variable '%s' is required to perform these tests.".format(varName)
-    );
+        System.getenv(varName),
+        "Environment variable '%s' is required to perform these tests.".format(varName));
   }
 
   @BeforeClass
   public static void checkRequirements() {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("AUTOML_PROJECT_ID");
-    requireEnvVar("SENTIMENT_ANALYSIS_MODEL_ID");
   }
 
   @Before
@@ -68,14 +63,16 @@ public void tearDown() {
   }
 
   @Test
-  public void testDeployUndeployModel()
-      throws IOException, ExecutionException, InterruptedException {
-    UndeployModel.undeployModel(PROJECT_ID, MODEL_ID);
-    String got = bout.toString();
-    assertThat(got).contains("Model undeployment finished");
-
-    DeployModel.deployModel(PROJECT_ID, MODEL_ID);
-    got = bout.toString();
-    assertThat(got).contains("Model deployment finished");
+  public void testUndeployModel() {
+    // As model deployment can take a long time, instead try to deploy a
+    // nonexistent model and confirm that the model was not found, but other
+    // elements of the request were valid.
+    try {
+      UndeployModel.undeployModel(PROJECT_ID, MODEL_ID);
+      String got = bout.toString();
+      assertThat(got).contains("The model does not exist");
+    } catch (IOException | ExecutionException | InterruptedException e) {
+      assertThat(e.getMessage()).contains("The model does not exist");
+    }
   }
 }

…TextClassificationModelManagementIT.java …ssificationDeployModelNodeCountTest.javaautoml/snippets/src/test/java/com/example/automl/LanguageTextClassificationModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/VisionClassificationDeployModelNodeCountTest.java automl/snippets/src/test/java/com/example/automl/LanguageTextClassificationModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/VisionClassificationDeployModelNodeCountTest.java

@@ -27,32 +27,27 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-// Tests for Automl natural language text classification models.
 @RunWith(JUnit4.class)
-@Ignore
-public class LanguageTextClassificationModelManagementIT {
+public class VisionClassificationDeployModelNodeCountTest {
   private static final String PROJECT_ID = System.getenv("AUTOML_PROJECT_ID");
-  private static final String MODEL_ID = System.getenv("TEXT_CLASSIFICATION_MODEL_ID");
+  private static final String MODEL_ID = "ICN0000000000000000000";
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-            System.getenv(varName),
-            "Environment variable '%s' is required to perform these tests.".format(varName)
-    );
+        System.getenv(varName),
+        "Environment variable '%s' is required to perform these tests.".format(varName));
   }
 
   @BeforeClass
   public static void checkRequirements() {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("AUTOML_PROJECT_ID");
-    requireEnvVar("TEXT_CLASSIFICATION_MODEL_ID");
   }
 
   @Before
@@ -68,14 +63,17 @@ public void tearDown() {
   }
 
   @Test
-  public void testDeployUndeployModel()
-      throws IOException, ExecutionException, InterruptedException {
-    UndeployModel.undeployModel(PROJECT_ID, MODEL_ID);
-    String got = bout.toString();
-    assertThat(got).contains("Model undeployment finished");
-
-    DeployModel.deployModel(PROJECT_ID, MODEL_ID);
-    got = bout.toString();
-    assertThat(got).contains("Model deployment finished");
+  public void testDeployModelWithNodeCount() {
+    // As model deployment can take a long time, instead try to deploy a
+    // nonexistent model and confirm that the model was not found, but other
+    // elements of the request were valid.
+    try {
+      VisionClassificationDeployModelNodeCount.visionClassificationDeployModelNodeCount(
+          PROJECT_ID, MODEL_ID);
+      String got = bout.toString();
+      assertThat(got).contains("The model does not exist");
+    } catch (IOException | ExecutionException | InterruptedException e) {
+      assertThat(e.getMessage()).contains("The model does not exist");
+    }
   }
 }

…ionObjectDetectionModelManagementIT.java …ctDetectionDeployModelNodeCountTest.javaautoml/snippets/src/test/java/com/example/automl/VisionObjectDetectionModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/VisionObjectDetectionDeployModelNodeCountTest.java automl/snippets/src/test/java/com/example/automl/VisionObjectDetectionModelManagementIT.java renamed to automl/snippets/src/test/java/com/example/automl/VisionObjectDetectionDeployModelNodeCountTest.java

@@ -27,32 +27,27 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-// Tests for Automl vision object detection models.
 @RunWith(JUnit4.class)
-@Ignore
-public class VisionObjectDetectionModelManagementIT {
+public class VisionObjectDetectionDeployModelNodeCountTest {
   private static final String PROJECT_ID = System.getenv("AUTOML_PROJECT_ID");
-  private static final String MODEL_ID = System.getenv("OBJECT_DETECTION_MODEL_ID");
+  private static final String MODEL_ID = "0000000000000000000000";
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-            System.getenv(varName),
-            "Environment variable '%s' is required to perform these tests.".format(varName)
-    );
+        System.getenv(varName),
+        "Environment variable '%s' is required to perform these tests.".format(varName));
   }
 
   @BeforeClass
   public static void checkRequirements() {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("AUTOML_PROJECT_ID");
-    requireEnvVar("OBJECT_DETECTION_MODEL_ID");
   }
 
   @Before
@@ -68,27 +63,17 @@ public void tearDown() {
   }
 
   @Test
-  public void testDeployUndeployModel()
-      throws IOException, ExecutionException, InterruptedException {
-    UndeployModel.undeployModel(PROJECT_ID, MODEL_ID);
-    String got = bout.toString();
-    assertThat(got).contains("Model undeployment finished");
-
-    DeployModel.deployModel(PROJECT_ID, MODEL_ID);
-    got = bout.toString();
-    assertThat(got).contains("Model deployment finished");
-  }
-
-  @Test
-  public void testDeployUndeployModelWithNodeCount()
-      throws IOException, ExecutionException, InterruptedException {
-    UndeployModel.undeployModel(PROJECT_ID, MODEL_ID);
-    String got = bout.toString();
-    assertThat(got).contains("Model undeployment finished");
-
-    VisionObjectDetectionDeployModelNodeCount.visionObjectDetectionDeployModelNodeCount(
-        PROJECT_ID, MODEL_ID);
-    got = bout.toString();
-    assertThat(got).contains("Model deployment finished");
+  public void testDeployModelWithNodeCount() {
+    // As model deployment can take a long time, instead try to deploy a
+    // nonexistent model and confirm that the model was not found, but other
+    // elements of the request were valid.
+    try {
+      VisionObjectDetectionDeployModelNodeCount.visionObjectDetectionDeployModelNodeCount(
+          PROJECT_ID, MODEL_ID);
+      String got = bout.toString();
+      assertThat(got).contains("The model does not exist");
+    } catch (IOException | ExecutionException | InterruptedException e) {
+      assertThat(e.getMessage()).contains("The model does not exist");
+    }
   }
 }