commit d3457baff92f6f41b2a133759933b2e44d400dc4
author Tyler Gunn <tgunn@google.com> Fri Oct 21 12:53:50 2016 -0700
committer Tyler Gunn <tgunn@google.com> Fri Oct 21 12:53:50 2016 -0700
tree f501cb4ce5e24356d53e998d3af032c154c7e7b0
parent 338b90f6b8e125131944bde5e5ca30d1c372a0d5

Fix Remote CTS Tests.

Recent changes mean that the extras will be modified by the framework.
Also, for completeness the test CS should also pass along the remote
conference extras.

Bug: 32312685
Change-Id: I926e6c75f0b39699f3bbd6fea9831e10cf2c13d5

tests/tests/telecom/src/android/telecom/cts/MockConference.java

diff --git a/tests/tests/telecom/src/android/telecom/cts/MockConference.java b/tests/tests/telecom/src/android/telecom/cts/MockConference.java
index d84610d..302f91f 100644
--- a/tests/tests/telecom/src/android/telecom/cts/MockConference.java
+++ b/tests/tests/telecom/src/android/telecom/cts/MockConference.java
@@ -143,6 +143,10 @@
 
     public void setRemoteConference(RemoteConference remoteConference) {
         mRemoteConference = remoteConference;
+        Bundle bundle = remoteConference.getExtras();
+        if (bundle != null) {
+            this.putExtras(bundle);
+        }
     }
 
     public RemoteConference getRemoteConference() {
@@ -155,6 +159,7 @@
 
     @Override
     public void onExtrasChanged(Bundle extras) {
+        setExtras(extras);
         mOnExtrasChanged.invoke(extras);
     }
 }

tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java

diff --git a/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java
index 3246b9c..57654f40 100644
--- a/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java
@@ -455,7 +455,8 @@
         mRemoteConference.setExtras(extras);
         callbackInvoker.waitForCount(1, WAIT_FOR_STATE_CHANGE_TIMEOUT_MS);
         assertEquals(mRemoteConferenceObject, callbackInvoker.getArgs(0)[0]);
-        assertTrue(areBundlesEqual(extras, (Bundle) callbackInvoker.getArgs(0)[1]));
+        assertTrue(((Bundle) callbackInvoker.getArgs(0)[1]).containsKey(
+                TelecomManager.EXTRA_CALL_DISCONNECT_MESSAGE));
         mRemoteConferenceObject.unregisterCallback(callback);
     }
 
@@ -469,8 +470,9 @@
             remoteConnections.add(((MockConnection)c).getRemoteConnection());
         }
         assertEquals(remoteConnections, remoteConferenceObject.getConnections());
-        assertEquals(remoteConference.getDisconnectCause(), remoteConferenceObject.getDisconnectCause());
-        assertEquals(remoteConference.getExtras(), remoteConferenceObject.getExtras());
+        assertEquals(remoteConference.getDisconnectCause(),
+                remoteConferenceObject.getDisconnectCause());
+        assertTrue(areBundlesEqual(remoteConferenceObject.getExtras(), conference.getExtras()));
     }
 
     private void addRemoteConnectionOutgoingCalls() {
@@ -572,7 +574,7 @@
             setupConnectionServices(managerConnectionService, remoteConnectionService,
                     FLAG_REGISTER | FLAG_ENABLE);
         } catch(Exception e) {
-            fail("Error in setting up the connection services");
+            fail("Error in setting up the connection services: " + e.toString());
         }
 
         placeAndVerifyCall();