diff options
Diffstat (limited to 'tests/src/com')
5 files changed, 324 insertions, 11 deletions
diff --git a/tests/src/com/android/dialer/onboard/DefaultDialerOnboardScreenTest.java b/tests/src/com/android/dialer/onboard/DefaultDialerOnboardScreenTest.java new file mode 100644 index 000000000..f9724c14b --- /dev/null +++ b/tests/src/com/android/dialer/onboard/DefaultDialerOnboardScreenTest.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.dialer.onboard; + +import static org.mockito.Mockito.when; + +import android.test.AndroidTestCase; + +import com.android.dialer.onboard.OnboardingActivity.DefaultDialerOnboardingScreen; + +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class DefaultDialerOnboardScreenTest extends AndroidTestCase { + private DefaultDialerOnboardingScreen mScreen; + @Mock private PermissionsChecker mPermissionsChecker; + + @Override + protected void setUp() throws Exception { + super.setUp(); + MockitoAnnotations.initMocks(this); + mScreen = new DefaultDialerOnboardingScreen(mPermissionsChecker); + } + + public void testNeverRequestedForDefaultDialer_shouldShowScreen() { + when(mPermissionsChecker.previouslyRequestedDefaultDialer()).thenReturn(false); + assertTrue(mScreen.shouldShowScreen()); + } + + public void testAlreadyAskedForDefaultDialer_shouldNotShowScreen() { + when(mPermissionsChecker.previouslyRequestedDefaultDialer()).thenReturn(true); + assertFalse(mScreen.shouldShowScreen()); + } + + public void testAlreadySetAsDefaultDialer_shouldNotShowScreen() { + when(mPermissionsChecker.previouslyRequestedDefaultDialer()).thenReturn(false); + when(mPermissionsChecker.isDefaultOrSystemDialer()).thenReturn(true); + assertFalse(mScreen.shouldShowScreen()); + } + + public void testCanSkipScreen() { + assertTrue(mScreen.canSkipScreen()); + } +} diff --git a/tests/src/com/android/dialer/onboard/OnboardingControllerTest.java b/tests/src/com/android/dialer/onboard/OnboardingControllerTest.java new file mode 100644 index 000000000..3ca39a72f --- /dev/null +++ b/tests/src/com/android/dialer/onboard/OnboardingControllerTest.java @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.dialer.onboard; + +import android.app.Activity; +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.Suppress; + +public class OnboardingControllerTest extends AndroidTestCase { + private MockOnboardUi mOnboardUi; + private OnboardingController mController; + + public class MockOnboardUi implements OnboardingController.OnboardingUi { + public int currentScreen = -1; + public boolean completedOnboardingFlow = false; + + @Override + public void showScreen(int screenId) { + currentScreen = screenId; + } + + @Override + public void completeOnboardingFlow() { + completedOnboardingFlow = true; + } + } + + public class MockScreen extends OnboardingController.OnboardingScreen { + boolean shouldShowScreen; + boolean canSkipScreen; + + public MockScreen(boolean shouldShowScreen, boolean canSkipScreen) { + this.shouldShowScreen = shouldShowScreen; + this.canSkipScreen = canSkipScreen; + } + + @Override + public boolean shouldShowScreen() { + return shouldShowScreen; + } + + @Override + public boolean canSkipScreen() { + return canSkipScreen; + } + + @Override + public void onNextClicked(Activity activity) { + } + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + mOnboardUi = new MockOnboardUi(); + mController = new OnboardingController(mOnboardUi); + } + + @Suppress + public void testNoScreensToDisplay_OnboardingFlowImmediatelyCompleted() { + mController.showNextScreen(); + assertEquals(-1, mOnboardUi.currentScreen); + assertTrue(mOnboardUi.completedOnboardingFlow); + } + + @Suppress + public void testSkipAllScreens_OnboardingFlowImmediatelyCompleted() { + mController.addScreen(new MockScreen(false /* shouldShowScreen */, + true /* canSkipScreen */)); + mController.addScreen(new MockScreen(false /* shouldShowScreen */, + true /* canSkipScreen */)); + mController.addScreen(new MockScreen(false /* shouldShowScreen */, + true /* canSkipScreen */)); + mController.showNextScreen(); + assertEquals(-1, mOnboardUi.currentScreen); + assertTrue(mOnboardUi.completedOnboardingFlow); + } + + @Suppress + public void testFirstScreenNotNeeded_ShowsSecondScreen() { + mController.addScreen(new MockScreen(false /* shouldShowScreen */, + false /* canSkipScreen */)); + mController.addScreen(new MockScreen(true /* shouldShowScreen */, + false /* canSkipScreen */)); + mController.showNextScreen(); + assertEquals(1, mOnboardUi.currentScreen); + } + + @Suppress + public void testScreenRequired() { + final MockScreen mockScreen = + new MockScreen(true /* shouldShowScreen */, false /* canSkipScreen */); + mController.addScreen(mockScreen); + + mController.showNextScreen(); + assertEquals(0, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + + // User tried to skip an unskippable screen + mController.onScreenResult(0, false); + assertEquals(0, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + + // User said yes, but the underlying requirements have not been fulfilled yet, so don't + // show the next screen. Should be very rare in practice. + mController.onScreenResult(0, true); + assertEquals(0, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + + // Requirement has been fulfiled. + mockScreen.shouldShowScreen = false; + mController.onScreenResult(0, true); + assertTrue(mOnboardUi.completedOnboardingFlow); + } + + /** + * Verifies the use case where completing the first screen will provide the necessary conditions + * to skip the second screen as well. + * + * For example, setting the default dialer in the first screen will automatically grant + * permissions such that the second permissions screen is no longer needed. + */ + @Suppress + public void testFirstScreenCompleted_SkipsSecondScreen() { + final MockScreen mockScreen1 = + new MockScreen(true /* shouldShowScreen */, true /* canSkipScreen */); + final MockScreen mockScreen2 = + new MockScreen(true /* shouldShowScreen */, false /* canSkipScreen */); + mController.addScreen(mockScreen1); + mController.addScreen(mockScreen2); + + mController.showNextScreen(); + assertEquals(0, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + + // Screen 1 succeeded, screen 2 is no longer necessary + mockScreen2.shouldShowScreen = false; + mController.onScreenResult(0, true); + assertEquals(0, mOnboardUi.currentScreen); + assertTrue(mOnboardUi.completedOnboardingFlow); + } + + /** + * Verifies the use case where skipping the first screen will proceed to show the second screen + * since the necessary conditions to skip the second screen have not been met. + */ + @Suppress + public void testFirstScreenSkipped_ShowsSecondScreen() { + final MockScreen mockScreen1 = + new MockScreen(true /* shouldShowScreen */, true /* canSkipScreen */); + final MockScreen mockScreen2 = + new MockScreen(true /* shouldShowScreen */, false /* canSkipScreen */); + mController.addScreen(mockScreen1); + mController.addScreen(mockScreen2); + + mController.showNextScreen(); + assertEquals(0, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + + // Screen 1 skipped + mController.onScreenResult(0, false); + assertEquals(1, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + + // Repeatedly trying to skip screen 2 will not work since it is marked as unskippable. + mController.onScreenResult(1, false); + assertEquals(1, mOnboardUi.currentScreen); + assertFalse(mOnboardUi.completedOnboardingFlow); + } +} diff --git a/tests/src/com/android/dialer/onboard/PermissionsOnboardScreenTest.java b/tests/src/com/android/dialer/onboard/PermissionsOnboardScreenTest.java new file mode 100644 index 000000000..ff5e3d5ae --- /dev/null +++ b/tests/src/com/android/dialer/onboard/PermissionsOnboardScreenTest.java @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.dialer.onboard; + +import static org.mockito.Mockito.when; + +import android.test.AndroidTestCase; + +import com.android.dialer.onboard.OnboardingActivity.PermissionsOnboardingScreen; + +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class PermissionsOnboardScreenTest extends AndroidTestCase { + private PermissionsOnboardingScreen mScreen; + @Mock private PermissionsChecker mPermissionsChecker; + + @Override + protected void setUp() throws Exception { + super.setUp(); + MockitoAnnotations.initMocks(this); + mScreen = new PermissionsOnboardingScreen(mPermissionsChecker); + } + + public void testMissingContactsAndPhonePermissions_shouldShowScreen() { + when(mPermissionsChecker.hasContactsPermissions()).thenReturn(false); + when(mPermissionsChecker.hasPhonePermissions()).thenReturn(false); + assertTrue(mScreen.shouldShowScreen()); + } + + public void testMissingContactsPermission_shouldShowScreen() { + when(mPermissionsChecker.hasContactsPermissions()).thenReturn(false); + when(mPermissionsChecker.hasPhonePermissions()).thenReturn(true); + assertTrue(mScreen.shouldShowScreen()); + } + + public void testMissingPhonePermission_shouldShowScreen() { + when(mPermissionsChecker.hasContactsPermissions()).thenReturn(true); + when(mPermissionsChecker.hasPhonePermissions()).thenReturn(false); + assertTrue(mScreen.shouldShowScreen()); + } + + public void testHasAllPermissions_shouldNotShowScreen() { + when(mPermissionsChecker.hasContactsPermissions()).thenReturn(true); + when(mPermissionsChecker.hasPhonePermissions()).thenReturn(true); + assertFalse(mScreen.shouldShowScreen()); + } + + public void testCanSkipScreen() { + assertFalse(mScreen.canSkipScreen()); + } +} diff --git a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java index 2590f3f8f..ae0dba822 100644 --- a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java +++ b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java @@ -40,6 +40,8 @@ import android.provider.VoicemailContract.Voicemails; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; +import android.text.Editable; +import android.text.TextWatcher; import android.text.format.DateFormat; import android.util.Log; import android.view.MotionEvent; @@ -154,11 +156,21 @@ public class FillCallLogTestActivity extends Activity { mAccount0 = (RadioButton) findViewById(R.id.account0); mAccount1 = (RadioButton) findViewById(R.id.account1); - mCustomCallTypeTextView.setOnTouchListener(new View.OnTouchListener() { + mCustomCallTypeTextView.addTextChangedListener(new TextWatcher() { @Override - public boolean onTouch(View v, MotionEvent event) { + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + // Do nothing. + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + // Toggle the custom call type radio button if the text is changed/focused. mCallTypeCustom.toggle(); - return false; + } + + @Override + public void afterTextChanged(Editable s) { + // Do nothing. } }); diff --git a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java index 420a17cfd..3a74f7395 100644 --- a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java +++ b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java @@ -111,12 +111,9 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call @Override public void run() { mPresenter.resumePlayback(); + assertStateTextContains("Loading voicemail"); } }); - mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT); - getInstrumentation().waitForIdleSync(); - - assertStateTextContains("Loading voicemail"); } public void testWhenCheckForContentCompletes() throws Throwable { @@ -132,8 +129,7 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT); getInstrumentation().waitForIdleSync(); - // Since the content is already fetched, don't show the loading message. - assertStateTextNotContains("Loading voicemail"); + assertStateTextContains("Loading voicemail"); } public void testInvalidVoicemailShowsErrorMessage() throws Throwable { @@ -232,12 +228,12 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call } } - private void assertStateTextContains(String text) throws Throwable { + private void assertStateTextContains(String text) { assertNotNull(mLayout); assertTrue(mLayout.getStateText().contains(text)); } - private void assertStateTextNotContains(String text) throws Throwable { + private void assertStateTextNotContains(String text) { assertNotNull(mLayout); assertFalse(mLayout.getStateText().contains(text)); } |