diff options
author | John Patterson <jdp@google.com> | 2021-01-14 10:46:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-14 10:46:25 +0000 |
commit | f69993c0a8853a3cd41ff0ccd547264cb9fa6011 (patch) | |
tree | cbceec40a23f851b84d121304c23db95ed2a8545 /tests | |
parent | 8c2e10df235161df74cf89041b8c655c05c14f61 (diff) | |
parent | 238013edb2187750d9e70f2d7a4f55c01a742498 (diff) | |
download | Calendar-f69993c0a8853a3cd41ff0ccd547264cb9fa6011.tar.gz |
Unbundle the Car Calendar App. am: 6a802e5805 am: 238013edb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/13323725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idded7d2c6d8554ed77d92722d8096822c6978f6f
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ui/src/com/android/car/calendar/CarCalendarUiTest.java | 4 | ||||
-rw-r--r-- | tests/unit/src/com/android/car/calendar/common/EventDescriptionsTest.java | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/tests/ui/src/com/android/car/calendar/CarCalendarUiTest.java b/tests/ui/src/com/android/car/calendar/CarCalendarUiTest.java index d3992f6..e591a80 100644 --- a/tests/ui/src/com/android/car/calendar/CarCalendarUiTest.java +++ b/tests/ui/src/com/android/car/calendar/CarCalendarUiTest.java @@ -35,6 +35,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.CancellationSignal; import android.provider.CalendarContract; +import android.telephony.TelephonyManager; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; @@ -128,7 +129,8 @@ public class CarCalendarUiTest { new TestCalendarContentProvider(context); mockContentResolver.addProvider(CalendarContract.AUTHORITY, testCalendarContentProvider); activity.mDependencies = - new CarCalendarActivity.Dependencies(LOCALE, fixedTimeClock, mockContentResolver); + new CarCalendarActivity.Dependencies(LOCALE, fixedTimeClock, mockContentResolver, + activity.getSystemService(TelephonyManager.class)); } private void observeEventsLiveData(CarCalendarActivity activity) { diff --git a/tests/unit/src/com/android/car/calendar/common/EventDescriptionsTest.java b/tests/unit/src/com/android/car/calendar/common/EventDescriptionsTest.java index 358e9cf..bea029f 100644 --- a/tests/unit/src/com/android/car/calendar/common/EventDescriptionsTest.java +++ b/tests/unit/src/com/android/car/calendar/common/EventDescriptionsTest.java @@ -18,28 +18,36 @@ package com.android.car.calendar.common; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.when; + import android.net.Uri; +import android.telephony.TelephonyManager; import com.google.common.collect.Iterables; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Locale; public class EventDescriptionsTest { - private static final String BASE_NUMBER = "30 303986300"; private static final String LOCAL_NUMBER = "0" + BASE_NUMBER; private static final String INTERNATIONAL_NUMBER = "+49 " + BASE_NUMBER; private static final String ACCESS = ",,12;3*45#"; + private static final String COUNTRY_ISO_CODE = "DE"; + private EventDescriptions mEventDescriptions; + private TelephonyManager mMockTelephonyManager; @Before public void setUp() { - mEventDescriptions = new EventDescriptions(Locale.GERMANY); + mMockTelephonyManager = Mockito.mock(TelephonyManager.class); + when(mMockTelephonyManager.getNetworkCountryIso()).thenReturn(COUNTRY_ISO_CODE); + mEventDescriptions = new EventDescriptions(Locale.GERMANY, mMockTelephonyManager); } @Test @@ -48,7 +56,7 @@ public class EventDescriptionsTest { mEventDescriptions.extractNumberAndPins(LOCAL_NUMBER); assertThat(numberAndAccesses).isNotEmpty(); Dialer.NumberAndAccess numberAndAccess = Iterables.getFirst(numberAndAccesses, null); - assertThat(numberAndAccess.getNumber()).isEqualTo(INTERNATIONAL_NUMBER); + assertThat(numberAndAccess.getNumber()).isEqualTo(LOCAL_NUMBER); } @Test @@ -62,9 +70,10 @@ public class EventDescriptionsTest { @Test public void extractNumberAndPin_internationalNumberWithDifferentLocale_resultIsInternational() { - mEventDescriptions = new EventDescriptions(Locale.FRANCE); + EventDescriptions eventDescriptions = + new EventDescriptions(Locale.FRANCE, mMockTelephonyManager); List<Dialer.NumberAndAccess> numberAndAccesses = - mEventDescriptions.extractNumberAndPins(INTERNATIONAL_NUMBER); + eventDescriptions.extractNumberAndPins(INTERNATIONAL_NUMBER); assertThat(numberAndAccesses).isNotEmpty(); Dialer.NumberAndAccess numberAndAccess = Iterables.getFirst(numberAndAccesses, null); assertThat(numberAndAccess.getNumber()).isEqualTo(INTERNATIONAL_NUMBER); @@ -105,8 +114,8 @@ public class EventDescriptionsTest { List<Dialer.NumberAndAccess> numberAndAccesses = mEventDescriptions.extractNumberAndPins(input); - // The local number is valid but repeated so only included once. - assertThat(numberAndAccesses).hasSize(1); + // Keep all variations of a base number. + assertThat(numberAndAccesses).hasSize(3); } @Test |