Update CTS for formalizing ConnectionService APIs
ConferenceTest#testConferenceCreate was failing because
ConnectionService#onCreateConferenceComplete was never being called
during the test. This seems to be the case when one call is being merged
with another (verified manually). Instead, offloading this check into
AdhocConferenceTest should test this behavior now as a conference call
is explicitly being created via TelecomManager.
Bug: 326267225
Test: atest AdhocConferenceTest#testStartConference
Change-Id: I0e84894d8fef5410f7de9faf00a2f13055597093
diff --git a/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java
index e3e6ff2..b59c927 100644
--- a/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java
@@ -31,6 +31,8 @@
import android.util.Log;
import android.util.Pair;
+import com.android.server.telecom.flags.Flags;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -69,6 +71,11 @@
TestUtils.TEST_PHONE_ACCOUNT_HANDLE);
mTelecomManager.startConference(PARTICIPANTS, extra);
ConnectionRequest request = verifyAdhocConferenceCall().second;
+ // Verify that the conference is successfully created when a conference call is created.
+ if (Flags.telecomResolveHiddenDependencies()) {
+ assertTrue(connectionService.waitForEvent(
+ MockConnectionService.EVENT_CONNECTION_SERVICE_CREATE_CONFERENCE_COMPLETE));
+ }
assertTrue(request.isAdhocConferenceCall());
assertEquals(2, request.getParticipants().size());
assertTrue(request.getParticipants().containsAll(PARTICIPANTS));
diff --git a/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
index 1f7a309..846d660 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
@@ -36,8 +36,6 @@
import androidx.test.InstrumentationRegistry;
-import com.android.server.telecom.flags.Flags;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -98,12 +96,6 @@
if (!mShouldTestTelecom) {
return;
}
- // Part of adding the conference is calling TelecomManager#addConference, so we should have
- // gotten confirmation of that.
- if (Flags.telecomResolveHiddenDependencies()) {
- assertTrue(connectionService.waitForEvent(
- MockConnectionService.EVENT_CONNECTION_SERVICE_CREATE_CONFERENCE_COMPLETE));
- }
final Call conf = mInCallService.getLastConferenceCall();
assertCallState(conf, Call.STATE_ACTIVE);
