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

Change-Id: Id77860bb313cd5104abdea4a778d197a1db28861

4 files changed, 51 insertions, 13 deletions

diff --git a/adservices/tests/unittest/framework/Android.bp b/adservices/tests/unittest/framework/Android.bp
index 56cb70e1cd..93b60cdd13 100644
--- a/adservices/tests/unittest/framework/Android.bp
+++ b/adservices/tests/unittest/framework/Android.bp
@@ -38,7 +38,7 @@ android_test {
     ],
     sdk_version: "module_current",
     min_sdk_version: "Tiramisu",
-    target_sdk_version: "current",
+    target_sdk_version: "Tiramisu",
     test_suites: [
         "general-tests",
         "mts-adservices"
diff --git a/adservices/tests/unittest/framework/src/android/adservices/measurement/RegistrationRequestTest.java b/adservices/tests/unittest/framework/src/android/adservices/measurement/RegistrationRequestTest.java
index de26bdde91..59ffad8602 100644
--- a/adservices/tests/unittest/framework/src/android/adservices/measurement/RegistrationRequestTest.java
+++ b/adservices/tests/unittest/framework/src/android/adservices/measurement/RegistrationRequestTest.java
@@ -43,7 +43,6 @@ public final class RegistrationRequestTest {
     private RegistrationRequest createExampleAttribution() {
         return new RegistrationRequest.Builder()
                 .setRegistrationType(RegistrationRequest.REGISTER_SOURCE)
-                .setTopOriginUri(Uri.parse("http://foo.com"))
                 .setRegistrationUri(Uri.parse("http://baz.com"))
                 .setPackageName(sContext.getAttributionSource().getPackageName())
                 .setRequestTime(1000L)
@@ -52,7 +51,6 @@ public final class RegistrationRequestTest {
     }
 
     void verifyExampleAttribution(RegistrationRequest request) {
-        assertEquals("http://foo.com", request.getTopOriginUri().toString());
         assertEquals("http://baz.com", request.getRegistrationUri().toString());
         assertEquals(RegistrationRequest.REGISTER_SOURCE,
                 request.getRegistrationType());
@@ -92,8 +90,6 @@ public final class RegistrationRequestTest {
                         .setPackageName(sContext.getAttributionSource().getPackageName())
                         .setRegistrationType(RegistrationRequest.REGISTER_TRIGGER)
                         .build();
-        assertEquals("android-app://" + sContext.getAttributionSource().getPackageName(),
-                request.getTopOriginUri().toString());
         assertEquals("", request.getRegistrationUri().toString());
         assertEquals(RegistrationRequest.REGISTER_TRIGGER,
                 request.getRegistrationType());
diff --git a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsParamTest.java b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsParamTest.java
index e9372ace14..cb42165541 100644
--- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsParamTest.java
+++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsParamTest.java
@@ -38,11 +38,13 @@ public final class GetTopicsParamTest {
                         .setAppPackageName(SOME_PACKAGE_NAME)
                         .setSdkName(SOME_SDK_NAME)
                         .setSdkPackageName(SOME_SDK_PACKAGE_NAME)
+                        .setShouldRecordObservation(false)
                         .build();
 
         assertThat(request.getSdkName()).isEqualTo(SOME_SDK_NAME);
         assertThat(request.getSdkPackageName()).isEqualTo(SOME_SDK_PACKAGE_NAME);
         assertThat(request.getAppPackageName()).isEqualTo(SOME_PACKAGE_NAME);
+        assertThat(request.shouldRecordObservation()).isEqualTo(false);
     }
 
     @Test
@@ -82,4 +84,20 @@ public final class GetTopicsParamTest {
                                     .build();
                 });
     }
+
+    @Test
+    public void test_notSettingRecordObservation_returnDefault() {
+        GetTopicsParam request =
+                new GetTopicsParam.Builder()
+                        .setAppPackageName(SOME_PACKAGE_NAME)
+                        .setSdkName(SOME_SDK_NAME)
+                        .setSdkPackageName(SOME_SDK_PACKAGE_NAME)
+                        .build();
+
+        assertThat(request.getSdkName()).isEqualTo(SOME_SDK_NAME);
+        assertThat(request.getSdkPackageName()).isEqualTo(SOME_SDK_PACKAGE_NAME);
+        assertThat(request.getAppPackageName()).isEqualTo(SOME_PACKAGE_NAME);
+        // Not setting RecordObservation will get default value.
+        assertThat(request.shouldRecordObservation()).isTrue();
+    }
 }
diff --git a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java
index 125002601a..d2d7886621 100644
--- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java
+++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java
@@ -18,7 +18,6 @@ package android.adservices.topics;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 
 import androidx.test.filters.SmallTest;
@@ -33,24 +32,49 @@ public final class GetTopicsRequestTest {
     private static final String SOME_SDK_NAME = "SomeSDKName";
 
     @Test
-    public void testCreate() {
-        GetTopicsRequest request = GetTopicsRequest.create();
-        assertNull(request.getAdsSdkName());
+    public void testBuilder_notSettingSdkName() {
+        GetTopicsRequest request = new GetTopicsRequest.Builder().build();
+        assertThat(request.getAdsSdkName()).isEmpty();
+        // RecordObservation default value is true
+        assertThat(request.shouldRecordObservation()).isTrue();
     }
 
     @Test
-    public void testCreateWithAdsSdkName_nullSdkName() {
+    public void testBuilderSetAdsSdkName_nullSdkName() {
         assertThrows(
                 IllegalArgumentException.class,
                 () -> {
-                    GetTopicsRequest.createWithAdsSdkName(/* adsSdkName */ null);
+                    new GetTopicsRequest.Builder().setAdsSdkName(/* adsSdkName */ null).build();
                 });
     }
 
     @Test
-    public void testCreateWithAdsSdkName_nonNullSdkName() {
+    public void testBuilderSetAdsSdkName_nonNullSdkName() {
         GetTopicsRequest request =
-                GetTopicsRequest.createWithAdsSdkName(/* adsSdkName */ SOME_SDK_NAME);
+                new GetTopicsRequest.Builder()
+                        .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME)
+                        .build();
         assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME);
+        // RecordObservation default value is true
+        assertThat(request.shouldRecordObservation()).isTrue();
+    }
+
+    @Test
+    public void testBuilderSetAdsSdkName_recordObservationFalse() {
+        GetTopicsRequest request =
+                new GetTopicsRequest.Builder()
+                        .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME)
+                        .setShouldRecordObservation(false)
+                        .build();
+        assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME);
+        assertThat(request.shouldRecordObservation()).isFalse();
+    }
+
+    @Test
+    public void testBuilder_recordObservationFalse() {
+        GetTopicsRequest request =
+                new GetTopicsRequest.Builder().setShouldRecordObservation(false).build();
+        assertThat(request.getAdsSdkName()).isEmpty();
+        assertThat(request.shouldRecordObservation()).isFalse();
     }
 }