Brie/firebase sunset updates (#21)

* Bump Firebase dependency to 17.2.0

Author: briemcnally

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+1.4.0 / 2019-09-09
+==================
+
+  * Bump Firebase to 17.2.0
+
 1.3.1 / 2019-07-17
 ==================
 

build.gradle

@@ -55,7 +55,7 @@ dependencies {
   }
 
   api 'com.segment.analytics.android:analytics:4.3.1'
-  implementation 'com.google.firebase:firebase-core:17.0.1'
+  implementation 'com.google.firebase:firebase-analytics:17.2.0'
 
   testImplementation 'com.segment.analytics.android:analytics-tests:4.3.1'
   testImplementation 'junit:junit:4.12'

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.segment.analytics.android.integrations
 
-VERSION=1.3.1
+VERSION=1.4.0-SNAPSHOT
 
 POM_ARTIFACT_ID=firebase
 POM_PACKAGING=aar

src/main/java/com/segment/analytics/android/integrations/firebase/FirebaseIntegration.java

@@ -79,7 +79,6 @@ private static Map<String, String> createEventMap() {
     EVENT_MAPPER.put("Product Shared", Event.SHARE);
     EVENT_MAPPER.put("Product Clicked", Event.SELECT_CONTENT);
     EVENT_MAPPER.put("Product Searched", Event.SEARCH);
-    EVENT_MAPPER.put("Promotion Viewed", Event.PRESENT_OFFER);
     return EVENT_MAPPER;
   }
 
@@ -189,7 +188,11 @@ && isNullOrEmpty(properties.currency())) {
   }
 
   public static String makeKey(String key) {
-    key = key.trim().replaceAll(" ", "_");
+    if (key.contains(".")) {
+      key = key.trim().replace(".", "_");
+    } else {
+      key = key.trim().replaceAll(" ", "_");
+    }
     return key.substring(0, Math.min(key.length(), 40));
   }
 }

src/test/java/com/segment/analytics/android/integration/firebase/FirebaseTest.java

@@ -9,18 +9,14 @@
 import com.segment.analytics.integrations.IdentifyPayload;
 import com.segment.analytics.integrations.Logger;
 import com.segment.analytics.integrations.TrackPayload;
-import com.segment.analytics.test.TrackPayloadBuilder;
 
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
-import org.mockito.InOrder;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -37,7 +33,6 @@
 import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 
 @RunWith(RobolectricTestRunner.class)
@@ -100,6 +95,7 @@ public void trackWithProperties() {
                 .putValue("string", "foo")
                 .putValue("date", new Date(117, 0, 1))
                 .putValue("key with spaces", "bar")
+                .putValue("key.with.periods", "test")
                 .putValue("total", 100.0)
                 .putValue("  extra spaces   ", "baz");
 
@@ -111,13 +107,42 @@ public void trackWithProperties() {
         expected.putString("string", "foo");
         expected.putString("date", String.valueOf(new Date(117, 0, 1)));
         expected.putString("key_with_spaces", "bar");
+        expected.putString("key_with_periods", "test");
         expected.putDouble("value", 100.0);
         expected.putString("currency", "USD");
         expected.putString("extra_spaces", "baz");
 
         verify(firebase).logEvent(eq("foo"), bundleEq(expected));
     }
 
+    @Test
+    public void trackWithEventNameTransformation() {
+        Properties properties = new Properties()
+                .putValue("integer", 1)
+                .putValue("double", 1.0)
+                .putValue("string", "foo")
+                .putValue("date", new Date(117, 0, 1))
+                .putValue("key with spaces", "bar")
+                .putValue("key.with.periods", "test")
+                .putValue("total", 100.0)
+                .putValue("  extra spaces   ", "baz");
+
+        integration.track(new TrackPayload.Builder().anonymousId("1234").properties(properties).event("foo.bar").build());
+
+        Bundle expected = new Bundle();
+        expected.putInt("integer", 1);
+        expected.putDouble("double", 1.0);
+        expected.putString("string", "foo");
+        expected.putString("date", String.valueOf(new Date(117, 0, 1)));
+        expected.putString("key_with_spaces", "bar");
+        expected.putString("key_with_periods", "test");
+        expected.putDouble("value", 100.0);
+        expected.putString("currency", "USD");
+        expected.putString("extra_spaces", "baz");
+
+        verify(firebase).logEvent(eq("foo_bar"), bundleEq(expected));
+    }
+
     /**
      * Uses the string representation of the object. Useful for JSON objects.
      * @param expected Expected object