PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make ApnEditor can show the customized default value on UI." into rvc-dev am: 49b82f8532 am: 5864a6ba23 am: e73f9b8072 am: 0c5470e72a

Browse Source 
Change-Id: I5bde351a0f69e3ba5a814df4eacaee645578856e
This commit is contained in:
Tom Hsu
2020-04-22 13:00:52 +00:00
committed by Automerger Merge Worker
parent feb67761de 0c5470e72a
commit 323d504108
2 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/robotests/src/com/android/settings/network/ApnEditorTest.java
View File

@@ -81,11 +81,11 @@ public class ApnEditorTest {
"" /* MMS port */,
0 /* Authentication type */,
"default,supl,ia" /* APN type */,
"IPv6" /* APN protocol */,
"IP" /* APN protocol */,
1 /* APN enable/disable */,
0 /* Bearer */,
0 /* Bearer BITMASK*/,
"IPv4" /* APN roaming protocol */,
"IPV6" /* APN roaming protocol */,
"None" /* MVNO type */,
"", /* MVNO value */
};
@@ -464,33 +464,25 @@ public class ApnEditorTest {
}
@Test
public void getUserEnteredApnProtocol_emptyApnProtocol_shouldReturnDefaultIPv4v6() {
// GIVEN read default APN protocol with IPV4V6
mApnEditorUT.mDefaultApnProtocol = "IPV4V6";
public void testOnViewStateRestored_customizedValueWithoutDefault_shouldShowCustomized() {
mApnEditorUT.mDefaultApnProtocol = "IP";
mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = null;
mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
// Input empty in TYPE
mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "";
mApnEditorUT.fillUI(true /* firstTime */);
mApnEditorUT.onViewStateRestored(null);
// THEN APN type should be IPV4V6
assertThat(mApnEditorUT.getUserEnteredApnProtocol(
mApnEditorUT.mProtocol, mApnEditorUT.mDefaultApnProtocol))
.isEqualTo("IPV4V6");
assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv4");
}
@Test
public void getUserEnteredApnProtocol_emptyApnProtocol_shouldReturnDefaultIP() {
// GIVEN read default APN protocol with IP
public void testOnViewStateRestored_customizedValueWithDefault_shouldShowDefault() {
mApnEditorUT.mDefaultApnProtocol = "IP";
mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "IPV6";
mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
// Input empty in TYPE
mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "";
mApnEditorUT.fillUI(true /* firstTime */);
mApnEditorUT.onViewStateRestored(null);
// THEN APN type should be IPV4V6
assertThat(mApnEditorUT.getUserEnteredApnProtocol(
mApnEditorUT.mProtocol, mApnEditorUT.mDefaultApnProtocol))
.isEqualTo("IP");
assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv6");
}
@Test
@@ -503,7 +495,7 @@ public class ApnEditorTest {
// Input empty in TYPE
mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
mApnEditorUT.fillUI(true /* firstTime */);
mApnEditorUT.onViewStateRestored(null);
// THEN APN type should be default
assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
@@ -516,7 +508,7 @@ public class ApnEditorTest {
// Input empty in TYPE
mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
mApnEditorUT.fillUI(true /* firstTime */);
mApnEditorUT.onViewStateRestored(null);
// THEN APN type should be default
assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");