moving emulator health check to src/test

jainsahab · jainsahab · commit 7f4ce8d92548 · 2023-11-22T15:55:57.000Z
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -99,25 +99,6 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper<DatastoreOptions> {
           .setCredentials(NoCredentials.getInstance())
           .setRetrySettings(ServiceOptions.getNoRetrySettings());
 
-  String sendGetRequest(String request) throws IOException {
-
-    URL url = new URL("http", DEFAULT_HOST, this.getPort(), request);
-    HttpURLConnection con = (HttpURLConnection) url.openConnection();
-    con.setRequestMethod("GET");
-
-    InputStream in = con.getInputStream();
-    String response = CharStreams.toString(new InputStreamReader(con.getInputStream()));
-    in.close();
-    return response;
-  }
-
-  public String checkHealth() {
-    try {
-      return sendGetRequest("/");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
 
   /** A builder for {@code LocalDatastoreHelper} objects. */
   public static class Builder {
@@ -344,8 +325,6 @@ public void reset() throws IOException {
    */
   @Override
   public void stop(Duration timeout) throws IOException, InterruptedException, TimeoutException {
-    // TODO(gapic_upgrade): Temporarily addressing the flaky connection refused error
-    checkHealth();
     sendPostRequest("/shutdown");
     waitForProcess(timeout);
     deleteRecursively(gcdPath);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
@@ -192,6 +192,8 @@ public void setUp() {
 
   @AfterClass
   public static void afterClass() throws IOException, InterruptedException, TimeoutException {
+    // TODO(gapic_upgrade): Temporarily addressing the flaky connection refused error
+    EmulatorUtils.checkHealth(helper.getPort());
     helper.stop(Duration.ofMinutes(1));
   }
 
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EmulatorUtils.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EmulatorUtils.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.cloud.datastore;
+
+import com.google.common.io.CharStreams;
+import org.easymock.EasyMock;
+import org.easymock.IArgumentMatcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.function.Predicate;
+
+public class EmulatorUtils {
+  static String sendGetRequest(int port, String request) throws IOException {
+
+    URL url = new URL("http", "localhost", port, request);
+    HttpURLConnection con = (HttpURLConnection) url.openConnection();
+    con.setRequestMethod("GET");
+
+    InputStream in = con.getInputStream();
+    String response = CharStreams.toString(new InputStreamReader(con.getInputStream()));
+    in.close();
+    return response;
+  }
+
+  public static String checkHealth(int port) {
+    try {
+      return sendGetRequest(port, "/");
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,8 @@ public void setUp() {`
`192`	`192`
`193`	`193`	`@AfterClass`
`194`	`194`	`public static void afterClass() throws IOException, InterruptedException, TimeoutException {`
	`195`	`+ // TODO(gapic_upgrade): Temporarily addressing the flaky connection refused error`
	`196`	`+ EmulatorUtils.checkHealth(helper.getPort());`
`195`	`197`	`helper.stop(Duration.ofMinutes(1));`
`196`	`198`	`}`
`197`	`199`