Type destination and publisher in fields.

Type trigger destination and source publisher in an explicit field
rather than examining the URI prefix.

Also updated some publisher values to represent android apps in
attribution service test.

Test: atest com.android.adservices.data.DbHelperTest
Test: atest com.android.adservices.data.measurement
Test: atest com.android.adservices.service.measurement

Bug: 240441718
Bug: 238949786

Change-Id: I251594414f54915719f74f9fd8b5c9d6259fb897

1 files changed, 4 insertions, 0 deletions

diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/AbstractDbIntegrationTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/AbstractDbIntegrationTest.java
index e0d2d36a4b..4aa9eb44b8 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/AbstractDbIntegrationTest.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/AbstractDbIntegrationTest.java
@@ -235,6 +235,8 @@ public abstract class AbstractDbIntegrationTest {
         values.put(MeasurementTables.SourceContract.SOURCE_TYPE, source.getSourceType().toString());
         values.put(MeasurementTables.SourceContract.PUBLISHER,
                 source.getPublisher().toString());
+        values.put(MeasurementTables.SourceContract.PUBLISHER_TYPE,
+                source.getPublisherType());
         values.put(
                 MeasurementTables.SourceContract.APP_DESTINATION,
                 source.getAppDestination().toString());
@@ -268,6 +270,8 @@ public abstract class AbstractDbIntegrationTest {
         values.put(MeasurementTables.TriggerContract.ID, trigger.getId());
         values.put(MeasurementTables.TriggerContract.ATTRIBUTION_DESTINATION,
                 trigger.getAttributionDestination().toString());
+        values.put(MeasurementTables.TriggerContract.DESTINATION_TYPE,
+                trigger.getDestinationType());
         values.put(MeasurementTables.TriggerContract.AD_TECH_DOMAIN,
                 trigger.getAdTechDomain().toString());
         values.put(MeasurementTables.TriggerContract.STATUS, trigger.getStatus());