commit 189a1fee5e827888d39c583e3449179d510b18aa
author Roshan Pius <rpius@google.com> Tue Nov 09 08:27:57 2021 -0800
committer Roshan Pius <rpius@google.com> Tue Nov 09 10:11:42 2021 -0800
tree 14bb9abd60219f8116e94050bd0387811b6e1e0b
parent 50ce1e1b78632234672c879b4d17de50ccd6a7ac

uwb(cts): New binder interface between UwbManager and UwbService

Bug: 200678461
Test: atest UwbManagerTest
Change-Id: Iaa85afab54b4cd523d8ef81840191a32fdbda22e

tests/uwb/src/android/uwb/cts/RangingSessionTest.java

diff --git a/tests/uwb/src/android/uwb/cts/RangingSessionTest.java b/tests/uwb/src/android/uwb/cts/RangingSessionTest.java
index b9725f1..48b61b5 100644
--- a/tests/uwb/src/android/uwb/cts/RangingSessionTest.java
+++ b/tests/uwb/src/android/uwb/cts/RangingSessionTest.java
@@ -30,7 +30,7 @@
 
 import android.os.PersistableBundle;
 import android.os.RemoteException;
-import android.uwb.IUwbAdapter;
+import android.uwb.IUwbAdapter2;
 import android.uwb.RangingReport;
 import android.uwb.RangingSession;
 import android.uwb.SessionHandle;
@@ -60,7 +60,7 @@
     public void testOnRangingOpened_OnOpenSuccessCalled() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         verifyOpenState(session, false);
 
@@ -76,7 +76,7 @@
     public void testOnRangingOpened_CannotOpenClosedSession() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
 
         session.onRangingOpened();
@@ -100,7 +100,7 @@
     public void testOnRangingClosed_OnClosedCalledWhenSessionNotOpen() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         verifyOpenState(session, false);
 
@@ -116,7 +116,7 @@
     public void testOnRangingClosed_OnClosedCalled() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         session.onRangingStarted(PARAMS);
         session.onRangingClosed(REASON, PARAMS);
@@ -131,7 +131,7 @@
     public void testOnRangingResult_OnReportReceivedCalled() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         verifyOpenState(session, false);
 
@@ -147,7 +147,7 @@
     public void testStart_CannotStartIfAlreadyStarted() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         doAnswer(new StartAnswer(session)).when(adapter).startRanging(any(), any());
         session.onRangingOpened();
@@ -164,7 +164,7 @@
     public void testStop_CannotStopIfAlreadyStopped() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         doAnswer(new StartAnswer(session)).when(adapter).startRanging(any(), any());
         doAnswer(new StopAnswer(session)).when(adapter).stopRanging(any());
@@ -183,7 +183,7 @@
     public void testReconfigure_OnlyWhenOpened() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         doAnswer(new StartAnswer(session)).when(adapter).startRanging(any(), any());
         doAnswer(new ReconfigureAnswer(session)).when(adapter).reconfigureRanging(any(), any());
@@ -218,7 +218,7 @@
     public void testClose_NoCallbackUntilInvoked() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         session.onRangingOpened();
 
@@ -247,7 +247,7 @@
     public void testClose_OnClosedCalled() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         doAnswer(new CloseAnswer(session)).when(adapter).closeRanging(any());
         session.onRangingOpened();
@@ -260,7 +260,7 @@
     public void testClose_CannotInteractFurther() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         doAnswer(new CloseAnswer(session)).when(adapter).closeRanging(any());
         session.close();
@@ -275,7 +275,7 @@
     public void testOnRangingResult_OnReportReceivedCalledWhenOpen() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
 
         assertFalse(session.isOpen());
@@ -292,7 +292,7 @@
     public void testOnRangingResult_OnReportReceivedNotCalledWhenNotOpen() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
-        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        IUwbAdapter2 adapter = mock(IUwbAdapter2.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
 
         assertFalse(session.isOpen());