Snap for 9254005 from 7b99dc653ed133fef81d0423fee87d45299097e2 to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000android13-mainline-ipsec-release

Change-Id: Id77860bb313cd5104abdea4a778d197a1db28861

1 files changed, 20 insertions, 11 deletions

diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/E2EImpressionNoiseMockTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/E2EImpressionNoiseMockTest.java
index c01225741b..9970418349 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/E2EImpressionNoiseMockTest.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/E2EImpressionNoiseMockTest.java
@@ -51,23 +51,29 @@ public class E2EImpressionNoiseMockTest extends E2EMockTest {
         String TRIGGER_DATA = "trigger_data";
     }
 
-    @Parameterized.Parameters(name = "{2}")
+    @Parameterized.Parameters(name = "{3}")
     public static Collection<Object[]> getData() throws IOException, JSONException {
         return data(TEST_DIR_NAME);
     }
 
     public E2EImpressionNoiseMockTest(Collection<Action> actions, ReportObjects expectedOutput,
-            String name) throws DatastoreException {
-        super(actions, expectedOutput, name);
+            PrivacyParamsProvider privacyParamsProvider, String name) throws DatastoreException {
+        super(actions, expectedOutput, privacyParamsProvider, name);
         mAttributionHelper = TestObjectProvider.getAttributionJobHandler(sDatastoreManager);
         mMeasurementImpl =
                 TestObjectProvider.getMeasurementImpl(
-                        TestObjectProvider.Type.NOISY,
                         sDatastoreManager,
-                        mSourceFetcher,
-                        mTriggerFetcher,
                         mClickVerifier,
-                        mFlags);
+                        mFlags,
+                        mMeasurementDataDeleter,
+                        sEnrollmentDao);
+        mAsyncRegistrationQueueRunner =
+                TestObjectProvider.getAsyncRegistrationQueueRunner(
+                        TestObjectProvider.Type.NOISY,
+                        sDatastoreManager,
+                        mAsyncSourceFetcher,
+                        mAsyncTriggerFetcher,
+                        sEnrollmentDao);
         getExpectedTriggerDataDistributions();
     }
 
@@ -79,7 +85,7 @@ public class E2EImpressionNoiseMockTest extends E2EMockTest {
         // is currently supporting only one reporting job, which batches multiple reports at once,
         // although each is a separate network request.
         for (int i = 0; i < destinations.size(); i++) {
-            String uri = destinations.get(i).toString();
+            String uri = getReportUrl(ReportType.EVENT, destinations.get(i).toString());
             JSONObject payload = payloads.get(i);
             String eventId = payload.getString(PayloadKeys.EVENT_ID);
             String triggerData = payload.getString(PayloadKeys.TRIGGER_DATA);
@@ -94,7 +100,8 @@ public class E2EImpressionNoiseMockTest extends E2EMockTest {
         for (String key : mActualTriggerDataDistributions.keySet()) {
             if (!mExpectedTriggerDataDistributions.containsKey(key)) {
                 Assert.assertTrue(getTestFailureMessage(
-                        "Missing key in expected trigger data distributions"), false);
+                        "Missing key in expected trigger data distributions"
+                        + getDatastoreState()), false);
             }
         }
         boolean testPassed = false;
@@ -113,8 +120,10 @@ public class E2EImpressionNoiseMockTest extends E2EMockTest {
                 }
             }
         }
-        Assert.assertTrue(getTestFailureMessage(
-                "Trigger data distributions were the same"), testPassed);
+        Assert.assertTrue(
+                getTestFailureMessage(
+                        "Trigger data distributions were the same " + getDatastoreState()),
+                testPassed);
     }
 
     private void getExpectedTriggerDataDistributions() {