diff options
Diffstat (limited to 'adservices/tests/unittest/fixtures/java/com')
6 files changed, 89 insertions, 24 deletions
diff --git a/adservices/tests/unittest/fixtures/java/com/android/adservices/customaudience/DBTrustedBiddingDataFixture.java b/adservices/tests/unittest/fixtures/java/com/android/adservices/customaudience/DBTrustedBiddingDataFixture.java index 14428aa4e3..77ae1dd7ba 100644 --- a/adservices/tests/unittest/fixtures/java/com/android/adservices/customaudience/DBTrustedBiddingDataFixture.java +++ b/adservices/tests/unittest/fixtures/java/com/android/adservices/customaudience/DBTrustedBiddingDataFixture.java @@ -21,10 +21,11 @@ import android.adservices.customaudience.TrustedBiddingDataFixture; import com.android.adservices.data.customaudience.DBTrustedBiddingData; + public class DBTrustedBiddingDataFixture { public static DBTrustedBiddingData.Builder getValidBuilderByBuyer(AdTechIdentifier buyer) { return new DBTrustedBiddingData.Builder() .setUri(TrustedBiddingDataFixture.getValidTrustedBiddingUriByBuyer(buyer)) - .setKeys(TrustedBiddingDataFixture.VALID_TRUSTED_BIDDING_KEYS); + .setKeys(TrustedBiddingDataFixture.getValidTrustedBiddingKeys()); } } diff --git a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/AsyncRegistrationFixture.java b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/AsyncRegistrationFixture.java new file mode 100644 index 0000000000..65a0f05b70 --- /dev/null +++ b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/AsyncRegistrationFixture.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.adservices.service.measurement; + +import android.net.Uri; + +import java.util.UUID; + +public class AsyncRegistrationFixture { + private AsyncRegistrationFixture() {} + + public static AsyncRegistration getValidAsyncRegistration() { + return new AsyncRegistration.Builder() + .setId(UUID.randomUUID().toString()) + .setEnrollmentId(UUID.randomUUID().toString()) + .setRegistrationUri(ValidAsyncRegistrationParams.REGISTRATION_URI) + .setOsDestination(ValidAsyncRegistrationParams.OS_DESTINATION) + .setWebDestination(ValidAsyncRegistrationParams.WEB_DESTINATION) + .setVerifiedDestination(ValidAsyncRegistrationParams.VERIFIED_DESTINATION) + .setRegistrant(ValidAsyncRegistrationParams.REGISTRANT) + .setTopOrigin(ValidAsyncRegistrationParams.TOP_ORIGIN) + .setRedirectType(ValidAsyncRegistrationParams.REDIRECT_TYPE) + .setRedirectCount(ValidAsyncRegistrationParams.REDIRECT_COUNT) + .setSourceType(ValidAsyncRegistrationParams.SOURCE_TYPE) + .setRequestTime(System.currentTimeMillis()) + .setRetryCount(ValidAsyncRegistrationParams.RETRY_COUNT) + .setLastProcessingTime(System.currentTimeMillis()) + .setType(ValidAsyncRegistrationParams.TYPE.ordinal()) + .setDebugKeyAllowed(ValidAsyncRegistrationParams.DEBUG_KEY_ALLOWED) + .build(); + } + + public static class ValidAsyncRegistrationParams { + public static final Source.SourceType SOURCE_TYPE = Source.SourceType.EVENT; + public static final long RETRY_COUNT = 0; + public static final Uri REGISTRATION_URI = Uri.parse("android-app://com.example"); + public static final Uri OS_DESTINATION = Uri.parse("android-app://com.example"); + public static final Uri WEB_DESTINATION = Uri.parse("https://com.example"); + public static final Uri VERIFIED_DESTINATION = Uri.parse("android-app://com.example"); + public static final Uri REGISTRANT = Uri.parse("android-app://com.example"); + public static final Uri TOP_ORIGIN = Uri.parse("android-app://com.example"); + public static final @AsyncRegistration.RedirectType int REDIRECT_TYPE = 1; + public static final int REDIRECT_COUNT = 0; + public static final boolean DEBUG_KEY_ALLOWED = true; + public static final AsyncRegistration.RegistrationType TYPE = + AsyncRegistration.RegistrationType.APP_SOURCE; + } +} diff --git a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/SourceFixture.java b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/SourceFixture.java index 3107113641..4319eb44e3 100644 --- a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/SourceFixture.java +++ b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/SourceFixture.java @@ -20,7 +20,7 @@ import android.net.Uri; import com.android.adservices.LogUtil; import com.android.adservices.service.measurement.aggregation.AggregatableAttributionSource; -import com.android.adservices.service.measurement.aggregation.AggregateFilterData; +import com.android.adservices.service.measurement.util.UnsignedLong; import org.json.JSONArray; import org.json.JSONException; @@ -63,14 +63,14 @@ public final class SourceFixture { .setInstallCooldownWindow(ValidSourceParams.INSTALL_COOLDOWN_WINDOW) .setAttributionMode(ValidSourceParams.ATTRIBUTION_MODE) .setAggregateSource(ValidSourceParams.buildAggregateSource()) - .setAggregateFilterData(ValidSourceParams.buildAggregateFilterData()) + .setFilterData(ValidSourceParams.buildFilterData()) .build(); } public static class ValidSourceParams { public static final Long EXPIRY_TIME = 8640000010L; public static final Long PRIORITY = 100L; - public static final Long SOURCE_EVENT_ID = 1L; + public static final UnsignedLong SOURCE_EVENT_ID = new UnsignedLong(1L); public static final Long SOURCE_EVENT_TIME = 8640000000L; public static final Uri ATTRIBUTION_DESTINATION = Uri.parse("android-app://com.destination"); @@ -81,7 +81,7 @@ public final class SourceFixture { public static final Source.SourceType SOURCE_TYPE = Source.SourceType.EVENT; public static final Long INSTALL_ATTRIBUTION_WINDOW = 841839879274L; public static final Long INSTALL_COOLDOWN_WINDOW = 8418398274L; - public static final Long DEBUG_KEY = 7834690L; + public static final UnsignedLong DEBUG_KEY = new UnsignedLong(7834690L); public static final @Source.AttributionMode int ATTRIBUTION_MODE = Source.AttributionMode.TRUTHFULLY; public static final int AGGREGATE_CONTRIBUTIONS = 0; @@ -100,7 +100,7 @@ public final class SourceFixture { return null; } - public static final String buildAggregateFilterData() { + public static final String buildFilterData() { try { JSONObject filterData = new JSONObject(); filterData.put("conversion_subdomain", @@ -116,8 +116,8 @@ public final class SourceFixture { public static final AggregatableAttributionSource buildAggregatableAttributionSource() { return new AggregatableAttributionSource.Builder() .setAggregatableSource(Map.of("5", new BigInteger("345"))) - .setAggregateFilterData( - new AggregateFilterData.Builder() + .setFilterData( + new FilterData.Builder() .setAttributionFilterMap( Map.of( "product", List.of("1234", "4321"), diff --git a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/TriggerFixture.java b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/TriggerFixture.java index 9018725dc6..c3cc91d6a2 100644 --- a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/TriggerFixture.java +++ b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/TriggerFixture.java @@ -19,8 +19,8 @@ package com.android.adservices.service.measurement; import android.net.Uri; import com.android.adservices.service.measurement.aggregation.AggregatableAttributionTrigger; -import com.android.adservices.service.measurement.aggregation.AggregateFilterData; import com.android.adservices.service.measurement.aggregation.AggregateTriggerData; +import com.android.adservices.service.measurement.util.UnsignedLong; import java.math.BigInteger; import java.util.List; @@ -51,6 +51,7 @@ public final class TriggerFixture { .setAggregateTriggerData(ValidTriggerParams.AGGREGATE_TRIGGER_DATA) .setAggregateValues(ValidTriggerParams.AGGREGATE_VALUES) .setFilters(ValidTriggerParams.TOP_LEVEL_FILTERS_JSON_STRING) + .setNotFilters(ValidTriggerParams.TOP_LEVEL_NOT_FILTERS_JSON_STRING) .build(); } @@ -66,6 +67,9 @@ public final class TriggerFixture { + " \"key_2\": [\"value_1\", \"value_2\"]\n" + "}\n"; + public static final String TOP_LEVEL_NOT_FILTERS_JSON_STRING = + "{\"geo\": [], \"source_type\": [\"event\"]}"; + public static final String EVENT_TRIGGERS = "[\n" + "{\n" @@ -100,11 +104,11 @@ public final class TriggerFixture { + "\"geoValue\":1664" + "}"; - public static final Long DEBUG_KEY = 27836L; + public static final UnsignedLong DEBUG_KEY = new UnsignedLong(27836L); public static final AggregatableAttributionTrigger buildAggregatableAttributionTrigger() { - final AggregateFilterData filter = - new AggregateFilterData.Builder() + final FilterData filter = + new FilterData.Builder() .setAttributionFilterMap( Map.of( "product", diff --git a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/aggregation/AggregateReportFixture.java b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/aggregation/AggregateReportFixture.java index a84b61c7ea..d481e86d58 100644 --- a/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/aggregation/AggregateReportFixture.java +++ b/adservices/tests/unittest/fixtures/java/com/android/adservices/service/measurement/aggregation/AggregateReportFixture.java @@ -20,6 +20,7 @@ import android.net.Uri; import com.android.adservices.LogUtil; import com.android.adservices.service.measurement.EventReport; +import com.android.adservices.service.measurement.util.UnsignedLong; import org.json.JSONException; @@ -34,9 +35,9 @@ public final class AggregateReportFixture { private static final long MIN_TIME_MS = TimeUnit.MINUTES.toMillis(10L); private static final long MAX_TIME_MS = TimeUnit.MINUTES.toMillis(60L); - // Assume the field values in this AggregateReport have no relation to the field + // Assume the field values in this AggregateReport.Builder have no relation to the field // values in {@link ValidAggregateReportParams} - public static AggregateReport getValidAggregateReport() { + public static AggregateReport.Builder getValidAggregateReportBuilder() { return new AggregateReport.Builder() .setPublisher(ValidAggregateReportParams.PUBLISHER) .setAttributionDestination(ValidAggregateReportParams.ATTRIBUTION_DESTINATION) @@ -47,7 +48,11 @@ public final class AggregateReportFixture { .setTriggerDebugKey(ValidAggregateReportParams.TRIGGER_DEBUG_KEY) .setDebugCleartextPayload(ValidAggregateReportParams.getDebugPayload()) .setStatus(EventReport.Status.PENDING) - .build(); + .setDebugReportStatus(EventReport.DebugReportStatus.PENDING); + } + + public static AggregateReport getValidAggregateReport() { + return getValidAggregateReportBuilder().build(); } public static class ValidAggregateReportParams { @@ -56,8 +61,8 @@ public final class AggregateReportFixture { Uri.parse("android-app://com.destination"); public static final long SOURCE_REGISTRATION_TIME = 8640000000L; public static final long TRIGGER_TIME = 8640000000L; - public static final long SOURCE_DEBUG_KEY = 43254545L; - public static final long TRIGGER_DEBUG_KEY = 67878545L; + public static final UnsignedLong SOURCE_DEBUG_KEY = new UnsignedLong(43254545L); + public static final UnsignedLong TRIGGER_DEBUG_KEY = new UnsignedLong(67878545L); public static final String ENROLLMENT_ID = "enrollment-id"; public static final String getDebugPayload() { diff --git a/adservices/tests/unittest/fixtures/java/com/android/adservices/stats/FledgeApiCallStatsMatcher.java b/adservices/tests/unittest/fixtures/java/com/android/adservices/stats/FledgeApiCallStatsMatcher.java index a2235fa4f7..d8cbf3dde5 100644 --- a/adservices/tests/unittest/fixtures/java/com/android/adservices/stats/FledgeApiCallStatsMatcher.java +++ b/adservices/tests/unittest/fixtures/java/com/android/adservices/stats/FledgeApiCallStatsMatcher.java @@ -19,8 +19,6 @@ package com.android.adservices.stats; import static com.android.adservices.service.stats.AdServicesStatsLog.AD_SERVICES_API_CALLED; import static com.android.adservices.service.stats.AdServicesStatsLog.AD_SERVICES_API_CALLED__API_CLASS__FLEDGE; -import static org.mockito.Mockito.argThat; - import com.android.adservices.service.stats.ApiCallStats; import org.mockito.ArgumentMatcher; @@ -55,9 +53,4 @@ public class FledgeApiCallStatsMatcher implements ArgumentMatcher<ApiCallStats> mExpectedApiName, mExpectedResultCode); } - - public static ApiCallStats aCallStatForFledgeApiWithStatus( - int expectedApiName, int expectedResultCode) { - return argThat(new FledgeApiCallStatsMatcher(expectedApiName, expectedResultCode)); - } } |