From 9bba225e179b45e8b0e821cce747267c8d40684c Mon Sep 17 00:00:00 2001 From: nnegrey Date: Thu, 16 Jan 2020 13:19:56 -0700 Subject: [PATCH] automl: fix old beta snippet tests --- .../automl/ClassificationDeployModel.java | 5 +- .../ClassificationDeployModelNodeCount.java | 5 +- .../automl/ClassificationUndeployModel.java | 5 +- .../ObjectDetectionDeployModelNodeCount.java | 5 +- .../automl/ClassificationDeployModelIT.java | 53 +++++++++++++------ ...ObjectDetectionDeployModelNodeCountIT.java | 25 +++++---- 6 files changed, 56 insertions(+), 42 deletions(-) diff --git a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModel.java b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModel.java index 4a0d2801b4d..6b533c44a4d 100644 --- a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModel.java +++ b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModel.java @@ -30,7 +30,8 @@ class ClassificationDeployModel { // Deploy a model - static void classificationDeployModel(String projectId, String modelId) { + static void classificationDeployModel(String projectId, String modelId) + throws IOException, ExecutionException, InterruptedException { // String projectId = "YOUR_PROJECT_ID"; // String modelId = "YOUR_MODEL_ID"; @@ -54,8 +55,6 @@ static void classificationDeployModel(String projectId, String modelId) { // Display the deployment details of model. System.out.println("Model deployment finished"); - } catch (IOException | InterruptedException | ExecutionException e) { - e.printStackTrace(); } } } diff --git a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelNodeCount.java b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelNodeCount.java index f41e68d3829..22eb247e626 100644 --- a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelNodeCount.java +++ b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelNodeCount.java @@ -31,7 +31,8 @@ class ClassificationDeployModelNodeCount { // Deploy a model with a specified node count - static void classificationDeployModelNodeCount(String projectId, String modelId) { + static void classificationDeployModelNodeCount(String projectId, String modelId) + throws IOException, ExecutionException, InterruptedException { // String projectId = "YOUR_PROJECT_ID"; // String modelId = "YOUR_MODEL_ID"; @@ -54,8 +55,6 @@ static void classificationDeployModelNodeCount(String projectId, String modelId) OperationFuture future = client.deployModelAsync(request); future.get(); System.out.println("Model deployment on 2 nodes finished"); - } catch (IOException | InterruptedException | ExecutionException e) { - e.printStackTrace(); } } } diff --git a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationUndeployModel.java b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationUndeployModel.java index aeae7907038..dd55e8f523c 100644 --- a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationUndeployModel.java +++ b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationUndeployModel.java @@ -30,7 +30,8 @@ class ClassificationUndeployModel { // Deploy a model - static void classificationUndeployModel(String projectId, String modelId) { + static void classificationUndeployModel(String projectId, String modelId) + throws IOException, ExecutionException, InterruptedException { // String projectId = "YOUR_PROJECT_ID"; // String modelId = "YOUR_MODEL_ID"; @@ -54,8 +55,6 @@ static void classificationUndeployModel(String projectId, String modelId) { // Display the deployment details of model. System.out.println("Model undeploy finished"); - } catch (IOException | InterruptedException | ExecutionException e) { - e.printStackTrace(); } } } diff --git a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCount.java b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCount.java index f0fea3defb7..927b3d299f0 100644 --- a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCount.java +++ b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCount.java @@ -30,7 +30,8 @@ class ObjectDetectionDeployModelNodeCount { - static void objectDetectionDeployModelNodeCount(String projectId, String modelId) { + static void objectDetectionDeployModelNodeCount(String projectId, String modelId) + throws IOException, ExecutionException, InterruptedException { // String projectId = "YOUR_PROJECT_ID"; // String modelId = "YOUR_MODEL_ID"; @@ -53,8 +54,6 @@ static void objectDetectionDeployModelNodeCount(String projectId, String modelId OperationFuture future = client.deployModelAsync(request); future.get(); System.out.println("Model deployment on 2 nodes finished"); - } catch (IOException | InterruptedException | ExecutionException e) { - e.printStackTrace(); } } } diff --git a/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelIT.java b/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelIT.java index 524ab5a503f..7612fe89f2f 100644 --- a/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelIT.java +++ b/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ClassificationDeployModelIT.java @@ -19,7 +19,9 @@ import static com.google.common.truth.Truth.assertThat; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.PrintStream; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Before; @@ -27,7 +29,7 @@ public class ClassificationDeployModelIT { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); - private static final String MODEL_ID = "ICN3125115511348658176"; + private static final String MODEL_ID = "ICN0000000000000000000"; private ByteArrayOutputStream bout; private PrintStream out; @@ -45,27 +47,44 @@ public void tearDown() { @Test public void testClassificationDeployModelApi() { - ClassificationDeployModel.classificationDeployModel(PROJECT_ID, MODEL_ID); - - String got = bout.toString(); - assertThat(got).contains("Model deployment finished"); + // 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 { + ClassificationDeployModel.classificationDeployModel(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"); + } + } - ClassificationUndeployModel.classificationUndeployModel(PROJECT_ID, MODEL_ID); + @Test + public void testClassificationUndeployModelApi() { + // 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 { + ClassificationUndeployModel.classificationUndeployModel(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"); + } - got = bout.toString(); - assertThat(got).contains("Model undeploy finished"); } @Test public void testClassificationDeployModelNodeCountApi() { - ClassificationDeployModelNodeCount.classificationDeployModelNodeCount(PROJECT_ID, MODEL_ID); - - String got = bout.toString(); - assertThat(got).contains("Model deployment on 2 nodes finished"); - - ClassificationUndeployModel.classificationUndeployModel(PROJECT_ID, MODEL_ID); - - got = bout.toString(); - assertThat(got).contains("Model undeploy finished"); + // 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 { + ClassificationDeployModelNodeCount.classificationDeployModelNodeCount(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"); + } } } diff --git a/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCountIT.java b/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCountIT.java index 17319e03a22..b2487783d23 100644 --- a/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCountIT.java +++ b/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/ObjectDetectionDeployModelNodeCountIT.java @@ -40,7 +40,7 @@ @SuppressWarnings("checkstyle:abbreviationaswordinname") public class ObjectDetectionDeployModelNodeCountIT { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); - private static final String MODEL_ID = "IOD1854128448151224320"; + private static final String MODEL_ID = "0000000000000000000000"; private ByteArrayOutputStream bout; private PrintStream out; @@ -52,22 +52,21 @@ public void setUp() { } @After - public void tearDown() throws IOException, InterruptedException, ExecutionException { + public void tearDown() { System.setOut(null); - - try (AutoMlClient client = AutoMlClient.create()) { - OperationFuture future = client.undeployModelAsync( - ModelName.of(PROJECT_ID, "us-central1", MODEL_ID).toString()); - - future.get(); - } } @Test public void testObjectDetectionDeployModelNodeCountApi() { - ObjectDetectionDeployModelNodeCount.objectDetectionDeployModelNodeCount(PROJECT_ID, MODEL_ID); - - String got = bout.toString(); - assertThat(got).contains("Model deployment on 2 nodes finished"); + // 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 { + ObjectDetectionDeployModelNodeCount.objectDetectionDeployModelNodeCount(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"); + } } }