diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java index 427520da2a01..65277a77463b 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java +++ b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java @@ -73,7 +73,7 @@ protected BaseEmulatorHelper(String emulator, int port, String projectId) { * Returns the emulator runners supported by this emulator. Runners are evaluated in order, the * first available runner is selected and executed */ - protected abstract List emulatorRunners(); + protected abstract List getEmulatorRunners(); /** * Returns a logger. @@ -86,7 +86,7 @@ protected BaseEmulatorHelper(String emulator, int port, String projectId) { */ protected final void startProcess(String blockUntilOutput) throws IOException, InterruptedException { - for (EmulatorRunner runner : emulatorRunners()) { + for (EmulatorRunner runner : getEmulatorRunners()) { // Iterate through all emulator runners until find first available runner. if (runner.isAvailable()) { activeRunner = runner; @@ -262,11 +262,11 @@ private boolean isGcloudInstalled() { } private boolean isEmulatorUpToDate() throws IOException, InterruptedException { - Version currentVersion = installedEmulatorVersion(versionPrefix); + Version currentVersion = getInstalledEmulatorVersion(versionPrefix); return currentVersion != null && currentVersion.compareTo(minVersion) >= 0; } - private Version installedEmulatorVersion(String versionPrefix) + private Version getInstalledEmulatorVersion(String versionPrefix) throws IOException, InterruptedException { Process process = CommandWrapper.create() diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java b/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java index c37fbafbb4cf..7219dcf8025f 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java @@ -46,7 +46,7 @@ private TestEmulatorHelper(List runners, String blockUntil) { } @Override - protected List emulatorRunners() { + protected List getEmulatorRunners() { return runners; } 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 index 2cbf8a764228..7fb51f14f122 100644 --- 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 @@ -107,7 +107,7 @@ private LocalDatastoreHelper(double consistency) { } @Override - protected List emulatorRunners() { + protected List getEmulatorRunners() { return emulatorRunners; } diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubSubHelper.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubSubHelper.java index a877f01a8574..3ad7e9151059 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubSubHelper.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubSubHelper.java @@ -83,7 +83,7 @@ private LocalPubSubHelper() { } @Override - protected List emulatorRunners() { + protected List getEmulatorRunners() { return emulatorRunners; }