Fix trueTimestamp not set by SelfDescribing builder (close #451)

snowplow · Jun 16, 2021 · 6706c8c · 6706c8c
1 parent 19969cc
commit 6706c8c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/snowplow-tracker/build.gradle b/snowplow-tracker/build.gradle
@@ -84,7 +84,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     // test
     testImplementation "androidx.lifecycle:lifecycle-extensions:$project.archLifecycleVersion"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'com.google.android.gms:play-services-analytics:17.0.0'

diff --git a/...tracker/src/androidTest/java/com/snowplowanalytics/snowplow/event/SelfDescribingTest.java b/...tracker/src/androidTest/java/com/snowplowanalytics/snowplow/event/SelfDescribingTest.java
@@ -0,0 +1,17 @@
+package com.snowplowanalytics.snowplow.event;
+
+import android.test.AndroidTestCase;
+
+import com.snowplowanalytics.snowplow.payload.SelfDescribingJson;
+
+public class SelfDescribingTest extends AndroidTestCase {
+
+    public void testSetTrueTimestamp() {
+        Event e = SelfDescribing.builder()
+                .eventData(new SelfDescribingJson("schema"))
+                .trueTimestamp(123456789)
+                .build();
+        assertEquals(new Long(123456789), e.getTrueTimestamp());
+    }
+
+}
diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/event/SelfDescribing.java b/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/event/SelfDescribing.java
@@ -62,7 +62,17 @@ public static Builder<?> builder() {
     }
 
     protected SelfDescribing(@NonNull Builder<?> builder) {
-        this(builder.eventData);
+        super(builder);
+        Preconditions.checkNotNull(builder.eventData);
+        Map<String, Object> eventDataMap = builder.eventData.getMap();
+        Preconditions.checkNotNull(eventDataMap);
+        Map<String, Object> payload = (Map<String, Object>)eventDataMap.get(Parameters.DATA);
+        Preconditions.checkNotNull(payload);
+        this.payload = payload;
+        String schema = (String)eventDataMap.get(Parameters.SCHEMA);
+        Preconditions.checkNotNull(schema);
+        this.schema = schema;
+        this.eventData = builder.eventData;
     }
 
     @NonNull