1 files changed, 74 insertions, 67 deletions
diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/reporting/EventReportPayloadTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/reporting/EventReportPayloadTest.java
index cd590525d1..c12ee6ea6b 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/reporting/EventReportPayloadTest.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/reporting/EventReportPayloadTest.java
@@ -19,6 +19,8 @@ package com.android.adservices.service.measurement.reporting;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import com.android.adservices.service.measurement.util.UnsignedLong;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
@@ -26,94 +28,72 @@ import org.junit.Test;
 public class EventReportPayloadTest {
 
     private static final String ATTRIBUTION_DESTINATION = "https://toasters.example";
-    private static final String SOURCE_EVENT_ID = "12345";
-    private static final String TRIGGER_DATA = "2";
+    private static final UnsignedLong SOURCE_EVENT_ID = new UnsignedLong(12345L);
+    private static final UnsignedLong TRIGGER_DATA = new UnsignedLong(2L);
     private static final String REPORT_ID = "678";
     private static final String SOURCE_TYPE = "event";
     private static final double RANDOMIZED_TRIGGER_RATE = 0.0024;
-    private static final Long SOURCE_DEBUG_KEY = 3894783L;
-    private static final Long TRIGGER_DEBUG_KEY = 2387222L;
+    private static final UnsignedLong SOURCE_DEBUG_KEY = new UnsignedLong(3894783L);
+    private static final UnsignedLong TRIGGER_DEBUG_KEY = new UnsignedLong(2387222L);
 
-    private EventReportPayload createEventReportPayloadExample1() {
+    private static EventReportPayload createEventReportPayload(UnsignedLong triggerData,
+            UnsignedLong sourceDebugKey, UnsignedLong triggerDebugKey) {
         return new EventReportPayload.Builder()
                 .setAttributionDestination(ATTRIBUTION_DESTINATION)
                 .setSourceEventId(SOURCE_EVENT_ID)
-                .setTriggerData(TRIGGER_DATA)
+                .setTriggerData(triggerData)
                 .setReportId(REPORT_ID)
                 .setSourceType(SOURCE_TYPE)
                 .setRandomizedTriggerRate(RANDOMIZED_TRIGGER_RATE)
-                .setSourceDebugKey(SOURCE_DEBUG_KEY)
-                .setTriggerDebugKey(TRIGGER_DEBUG_KEY)
-                .build();
-    }
-
-    private EventReportPayload createEventReportPayloadWithNullDebugKeys() {
-        return new EventReportPayload.Builder()
-                .setAttributionDestination(ATTRIBUTION_DESTINATION)
-                .setSourceEventId(SOURCE_EVENT_ID)
-                .setTriggerData(TRIGGER_DATA)
-                .setReportId(REPORT_ID)
-                .setSourceType(SOURCE_TYPE)
-                .setRandomizedTriggerRate(RANDOMIZED_TRIGGER_RATE)
-                .setSourceDebugKey(null)
-                .setTriggerDebugKey(null)
-                .build();
-    }
-
-    private EventReportPayload createEventReportPayloadWithSingleTriggerDebugKeys() {
-        return new EventReportPayload.Builder()
-                .setAttributionDestination(ATTRIBUTION_DESTINATION)
-                .setSourceEventId(SOURCE_EVENT_ID)
-                .setTriggerData(TRIGGER_DATA)
-                .setReportId(REPORT_ID)
-                .setSourceType(SOURCE_TYPE)
-                .setRandomizedTriggerRate(RANDOMIZED_TRIGGER_RATE)
-                .setTriggerDebugKey(TRIGGER_DEBUG_KEY)
-                .build();
-    }
-
-    private EventReportPayload createEventReportPayloadWithSingleSourceDebugKeys() {
-        return new EventReportPayload.Builder()
-                .setAttributionDestination(ATTRIBUTION_DESTINATION)
-                .setSourceEventId(SOURCE_EVENT_ID)
-                .setTriggerData(TRIGGER_DATA)
-                .setReportId(REPORT_ID)
-                .setSourceType(SOURCE_TYPE)
-                .setRandomizedTriggerRate(RANDOMIZED_TRIGGER_RATE)
-                .setSourceDebugKey(SOURCE_DEBUG_KEY)
+                .setSourceDebugKey(sourceDebugKey)
+                .setTriggerDebugKey(triggerDebugKey)
                 .build();
     }
 
     @Test
     public void testEventPayloadJsonSerialization() throws JSONException {
-        EventReportPayload eventReport = createEventReportPayloadExample1();
+        EventReportPayload eventReport =
+                createEventReportPayload(TRIGGER_DATA, SOURCE_DEBUG_KEY, TRIGGER_DEBUG_KEY);
         JSONObject eventPayloadReportJson = eventReport.toJson();
 
         assertEquals(ATTRIBUTION_DESTINATION,
                 eventPayloadReportJson.get("attribution_destination"));
-        assertEquals(SOURCE_EVENT_ID, eventPayloadReportJson.get("source_event_id"));
-        assertEquals(TRIGGER_DATA, eventPayloadReportJson.get("trigger_data"));
+        assertEquals(SOURCE_EVENT_ID.toString(), eventPayloadReportJson.get("source_event_id"));
+        assertEquals(TRIGGER_DATA.toString(), eventPayloadReportJson.get("trigger_data"));
         assertEquals(REPORT_ID, eventPayloadReportJson.get("report_id"));
         assertEquals(SOURCE_TYPE, eventPayloadReportJson.get("source_type"));
         assertEquals(RANDOMIZED_TRIGGER_RATE,
                 eventPayloadReportJson.get("randomized_trigger_rate"));
+        assertEquals(SOURCE_DEBUG_KEY.toString(), eventPayloadReportJson.get("source_debug_key"));
+        assertEquals(TRIGGER_DEBUG_KEY.toString(), eventPayloadReportJson.get("trigger_debug_key"));
+    }
+
+    @Test
+    public void testEventPayloadJsonSerializationWithNullDebugKeys() throws JSONException {
+        EventReportPayload eventReport = createEventReportPayload(TRIGGER_DATA, null, null);
+        JSONObject eventPayloadReportJson = eventReport.toJson();
+
         assertEquals(
-                Long.toUnsignedString(SOURCE_DEBUG_KEY),
-                eventPayloadReportJson.get("source_debug_key"));
+                ATTRIBUTION_DESTINATION, eventPayloadReportJson.get("attribution_destination"));
+        assertEquals(SOURCE_EVENT_ID.toString(), eventPayloadReportJson.get("source_event_id"));
+        assertEquals(TRIGGER_DATA.toString(), eventPayloadReportJson.get("trigger_data"));
+        assertEquals(REPORT_ID, eventPayloadReportJson.get("report_id"));
+        assertEquals(SOURCE_TYPE, eventPayloadReportJson.get("source_type"));
         assertEquals(
-                Long.toUnsignedString(TRIGGER_DEBUG_KEY),
-                eventPayloadReportJson.get("trigger_debug_key"));
+                RANDOMIZED_TRIGGER_RATE, eventPayloadReportJson.get("randomized_trigger_rate"));
+        assertNull(eventPayloadReportJson.opt("source_debug_key"));
+        assertNull(eventPayloadReportJson.opt("trigger_debug_key"));
     }
 
     @Test
