commit eb2fe47a8beaa7dde78ffd1497907bb66b5e13c5
author Yixiao Luo <yixiaoluo@google.com> Mon Mar 07 15:51:46 2022 -0800
committer Yixiao Luo <yixiaoluo@google.com> Tue Mar 15 16:19:45 2022 -0700
tree 579cd677fd30956c0236e27a25aacafb13509a7c
parent f09fc7ab8d5fb2b4cd8a0f966f5168f6e947e8a0

TIAF CTS: Change on API Review: First round API council questions

Bug: 217555265
Change-Id: Id3112604df31a81f48fd2df45bed91cc87374938

tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java

diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java
index 32fa90b..6d9b506 100644
--- a/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java
@@ -722,7 +722,7 @@
         linkTvView();
 
         CommandRequest request = new CommandRequest(2, BroadcastInfoRequest.REQUEST_OPTION_REPEAT,
-                "nameSpace1", "name2", "requestArgs");
+                "nameSpace1", "name2", "requestArgs", CommandRequest.ARGUMENT_TYPE_XML);
         mSession.requestBroadcastInfo(request);
         mInstrumentation.waitForIdleSync();
         PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
@@ -732,9 +732,10 @@
         assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_COMMAND);
         assertThat(request.getRequestId()).isEqualTo(2);
         assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
-        assertThat(request.getNameSpace()).isEqualTo("nameSpace1");
+        assertThat(request.getNamespace()).isEqualTo("nameSpace1");
         assertThat(request.getName()).isEqualTo("name2");
         assertThat(request.getArguments()).isEqualTo("requestArgs");
+        assertThat(request.getArgumentType()).isEqualTo(CommandRequest.ARGUMENT_TYPE_XML);
     }
 
     @Test
@@ -877,7 +878,8 @@
         linkTvView();
 
         CommandResponse response = new CommandResponse(2, 22,
-                BroadcastInfoResponse.RESPONSE_RESULT_OK, "commandResponse");
+                BroadcastInfoResponse.RESPONSE_RESULT_OK, "commandResponse",
+                CommandResponse.RESPONSE_TYPE_JSON);
         mInputSession.notifyBroadcastInfoResponse(response);
         mInstrumentation.waitForIdleSync();
         PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
@@ -890,6 +892,7 @@
         assertThat(response.getResponseResult()).isEqualTo(
                 BroadcastInfoResponse.RESPONSE_RESULT_OK);
         assertThat(response.getResponse()).isEqualTo("commandResponse");
+        assertThat(response.getResponseType()).isEqualTo(CommandResponse.RESPONSE_TYPE_JSON);
     }
 
     @Test
@@ -1008,7 +1011,7 @@
         assertThat(response.getResponseResult()).isEqualTo(
                 BroadcastInfoResponse.RESPONSE_RESULT_OK);
         assertThat(response.getEventId()).isEqualTo(666);
-        assertThat(response.getNpt()).isEqualTo(6666);
+        assertThat(response.getNptMillis()).isEqualTo(6666);
         assertNotNull(response.getData());
     }
 
@@ -1052,7 +1055,7 @@
         assertThat(response.getSequence()).isEqualTo(88);
         assertThat(response.getResponseResult()).isEqualTo(
                 BroadcastInfoResponse.RESPONSE_RESULT_OK);
-        assertThat(response.getSelector()).isEqualTo("test_selector");
+        assertThat(response.getSelector().toString()).isEqualTo("test_selector");
         assertThat(response.getUnitsPerTick()).isEqualTo(1);
         assertThat(response.getUnitsPerSecond()).isEqualTo(10);
         assertThat(response.getWallClock()).isEqualTo(100);