From 9b4c43ab063415cbbbf508abbf0d577f62f2cfb6 Mon Sep 17 00:00:00 2001 From: Hao Date: Thu, 15 Sep 2022 15:53:32 -0400 Subject: Introduce a new optional parameter mRecordObservation We add a new parameter mRecordObservation in GetTopicsRequest and getTopicsParam to track if caller want to record that caller has observed the Topics of the host app or not. This will be used to determine if the caller can receive the topic in next epoch. The default value is "true", if caller doesn't set mRecordObservation parameter. Beta 1 clients using the AdvertisingTopicsClient will not need to make any code change. Chrome's equivalence API: https://screenshot.googleplex.com/4dkKwvwvEyapM3A Test: atest AdServicesFrameworkUnitTests Bug: 246979195 Change-Id: Ib96823e3ebc658e147bd937c4b602ec0ecf873fe --- .../adservices/topics/GetTopicsParamTest.java | 18 ++++++++ .../adservices/topics/GetTopicsRequestTest.java | 52 ++++++++++++++++++++-- 2 files changed, 66 insertions(+), 4 deletions(-) (limited to 'adservices/tests/unittest/framework') 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..cd1eeb9f40 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) + .setRecordObservation(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.isRecordObservation()).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.isRecordObservation()).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..023554ac35 100644 --- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java +++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java @@ -15,7 +15,6 @@ */ package android.adservices.topics; - import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertNull; @@ -25,9 +24,7 @@ import androidx.test.filters.SmallTest; import org.junit.Test; -/** - * Unit tests for {@link android.adservices.topics.GetTopicsRequest} - */ +/** Unit tests for {@link android.adservices.topics.GetTopicsRequest} */ @SmallTest public final class GetTopicsRequestTest { private static final String SOME_SDK_NAME = "SomeSDKName"; @@ -53,4 +50,51 @@ public final class GetTopicsRequestTest { GetTopicsRequest.createWithAdsSdkName(/* adsSdkName */ SOME_SDK_NAME); assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); } + + @Test + public void testBuilder() { + GetTopicsRequest request = new GetTopicsRequest.Builder().build(); + assertNull(request.getAdsSdkName()); + // RecordObservation default value is true + assertThat(request.isRecordObservation()).isTrue(); + } + + @Test + public void testBuilderSetAdsSdkName_nullSdkName() { + assertThrows( + IllegalArgumentException.class, + () -> { + new GetTopicsRequest.Builder().setAdsSdkName(/* adsSdkName */ null).build(); + }); + } + + @Test + public void testBuilderSetAdsSdkName_nonNullSdkName() { + GetTopicsRequest request = + new GetTopicsRequest.Builder() + .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) + .build(); + assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); + // RecordObservation default value is true + assertThat(request.isRecordObservation()).isTrue(); + } + + @Test + public void testBuilderSetAdsSdkName_recordObservationFalse() { + GetTopicsRequest request = + new GetTopicsRequest.Builder() + .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) + .setRecordObservation(false) + .build(); + assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); + assertThat(request.isRecordObservation()).isFalse(); + } + + @Test + public void testBuilder_recordObservationFalse() { + GetTopicsRequest request = + new GetTopicsRequest.Builder().setRecordObservation(false).build(); + assertNull(request.getAdsSdkName()); + assertThat(request.isRecordObservation()).isFalse(); + } } -- cgit v1.2.3 From f61d58a72c0dea61ddc9954c659b21f8b900a6aa Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 23 Sep 2022 08:02:01 +0000 Subject: Revert "Introduce a new optional parameter mRecordObservation" This reverts commit 9b4c43ab063415cbbbf508abbf0d577f62f2cfb6. Reason for revert: API break which blocks ext4 API finalization Bug: 246979195 Change-Id: Iae47ea42579788b5407b5ccbc272115ee69caddc --- .../adservices/topics/GetTopicsParamTest.java | 18 -------- .../adservices/topics/GetTopicsRequestTest.java | 52 ++-------------------- 2 files changed, 4 insertions(+), 66 deletions(-) (limited to 'adservices/tests/unittest/framework') 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 cd1eeb9f40..e9372ace14 100644 --- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsParamTest.java +++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsParamTest.java @@ -38,13 +38,11 @@ public final class GetTopicsParamTest { .setAppPackageName(SOME_PACKAGE_NAME) .setSdkName(SOME_SDK_NAME) .setSdkPackageName(SOME_SDK_PACKAGE_NAME) - .setRecordObservation(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.isRecordObservation()).isEqualTo(false); } @Test @@ -84,20 +82,4 @@ 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.isRecordObservation()).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 023554ac35..125002601a 100644 --- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java +++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java @@ -15,6 +15,7 @@ */ package android.adservices.topics; + import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertNull; @@ -24,7 +25,9 @@ import androidx.test.filters.SmallTest; import org.junit.Test; -/** Unit tests for {@link android.adservices.topics.GetTopicsRequest} */ +/** + * Unit tests for {@link android.adservices.topics.GetTopicsRequest} + */ @SmallTest public final class GetTopicsRequestTest { private static final String SOME_SDK_NAME = "SomeSDKName"; @@ -50,51 +53,4 @@ public final class GetTopicsRequestTest { GetTopicsRequest.createWithAdsSdkName(/* adsSdkName */ SOME_SDK_NAME); assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); } - - @Test - public void testBuilder() { - GetTopicsRequest request = new GetTopicsRequest.Builder().build(); - assertNull(request.getAdsSdkName()); - // RecordObservation default value is true - assertThat(request.isRecordObservation()).isTrue(); - } - - @Test - public void testBuilderSetAdsSdkName_nullSdkName() { - assertThrows( - IllegalArgumentException.class, - () -> { - new GetTopicsRequest.Builder().setAdsSdkName(/* adsSdkName */ null).build(); - }); - } - - @Test - public void testBuilderSetAdsSdkName_nonNullSdkName() { - GetTopicsRequest request = - new GetTopicsRequest.Builder() - .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) - .build(); - assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); - // RecordObservation default value is true - assertThat(request.isRecordObservation()).isTrue(); - } - - @Test - public void testBuilderSetAdsSdkName_recordObservationFalse() { - GetTopicsRequest request = - new GetTopicsRequest.Builder() - .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) - .setRecordObservation(false) - .build(); - assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); - assertThat(request.isRecordObservation()).isFalse(); - } - - @Test - public void testBuilder_recordObservationFalse() { - GetTopicsRequest request = - new GetTopicsRequest.Builder().setRecordObservation(false).build(); - assertNull(request.getAdsSdkName()); - assertThat(request.isRecordObservation()).isFalse(); - } } -- cgit v1.2.3 From 8af12d53cd2c4e746956fde3e145fe01255ce249 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Thu, 22 Sep 2022 21:34:49 +0000 Subject: Refactor topOrigin remove in internal registration Bug: 237315239 Test: atest com.android.adservices.service.measurement Test: atest RegistrationRequestTest Change-Id: I678f777ad02bdcf0ff42b1252adf93dceb4780e9 --- .../src/android/adservices/measurement/RegistrationRequestTest.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'adservices/tests/unittest/framework') 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()); -- cgit v1.2.3 From 219524b249ffe6c845c8bdeb2fe6ff45f518e484 Mon Sep 17 00:00:00 2001 From: Binh Nguyen Date: Wed, 28 Sep 2022 07:23:07 -0700 Subject: Update Topics API to add Builder - This will allow flexibility to add more params in the future. Bug: 249497528 Test: Presubmit Change-Id: I4fbc2747b73a0549fcaba2d26f43dbd9d014d184 --- .../android/adservices/topics/GetTopicsRequestTest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'adservices/tests/unittest/framework') 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..a81656b5d9 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,26 @@ 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(); } @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); } } -- cgit v1.2.3 From 1a4d5e950d6ad58f8b25217c79fb9906facaf806 Mon Sep 17 00:00:00 2001 From: Neha Pattan Date: Fri, 30 Sep 2022 21:05:26 +0000 Subject: Fix sdk mismatch for tests. In git_master, current sdk is UDC, so it needs to be set explicitly to T. Test: atest Bug: 249216661 Change-Id: Ia625fed00818f2545c15cf170c035ef920f111d0 --- adservices/tests/unittest/framework/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'adservices/tests/unittest/framework') 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" -- cgit v1.2.3 From ff764d980e82d312ce39788b7305ae255d46e4e0 Mon Sep 17 00:00:00 2001 From: Hao Date: Fri, 30 Sep 2022 14:52:13 -0400 Subject: Introduce a new optional parameter mRecordObservation. We add a new parameter mRecordObservation in GetTopicsRequest and getTopicsParam to track if caller want to record that caller has observed the Topics of the host app or not. This will be used to determine if the caller can receive the topic in next epoch. The default value is "true", if caller doesn't set mRecordObservation parameter. Beta 1 clients using the AdvertisingTopicsClient will not need to make any code change. Chrome's equivalence API: https://screenshot.googleplex.com/4dkKwvwvEyapM3A Bug: 246979195 Test: atest AdServicesServiceCoreUnitTests AdServicesFrameworkUnitTests AdServicesEndToEndTests CtsAdServicesEndToEndTests CtsAdServicesDeviceTestCases AdServicesApkUnitTests CtsSandboxedTopicsManagerTests --no-bazel-mode Change-Id: I8415c55b4ea57710cebb3ff96786ba8c449b9ade --- .../adservices/topics/GetTopicsParamTest.java | 18 +++++++++++++++++ .../adservices/topics/GetTopicsRequestTest.java | 23 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) (limited to 'adservices/tests/unittest/framework') 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..cd1eeb9f40 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) + .setRecordObservation(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.isRecordObservation()).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.isRecordObservation()).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 a81656b5d9..d034da88ee 100644 --- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java +++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java @@ -35,6 +35,8 @@ public final class GetTopicsRequestTest { public void testBuilder_notSettingSdkName() { GetTopicsRequest request = new GetTopicsRequest.Builder().build(); assertThat(request.getAdsSdkName()).isEmpty(); + // RecordObservation default value is true + assertThat(request.isRecordObservation()).isTrue(); } @Test @@ -53,5 +55,26 @@ public final class GetTopicsRequestTest { .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) .build(); assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); + // RecordObservation default value is true + assertThat(request.isRecordObservation()).isTrue(); + } + + @Test + public void testBuilderSetAdsSdkName_recordObservationFalse() { + GetTopicsRequest request = + new GetTopicsRequest.Builder() + .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) + .setRecordObservation(false) + .build(); + assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); + assertThat(request.isRecordObservation()).isFalse(); + } + + @Test + public void testBuilder_recordObservationFalse() { + GetTopicsRequest request = + new GetTopicsRequest.Builder().setRecordObservation(false).build(); + assertThat(request.getAdsSdkName()).isEmpty(); + assertThat(request.isRecordObservation()).isFalse(); } } -- cgit v1.2.3 From 37b177a6be206474a1f50acee779fa4389dc6484 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Wed, 5 Oct 2022 13:58:09 +0000 Subject: Rename recordObservation getter/setter Rename setRecordObservation and its getter to setShouldRecordObservation and shouldRecordObservation. Test: atest AdServicesServiceCoreUnitTests AdServicesFrameworkUnitTests AdServicesEndToEndTests CtsAdServicesEndToEndTests CtsAdServicesDeviceTestCases AdServicesApkUnitTests CtsSandboxedTopicsManagerTests --no-bazel-mode Bug: 251106301 Change-Id: Ic0b16c6ca9172ae09374fe781e74fbf75c37c8f6 --- .../src/android/adservices/topics/GetTopicsParamTest.java | 6 +++--- .../src/android/adservices/topics/GetTopicsRequestTest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'adservices/tests/unittest/framework') 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 cd1eeb9f40..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,13 +38,13 @@ public final class GetTopicsParamTest { .setAppPackageName(SOME_PACKAGE_NAME) .setSdkName(SOME_SDK_NAME) .setSdkPackageName(SOME_SDK_PACKAGE_NAME) - .setRecordObservation(false) + .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.isRecordObservation()).isEqualTo(false); + assertThat(request.shouldRecordObservation()).isEqualTo(false); } @Test @@ -98,6 +98,6 @@ public final class GetTopicsParamTest { assertThat(request.getSdkPackageName()).isEqualTo(SOME_SDK_PACKAGE_NAME); assertThat(request.getAppPackageName()).isEqualTo(SOME_PACKAGE_NAME); // Not setting RecordObservation will get default value. - assertThat(request.isRecordObservation()).isTrue(); + 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 d034da88ee..d2d7886621 100644 --- a/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java +++ b/adservices/tests/unittest/framework/src/android/adservices/topics/GetTopicsRequestTest.java @@ -36,7 +36,7 @@ public final class GetTopicsRequestTest { GetTopicsRequest request = new GetTopicsRequest.Builder().build(); assertThat(request.getAdsSdkName()).isEmpty(); // RecordObservation default value is true - assertThat(request.isRecordObservation()).isTrue(); + assertThat(request.shouldRecordObservation()).isTrue(); } @Test @@ -56,7 +56,7 @@ public final class GetTopicsRequestTest { .build(); assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); // RecordObservation default value is true - assertThat(request.isRecordObservation()).isTrue(); + assertThat(request.shouldRecordObservation()).isTrue(); } @Test @@ -64,17 +64,17 @@ public final class GetTopicsRequestTest { GetTopicsRequest request = new GetTopicsRequest.Builder() .setAdsSdkName(/* adsSdkName */ SOME_SDK_NAME) - .setRecordObservation(false) + .setShouldRecordObservation(false) .build(); assertThat(request.getAdsSdkName()).isEqualTo(SOME_SDK_NAME); - assertThat(request.isRecordObservation()).isFalse(); + assertThat(request.shouldRecordObservation()).isFalse(); } @Test public void testBuilder_recordObservationFalse() { GetTopicsRequest request = - new GetTopicsRequest.Builder().setRecordObservation(false).build(); + new GetTopicsRequest.Builder().setShouldRecordObservation(false).build(); assertThat(request.getAdsSdkName()).isEmpty(); - assertThat(request.isRecordObservation()).isFalse(); + assertThat(request.shouldRecordObservation()).isFalse(); } } -- cgit v1.2.3