diff options
Diffstat (limited to 'adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java')
| -rw-r--r-- | adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java index baeab5ff74..f55d7d28eb 100644 --- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java +++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java @@ -16,6 +16,8 @@ package com.android.adservices.service.measurement.aggregation; +import com.android.adservices.service.measurement.FilterData; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -48,12 +50,12 @@ public final class AggregatePayloadGeneratorTest { Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); sourceFilterMap.put("ctid", Collections.singletonList("id")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); @@ -67,9 +69,9 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(1024L)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()) - .setNotFilter(new AggregateFilterData.Builder() + .setNotFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataNotFilter1).build()).build()); // Apply this key_piece to "geoValue". triggerDataList.add( @@ -107,18 +109,18 @@ public final class AggregatePayloadGeneratorTest { Map<String, BigInteger> aggregatableSource = new HashMap<>(); aggregatableSource.put("campaignCounts", BigInteger.valueOf(345L)); aggregatableSource.put("geoValue", BigInteger.valueOf(5L)); - aggregatableSource.put("thirdSource", BigInteger.valueOf(100L)); + aggregatableSource.put("thirdSource", BigInteger.valueOf(101L)); Map<String, List<String>> sourceFilterMap = new HashMap<>(); sourceFilterMap.put("conversion_subdomain", Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); sourceFilterMap.put("ctid", Collections.singletonList("id")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); // Apply this key_piece to "campaignCounts". @@ -131,9 +133,9 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(1024L)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()) - .setNotFilter(new AggregateFilterData.Builder() + .setNotFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataNotFilter1).build()) .build()); // Apply this key_piece to "geoValue". @@ -158,13 +160,16 @@ public final class AggregatePayloadGeneratorTest { assertTrue(aggregateHistogramContributions.isPresent()); List<AggregateHistogramContribution> contributions = aggregateHistogramContributions.get(); - assertEquals(contributions.size(), 2); + assertEquals(contributions.size(), 3); assertTrue(contributions.contains( new AggregateHistogramContribution.Builder() .setKey(BigInteger.valueOf(1369L)).setValue(32768).build())); assertTrue(contributions.contains( new AggregateHistogramContribution.Builder() .setKey(BigInteger.valueOf(2693L)).setValue(1664).build())); + assertTrue(contributions.contains( + new AggregateHistogramContribution.Builder() + .setKey(BigInteger.valueOf(101L)).setValue(100).build())); } @Test @@ -178,12 +183,12 @@ public final class AggregatePayloadGeneratorTest { Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); sourceFilterMap.put("ctid", Collections.singletonList("id")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); // Apply this key_piece to "campaignCounts". @@ -196,9 +201,9 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(1024L)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()) - .setNotFilter(new AggregateFilterData.Builder() + .setNotFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataNotFilter1).build()) .build()); // Apply this key_piece to "geoValue". @@ -220,7 +225,7 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(200L)) .setSourceKeys(new HashSet<>(Arrays.asList("campaignCounts", "geoValue"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter2).build()) .build()); @@ -256,12 +261,12 @@ public final class AggregatePayloadGeneratorTest { sourceFilterMap.put("conversion_subdomain", Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); @@ -273,7 +278,7 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(2L).shiftLeft(63)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()).build()); Map<String, Integer> values = new HashMap<>(); @@ -305,12 +310,12 @@ public final class AggregatePayloadGeneratorTest { sourceFilterMap.put("conversion_subdomain", Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); @@ -322,7 +327,7 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(2L).shiftLeft(63).add(BigInteger.valueOf(4L))) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()).build()); Map<String, Integer> values = new HashMap<>(); |