summaryrefslogtreecommitdiff
path: root/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java')
-rw-r--r--adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java33
1 files changed, 17 insertions, 16 deletions
diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java
index f0be0f6766..ca528c9a38 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/EventReportTest.java
@@ -15,11 +15,7 @@
*/
package com.android.adservices.service.measurement;
-import static com.android.adservices.service.Flags.MEASUREMENT_EVENT_NOISE_PROBABILITY;
-import static com.android.adservices.service.Flags.MEASUREMENT_INSTALL_ATTR_EVENT_NOISE_PROBABILITY;
-import static com.android.adservices.service.Flags.MEASUREMENT_INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY;
import static com.android.adservices.service.Flags.MEASUREMENT_MIN_EVENT_REPORT_DELAY_MILLIS;
-import static com.android.adservices.service.Flags.MEASUREMENT_NAVIGATION_NOISE_PROBABILITY;
import static com.android.adservices.service.measurement.PrivacyParams.INSTALL_ATTR_NAVIGATION_EARLY_REPORTING_WINDOW_MILLISECONDS;
import static com.android.adservices.service.measurement.PrivacyParams.NAVIGATION_EARLY_REPORTING_WINDOW_MILLISECONDS;
import static com.android.adservices.service.measurement.SourceFixture.ValidSourceParams;
@@ -67,6 +63,11 @@ public final class EventReportTest {
public final TestableDeviceConfig.TestableDeviceConfigRule mDeviceConfigRule =
new TestableDeviceConfig.TestableDeviceConfigRule();
+ private static final double EVENT_NOISE_PROBABILITY = 0.0000025D;
+ private static final double INSTALL_ATTR_EVENT_NOISE_PROBABILITY = 0.0000125D;
+ private static final double INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY = 0.0024263D;
+ private static final double NAVIGATION_NOISE_PROBABILITY = 0.0024263D;
+
private static final double DOUBLE_MAX_DELTA = 0.0000001D;
private static final long TRIGGER_PRIORITY = 345678L;
@@ -288,7 +289,7 @@ public final class EventReportTest {
assertEquals(source.getEventReportWindow() + MEASUREMENT_MIN_EVENT_REPORT_DELAY_MILLIS,
report.getReportTime());
assertEquals(source.getSourceType(), report.getSourceType());
- assertEquals(MEASUREMENT_EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ assertEquals(EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -297,7 +298,6 @@ public final class EventReportTest {
@Test
public void populate_eventSourceAppDestWithoutInstallConfigured() throws JSONException {
long baseTime = System.currentTimeMillis();
- doReturn(true).when(mFlags).getMeasurementEnableConfigurableEventReportingWindows();
String earlyReportingWindows1h1d =
String.join(
",",
@@ -306,7 +306,6 @@ public final class EventReportTest {
doReturn(earlyReportingWindows1h1d)
.when(mFlags)
.getMeasurementEventReportsVtcEarlyReportingWindows();
- doReturn(true).when(mFlags).getMeasurementEnableVtcConfigurableMaxEventReports();
doReturn(3).when(mFlags).getMeasurementVtcConfigurableMaxEventReportsCount();
Source source =
createSourceForTest(
@@ -390,7 +389,7 @@ public final class EventReportTest {
report.getReportTime());
assertEquals(Source.SourceType.NAVIGATION, report.getSourceType());
assertEquals(
- MEASUREMENT_NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -430,7 +429,7 @@ public final class EventReportTest {
assertEquals(source.getEventReportWindow() + MEASUREMENT_MIN_EVENT_REPORT_DELAY_MILLIS,
report.getReportTime());
assertEquals(Source.SourceType.EVENT, report.getSourceType());
- assertEquals(MEASUREMENT_EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ assertEquals(EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -468,7 +467,7 @@ public final class EventReportTest {
report.getReportTime());
assertEquals(Source.SourceType.EVENT, report.getSourceType());
assertEquals(
- MEASUREMENT_INSTALL_ATTR_EVENT_NOISE_PROBABILITY,
+ INSTALL_ATTR_EVENT_NOISE_PROBABILITY,
report.getRandomizedTriggerRate(),
DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
@@ -507,7 +506,7 @@ public final class EventReportTest {
assertEquals(source.getEventReportWindow() + MEASUREMENT_MIN_EVENT_REPORT_DELAY_MILLIS,
report.getReportTime());
assertEquals(Source.SourceType.EVENT, report.getSourceType());
- assertEquals(MEASUREMENT_EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ assertEquals(EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -548,7 +547,7 @@ public final class EventReportTest {
report.getReportTime());
assertEquals(Source.SourceType.NAVIGATION, report.getSourceType());
assertEquals(
- MEASUREMENT_NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -589,7 +588,7 @@ public final class EventReportTest {
report.getReportTime());
assertEquals(source.getSourceType(), report.getSourceType());
assertEquals(
- MEASUREMENT_NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -633,7 +632,7 @@ public final class EventReportTest {
report.getReportTime());
assertEquals(Source.SourceType.NAVIGATION, report.getSourceType());
assertEquals(
- MEASUREMENT_INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY,
+ INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY,
report.getRandomizedTriggerRate(),
DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
@@ -679,7 +678,7 @@ public final class EventReportTest {
report.getReportTime());
assertEquals(source.getSourceType(), report.getSourceType());
assertEquals(
- MEASUREMENT_NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ NAVIGATION_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -698,6 +697,7 @@ public final class EventReportTest {
.setEnrollmentId("enrollment-id")
.setAppDestinations(Collections.singletonList(APP_DESTINATION))
.setWebDestinations(Collections.singletonList(WEB_DESTINATION))
+ .setExpiryTime(baseTime + TimeUnit.DAYS.toMillis(30))
.setEventReportWindow(baseTime + TimeUnit.DAYS.toMillis(10))
.setCoarseEventReportDestinations(true)
.build();
@@ -738,7 +738,7 @@ public final class EventReportTest {
assertEquals(source.getEventReportWindow() + MEASUREMENT_MIN_EVENT_REPORT_DELAY_MILLIS,
report.getReportTime());
assertEquals(Source.SourceType.EVENT, report.getSourceType());
- assertEquals(MEASUREMENT_EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
+ assertEquals(EVENT_NOISE_PROBABILITY, report.getRandomizedTriggerRate(), DOUBLE_MAX_DELTA);
assertEquals(SOURCE_ID, report.getSourceId());
assertEquals(TRIGGER_ID, report.getTriggerId());
assertEquals(REGISTRATION_ORIGIN, report.getRegistrationOrigin());
@@ -855,6 +855,7 @@ public final class EventReportTest {
.setEnrollmentId("enrollment-id")
.setAppDestinations(getNullableUriList(appDestination))
.setWebDestinations(getNullableUriList(webDestination))
+ .setExpiryTime(eventTime + TimeUnit.DAYS.toMillis(30))
.setEventReportWindow(eventTime + TimeUnit.DAYS.toMillis(10))
.build();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 04:28:42 +0000