diff options
Diffstat (limited to 'tests/tests/telecom/src/android/telecom/cts/TransactionalApisTest.java')
| -rw-r--r-- | tests/tests/telecom/src/android/telecom/cts/TransactionalApisTest.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/tests/telecom/src/android/telecom/cts/TransactionalApisTest.java b/tests/tests/telecom/src/android/telecom/cts/TransactionalApisTest.java index 356552230c8..1853f00cbe0 100644 --- a/tests/tests/telecom/src/android/telecom/cts/TransactionalApisTest.java +++ b/tests/tests/telecom/src/android/telecom/cts/TransactionalApisTest.java @@ -49,6 +49,7 @@ import android.util.Log; import android.util.Pair; import androidx.annotation.NonNull; +import androidx.test.filters.FlakyTest; import com.android.compatibility.common.util.ApiTest; import com.android.compatibility.common.util.CddTest; @@ -323,7 +324,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { startCallWithAttributesAndVerify(mOutgoingCallAttributes, mCall1); callControlAction(SET_ACTIVE, mCall1); assertNumCalls(getInCallService(), 1); - assertEquals(Call.STATE_ACTIVE, getLastAddedCall().getState()); + assertCallState(getLastAddedCall(), Call.STATE_ACTIVE); callControlAction(DISCONNECT, mCall1); assertNumCalls(getInCallService(), 0); } finally { @@ -347,7 +348,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { cleanup(); startCallWithAttributesAndVerify(mOutgoingCallAttributes, mCall1); callControlAction(SET_ACTIVE, mCall1); - assertEquals(Call.STATE_ACTIVE, getLastAddedCall().getState()); + assertCallState(getLastAddedCall(), Call.STATE_ACTIVE); // Ensure that the call has PROPERTY_IS_TRANSACTIONAL: Call call = getLastAddedCall(); assertTrue(call.getDetails().hasProperty(Call.Details.PROPERTY_IS_TRANSACTIONAL)); @@ -374,7 +375,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { startCallWithAttributesAndVerify(mIncomingCallAttributes, mCall1); callControlAction(SET_ACTIVE, mCall1); assertNumCalls(getInCallService(), 1); - assertEquals(Call.STATE_ACTIVE, getLastAddedCall().getState()); + assertCallState(getLastAddedCall(), Call.STATE_ACTIVE); callControlAction(DISCONNECT, mCall1); assertNumCalls(getInCallService(), 0); } finally { @@ -398,7 +399,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { cleanup(); startCallWithAttributesAndVerify(mIncomingCallAttributes, mCall1); callControlAction(SET_ACTIVE, mCall1); - assertEquals(Call.STATE_ACTIVE, getLastAddedCall().getState()); + assertCallState(getLastAddedCall(), Call.STATE_ACTIVE); // Ensure that the call has PROPERTY_IS_TRANSACTIONAL: Call call = getLastAddedCall(); assertTrue(call.getDetails().hasProperty(Call.Details.PROPERTY_IS_TRANSACTIONAL)); @@ -447,7 +448,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { cleanup(); startCallWithAttributesAndVerify(mIncomingCallAttributes, mCall1); assertNumCalls(getInCallService(), 1); - assertEquals(Call.STATE_RINGING, getLastAddedCall().getState()); + assertCallState(getLastAddedCall(), Call.STATE_RINGING); try { callControlAction(DISCONNECT, mCall1, DisconnectCause.ERROR); fail("testRejectIncomingCall: forced fail b/c IllegalArgumentException not thrown"); @@ -714,7 +715,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { callControlAction(SET_ACTIVE, mCall1); assertNumCalls(getInCallService(), 1); - assertEquals(Call.STATE_ACTIVE, getLastAddedCall().getState()); + assertCallState(getLastAddedCall(), Call.STATE_ACTIVE); startCallWithAttributesAndVerify(mIncomingCallAttributes, mCall2); callControlAction(SET_ACTIVE, mCall2); @@ -723,13 +724,13 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { Call call1 = getCallWithId(mCall1.getTelecomCallId()); Call call2 = getCallWithId(mCall2.getTelecomCallId()); - assertEquals(Call.STATE_HOLDING, call1.getState()); - assertEquals(Call.STATE_ACTIVE, call2.getState()); + assertCallState(call1, Call.STATE_HOLDING); + assertCallState(call2, Call.STATE_ACTIVE); callControlAction(DISCONNECT, mCall2); assertNumCalls(getInCallService(), 1); - assertEquals(Call.STATE_HOLDING, call1.getState()); + assertCallState(call1, Call.STATE_HOLDING); callControlAction(DISCONNECT, mCall1); assertNumCalls(getInCallService(), 0); @@ -796,6 +797,7 @@ public class TransactionalApisTest extends BaseTelecomTestWithMockServices { @ApiTest(apis = {"android.telecom.TelecomManager#addCall", "android.telecom.CallControl#disconnect", "android.telecom.CallEventCallback#onCallEndpointChanged"}) + @FlakyTest public void testOnChangedCallEndpoint() { if (!mShouldTestTelecom) { return; |