commit 018f01a24ee66120a950f0d72142490110dfc087
author Nicholas Sauer <nicksauer@google.com> Tue Aug 16 08:14:33 2016 -0700
committer Nicholas Sauer <nicksauer@google.com> Tue Aug 16 08:15:02 2016 -0700
tree 50d89c90da485db314e80a317c98c2183c253821
parent 5119c548fc28e70ea216393ba882d06af7f5d648

Fix coverage issue with conference test.

Change-Id: I891d24a92524c7382dc0f9a3d47aaf2b5404c7e9

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

diff --git a/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
index 6a33860..94a854f 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
@@ -53,7 +53,8 @@
     private Call mCall1, mCall2;
     private MockConnection mConnection1, mConnection2;
     MockInCallService mInCallService;
-    MockConference mConferenceObject;
+    Conference mConferenceObject;
+    MockConference mConferenceVerficationObject;
 
     @Override
     protected void setUp() throws Exception {
@@ -61,8 +62,9 @@
         if (mShouldTestTelecom) {
             addOutgoingCalls();
             addConferenceCall(mCall1, mCall2);
-            // Use vanilla conference object so that the CTS coverage tool detects the useage.
-            mConferenceObject = verifyConferenceForOutgoingCall();
+            mConferenceVerficationObject = verifyConferenceForOutgoingCall();
+            // Use vanilla conference object so that the CTS coverage tool detects the usage.
+            mConferenceObject = mConferenceVerficationObject;
             verifyConferenceObject(mConferenceObject, mConnection1, mConnection2);
         }
     }
@@ -329,7 +331,7 @@
         extras.putString(TEST_EXTRA_KEY_1, TEST_EXTRA_VALUE_1);
         extras.putInt(TEST_EXTRA_KEY_2, TEST_EXTRA_VALUE_2);
         conf.putExtras(extras);
-        mConferenceObject.mOnExtrasChanged.waitForCount(1);
+        mConferenceVerficationObject.mOnExtrasChanged.waitForCount(1);
 
         assertTrue(areBundlesEqual(extras, mConferenceObject.getExtras()));
     }