-    public void testEventPayloadJsonSerializationWithNullDebugKeys() throws JSONException {
-        EventReportPayload eventReport = createEventReportPayloadWithNullDebugKeys();
+    public void testEventPayloadJsonSerializationWithNullTriggerData() throws JSONException {
+        EventReportPayload eventReport = createEventReportPayload(null, null, null);
         JSONObject eventPayloadReportJson = eventReport.toJson();
 
         assertEquals(
                 ATTRIBUTION_DESTINATION, eventPayloadReportJson.get("attribution_destination"));
-        assertEquals(SOURCE_EVENT_ID, eventPayloadReportJson.get("source_event_id"));
-        assertEquals(TRIGGER_DATA, eventPayloadReportJson.get("trigger_data"));
+        assertEquals(SOURCE_EVENT_ID.toString(), eventPayloadReportJson.get("source_event_id"));
+        assertEquals(new UnsignedLong(0L).toString(), eventPayloadReportJson.get("trigger_data"));
         assertEquals(REPORT_ID, eventPayloadReportJson.get("report_id"));
         assertEquals(SOURCE_TYPE, eventPayloadReportJson.get("source_type"));
         assertEquals(
@@ -124,39 +104,66 @@ public class EventReportPayloadTest {
 
     @Test
     public void testEventPayloadJsonSerializationWithSingleTriggerDebugKeys() throws JSONException {
-        EventReportPayload eventReport = createEventReportPayloadWithSingleTriggerDebugKeys();
+        EventReportPayload eventReport =
+                createEventReportPayload(TRIGGER_DATA, null, TRIGGER_DEBUG_KEY);
         JSONObject eventPayloadReportJson = eventReport.toJson();
 
         assertEquals(
                 ATTRIBUTION_DESTINATION, eventPayloadReportJson.get("attribution_destination"));
-        assertEquals(SOURCE_EVENT_ID, eventPayloadReportJson.get("source_event_id"));
-        assertEquals(TRIGGER_DATA, eventPayloadReportJson.get("trigger_data"));
+        assertEquals(SOURCE_EVENT_ID.toString(), eventPayloadReportJson.get("source_event_id"));
+        assertEquals(TRIGGER_DATA.toString(), eventPayloadReportJson.get("trigger_data"));
         assertEquals(REPORT_ID, eventPayloadReportJson.get("report_id"));
         assertEquals(SOURCE_TYPE, eventPayloadReportJson.get("source_type"));
         assertEquals(
                 RANDOMIZED_TRIGGER_RATE, eventPayloadReportJson.get("randomized_trigger_rate"));
         assertNull(eventPayloadReportJson.opt("source_debug_key"));
+        assertEquals(TRIGGER_DEBUG_KEY.toString(), eventPayloadReportJson.get("trigger_debug_key"));
+    }
+
+    @Test
+    public void testEventPayloadJsonSerialization_debugKeysSourceEventIdAndTriggerDataUse64thBit()
+            throws JSONException {
+        String unsigned64BitIntString = "18446744073709551615";
+        UnsignedLong signed64BitInt = new UnsignedLong(-1L);
+        EventReportPayload eventReport = new EventReportPayload.Builder()
+                .setAttributionDestination(ATTRIBUTION_DESTINATION)
+                .setSourceEventId(signed64BitInt)
+                .setTriggerData(signed64BitInt)
+                .setReportId(REPORT_ID)
+                .setSourceType(SOURCE_TYPE)
+                .setRandomizedTriggerRate(RANDOMIZED_TRIGGER_RATE)
+                .setSourceDebugKey(signed64BitInt)
+                .setTriggerDebugKey(signed64BitInt)
+                .build();
+        JSONObject eventPayloadReportJson = eventReport.toJson();
+
         assertEquals(
-                Long.toUnsignedString(TRIGGER_DEBUG_KEY),
-                eventPayloadReportJson.get("trigger_debug_key"));
+                ATTRIBUTION_DESTINATION, eventPayloadReportJson.get("attribution_destination"));
+        assertEquals(unsigned64BitIntString, eventPayloadReportJson.get("source_event_id"));
+        assertEquals(unsigned64BitIntString, eventPayloadReportJson.get("trigger_data"));
+        assertEquals(REPORT_ID, eventPayloadReportJson.get("report_id"));
+        assertEquals(SOURCE_TYPE, eventPayloadReportJson.get("source_type"));
+        assertEquals(
+                RANDOMIZED_TRIGGER_RATE, eventPayloadReportJson.get("randomized_trigger_rate"));
+        assertEquals(unsigned64BitIntString, eventPayloadReportJson.opt("source_debug_key"));
+        assertEquals(unsigned64BitIntString, eventPayloadReportJson.get("trigger_debug_key"));
     }
 
     @Test
     public void testEventPayloadJsonSerializationWithSingleSourceDebugKeys() throws JSONException {
-        EventReportPayload eventReport = createEventReportPayloadWithSingleSourceDebugKeys();
+        EventReportPayload eventReport =
+                createEventReportPayload(TRIGGER_DATA, SOURCE_DEBUG_KEY, null);
         JSONObject eventPayloadReportJson = eventReport.toJson();
 
         assertEquals(
                 ATTRIBUTION_DESTINATION, eventPayloadReportJson.get("attribution_destination"));
-        assertEquals(SOURCE_EVENT_ID, eventPayloadReportJson.get("source_event_id"));
-        assertEquals(TRIGGER_DATA, eventPayloadReportJson.get("trigger_data"));
+        assertEquals(SOURCE_EVENT_ID.toString(), eventPayloadReportJson.get("source_event_id"));
+        assertEquals(TRIGGER_DATA.toString(), eventPayloadReportJson.get("trigger_data"));
         assertEquals(REPORT_ID, eventPayloadReportJson.get("report_id"));
         assertEquals(SOURCE_TYPE, eventPayloadReportJson.get("source_type"));
         assertEquals(
                 RANDOMIZED_TRIGGER_RATE, eventPayloadReportJson.get("randomized_trigger_rate"));
         assertNull(eventPayloadReportJson.opt("trigger_debug_key"));
-        assertEquals(
-                Long.toUnsignedString(SOURCE_DEBUG_KEY),
-                eventPayloadReportJson.get("source_debug_key"));
+        assertEquals(SOURCE_DEBUG_KEY.toString(), eventPayloadReportJson.get("source_debug_key"));
     }
 }