add useEmulator test

Author: kroikie

firebase-functions/firebase-functions.gradle

@@ -48,12 +48,6 @@ android {
     testOptions.unitTests.includeAndroidResources = true
 }
 
-configurations {
-    all {
-        exclude module: 'commons-logging'
-    }
-}
-
 dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-components')
@@ -69,7 +63,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-iid-interop:17.0.0'
 
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'commons-validator:commons-validator:1.7'
 
     annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
 

firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseFunctionsTest.java

@@ -65,6 +65,14 @@ public void testGetUrl_withEmulator() {
 
     URL withRegion = functionsWithRegion.getURL("my-endpoint");
     assertEquals("http://10.0.2.2:5001/my-project/my-region/my-endpoint", withRegion.toString());
+
+    FirebaseFunctions functionsWithCustomDomain =
+        FirebaseFunctions.getInstance(app, "https://mydomain.com");
+    functionsWithCustomDomain.useEmulator("10.0.2.2", 5001);
+
+    URL withCustomDOmain = functionsWithCustomDomain.getURL("my-endpoint");
+    assertEquals(
+        "http://10.0.2.2:5001/my-project/us-central1/my-endpoint", withCustomDOmain.toString());
   }
 
   @Test

firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java

@@ -42,7 +42,6 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.apache.commons.validator.routines.UrlValidator;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -74,17 +73,14 @@ public class FirebaseFunctions {
   private final String projectId;
 
   // The region to use for all function references.
-  @Nullable private final String region;
+  private final String region;
 
   // A custom domain for the http trigger, such as "https://mydomain.com"
   @Nullable private final String customDomain;
 
   // The format to use for constructing urls from region, projectId, and name.
   private String urlFormat = "https://%1$s-%2$s.cloudfunctions.net/%3$s";
 
-  // Allowed custom domain protocols.
-  private String[] customDomainSchemes = {"http", "https"};
-
   // Emulator settings
   @Nullable private EmulatedServiceSettings emulatorSettings;
 
@@ -100,13 +96,20 @@ public class FirebaseFunctions {
     this.contextProvider = Preconditions.checkNotNull(contextProvider);
     this.projectId = Preconditions.checkNotNull(projectId);
 
-    UrlValidator validator = new UrlValidator(customDomainSchemes);
-    if (validator.isValid(regionOrCustomDomain)) {
-      this.region = null;
-      this.customDomain = regionOrCustomDomain;
-    } else {
+    boolean isRegion;
+    try {
+      new URL(regionOrCustomDomain);
+      isRegion = false;
+    } catch (MalformedURLException malformedURLException) {
+      isRegion = true;
+    }
+
+    if (isRegion) {
       this.region = regionOrCustomDomain;
       this.customDomain = null;
+    } else {
+      this.region = "us-central1";
+      this.customDomain = regionOrCustomDomain;
     }
 
     maybeInstallProviders(context);
@@ -209,21 +212,22 @@ public HttpsCallableReference getHttpsCallable(@NonNull String name) {
    */
   @VisibleForTesting
   URL getURL(String function) {
-    String str;
-    if (customDomain != null) {
+    EmulatedServiceSettings emulatorSettings = this.emulatorSettings;
+    if (emulatorSettings != null) {
+      urlFormat =
+          "http://"
+              + emulatorSettings.getHost()
+              + ":"
+              + emulatorSettings.getPort()
+              + "/%2$s/%1$s/%3$s";
+    }
+
+    String str = String.format(urlFormat, region, projectId, function);
+
+    if (customDomain != null && emulatorSettings == null) {
       str = customDomain + "/" + function;
-    } else {
-      EmulatedServiceSettings emulatorSettings = this.emulatorSettings;
-      if (emulatorSettings != null) {
-        urlFormat =
-            "http://"
-                + emulatorSettings.getHost()
-                + ":"
-                + emulatorSettings.getPort()
-                + "/%2$s/%1$s/%3$s";
-      }
-      str = String.format(urlFormat, region, projectId, function);
     }
+
     try {
       return new URL(str);
     } catch (MalformedURLException mfe) {