diff options
11 files changed, 154 insertions, 155 deletions
diff --git a/wifi/java/android/net/wifi/hotspot2/ConfigParser.java b/wifi/java/android/net/wifi/hotspot2/ConfigParser.java index 78b335d56196..5481f3a75fc2 100644 --- a/wifi/java/android/net/wifi/hotspot2/ConfigParser.java +++ b/wifi/java/android/net/wifi/hotspot2/ConfigParser.java @@ -16,7 +16,7 @@ package android.net.wifi.hotspot2; -import android.net.wifi.hotspot2.omadm.PPSMOParser; +import android.net.wifi.hotspot2.omadm.PpsMoParser; import android.text.TextUtils; import android.util.Base64; import android.util.Log; @@ -44,8 +44,8 @@ import java.util.Map; * * @hide */ -public final class ConfigBuilder { - private static final String TAG = "ConfigBuilder"; +public final class ConfigParser { + private static final String TAG = "ConfigParser"; // Header names. private static final String CONTENT_TYPE = "Content-Type"; @@ -101,7 +101,6 @@ public final class ConfigBuilder { public String encodingType = null; } - /** * Parse the Hotspot 2.0 Release 1 configuration data into a {@link PasspointConfiguration} * object. The configuration data is a base64 encoded MIME multipart data. Below is @@ -133,7 +132,7 @@ public final class ConfigBuilder { * certificate chain (optional). * @return {@link PasspointConfiguration} */ - public static PasspointConfiguration buildPasspointConfig(String mimeType, byte[] data) { + public static PasspointConfiguration parsePasspointConfig(String mimeType, byte[] data) { // Verify MIME type. if (!TextUtils.equals(mimeType, TYPE_WIFI_CONFIG)) { Log.e(TAG, "Unexpected MIME type: " + mimeType); @@ -169,7 +168,7 @@ public final class ConfigBuilder { throw new IOException("Missing Passpoint Profile"); } - PasspointConfiguration config = PPSMOParser.parseMOText(new String(profileData)); + PasspointConfiguration config = PpsMoParser.parseMoText(new String(profileData)); if (config == null) { throw new IOException("Failed to parse Passpoint profile"); } @@ -470,4 +469,4 @@ public final class ConfigBuilder { } return new Pair<PrivateKey, List<X509Certificate>>(clientKey, clientCertificateChain); } -}
\ No newline at end of file +} diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index c2b307d6a6fc..13bc491df96c 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -17,7 +17,7 @@ package android.net.wifi.hotspot2; import android.net.wifi.hotspot2.pps.Credential; -import android.net.wifi.hotspot2.pps.HomeSP; +import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.Policy; import android.net.wifi.hotspot2.pps.UpdateParameter; import android.os.Parcelable; @@ -60,11 +60,11 @@ public final class PasspointConfiguration implements Parcelable { private static final int NULL_VALUE = -1; /** - * Configurations under HomeSP subtree. + * Configurations under HomeSp subtree. */ - private HomeSP mHomeSp = null; - public void setHomeSp(HomeSP homeSp) { mHomeSp = homeSp; } - public HomeSP getHomeSp() { return mHomeSp; } + private HomeSp mHomeSp = null; + public void setHomeSp(HomeSp homeSp) { mHomeSp = homeSp; } + public HomeSp getHomeSp() { return mHomeSp; } /** * Configurations under Credential subtree. @@ -248,7 +248,7 @@ public final class PasspointConfiguration implements Parcelable { } if (source.mHomeSp != null) { - mHomeSp = new HomeSP(source.mHomeSp); + mHomeSp = new HomeSp(source.mHomeSp); } if (source.mCredential != null) { mCredential = new Credential(source.mCredential); diff --git a/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java b/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java index 24672d45f47a..c2344b5b967a 100644 --- a/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java +++ b/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java @@ -18,7 +18,7 @@ package android.net.wifi.hotspot2.omadm; import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.pps.Credential; -import android.net.wifi.hotspot2.pps.HomeSP; +import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.Policy; import android.net.wifi.hotspot2.pps.UpdateParameter; import android.text.TextUtils; @@ -112,8 +112,8 @@ import org.xml.sax.SAXException; * * @hide */ -public final class PPSMOParser { - private static final String TAG = "PPSMOParser"; +public final class PpsMoParser { + private static final String TAG = "PpsMoParser"; /** * XML tags expected in the PPS MO (PerProviderSubscription Management Object) XML tree. @@ -332,7 +332,7 @@ public final class PPSMOParser { * @param xmlString XML string representation of a PPS MO tree * @return {@link PasspointConfiguration} or null */ - public static PasspointConfiguration parseMOText(String xmlString) { + public static PasspointConfiguration parseMoText(String xmlString) { // Convert the XML string to a XML tree. XMLParser xmlParser = new XMLParser(); XMLNode root = null; @@ -640,12 +640,12 @@ public final class PPSMOParser { * @return HomeSP * @throws ParsingException */ - private static HomeSP parseHomeSP(PPSNode node) throws ParsingException { + private static HomeSp parseHomeSP(PPSNode node) throws ParsingException { if (node.isLeaf()) { throw new ParsingException("Leaf node not expected for HomeSP"); } - HomeSP homeSp = new HomeSP(); + HomeSp homeSp = new HomeSp(); for (PPSNode child : node.getChildren()) { switch (child.getName()) { case NODE_FQDN: @@ -655,7 +655,7 @@ public final class PPSMOParser { homeSp.setFriendlyName(getPpsNodeValue(child)); break; case NODE_ROAMING_CONSORTIUM_OI: - homeSp.setRoamingConsortiumOIs( + homeSp.setRoamingConsortiumOis( parseRoamingConsortiumOI(getPpsNodeValue(child))); break; case NODE_ICON_URL: @@ -666,8 +666,8 @@ public final class PPSMOParser { break; case NODE_HOME_OI_LIST: Pair<List<Long>, List<Long>> homeOIs = parseHomeOIList(child); - homeSp.setMatchAllOIs(convertFromLongList(homeOIs.first)); - homeSp.setMatchAnyOIs(convertFromLongList(homeOIs.second)); + homeSp.setMatchAllOis(convertFromLongList(homeOIs.first)); + homeSp.setMatchAnyOis(convertFromLongList(homeOIs.second)); break; case NODE_OTHER_HOME_PARTNERS: homeSp.setOtherHomePartners(parseOtherHomePartners(child)); @@ -909,7 +909,7 @@ public final class PPSMOParser { credential.setRealm(getPpsNodeValue(child)); break; case NODE_CHECK_AAA_SERVER_CERT_STATUS: - credential.setCheckAAAServerCertStatus( + credential.setCheckAaaServerCertStatus( Boolean.parseBoolean(getPpsNodeValue(child))); break; case NODE_SIM: diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java index ff93486dd25b..a8f64db897a5 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java @@ -98,12 +98,12 @@ public final class Credential implements Parcelable { * and Accounting) server's certificate during EAP (Extensible Authentication * Protocol) authentication. */ - private boolean mCheckAAAServerCertStatus = false; - public void setCheckAAAServerCertStatus(boolean checkAAAServerCertStatus) { - mCheckAAAServerCertStatus = checkAAAServerCertStatus; + private boolean mCheckAaaServerCertStatus = false; + public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) { + mCheckAaaServerCertStatus = checkAaaServerCertStatus; } - public boolean getCheckAAAServerStatus() { - return mCheckAAAServerCertStatus; + public boolean getCheckAaaServerStatus() { + return mCheckAaaServerCertStatus; } /** @@ -685,7 +685,7 @@ public final class Credential implements Parcelable { mCreationTimeInMs = source.mCreationTimeInMs; mExpirationTimeInMs = source.mExpirationTimeInMs; mRealm = source.mRealm; - mCheckAAAServerCertStatus = source.mCheckAAAServerCertStatus; + mCheckAaaServerCertStatus = source.mCheckAaaServerCertStatus; if (source.mUserCredential != null) { mUserCredential = new UserCredential(source.mUserCredential); } @@ -714,7 +714,7 @@ public final class Credential implements Parcelable { dest.writeLong(mCreationTimeInMs); dest.writeLong(mExpirationTimeInMs); dest.writeString(mRealm); - dest.writeInt(mCheckAAAServerCertStatus ? 1 : 0); + dest.writeInt(mCheckAaaServerCertStatus ? 1 : 0); dest.writeParcelable(mUserCredential, flags); dest.writeParcelable(mCertCredential, flags); dest.writeParcelable(mSimCredential, flags); @@ -736,7 +736,7 @@ public final class Credential implements Parcelable { return TextUtils.equals(mRealm, that.mRealm) && mCreationTimeInMs == that.mCreationTimeInMs && mExpirationTimeInMs == that.mExpirationTimeInMs - && mCheckAAAServerCertStatus == that.mCheckAAAServerCertStatus + && mCheckAaaServerCertStatus == that.mCheckAaaServerCertStatus && (mUserCredential == null ? that.mUserCredential == null : mUserCredential.equals(that.mUserCredential)) && (mCertCredential == null ? that.mCertCredential == null @@ -751,7 +751,7 @@ public final class Credential implements Parcelable { @Override public int hashCode() { return Objects.hash(mRealm, mCreationTimeInMs, mExpirationTimeInMs, - mCheckAAAServerCertStatus, mUserCredential, mCertCredential, mSimCredential, + mCheckAaaServerCertStatus, mUserCredential, mCertCredential, mSimCredential, mCaCertificate, mClientCertificateChain, mClientPrivateKey); } @@ -800,7 +800,7 @@ public final class Credential implements Parcelable { credential.setCreationTimeInMs(in.readLong()); credential.setExpirationTimeInMs(in.readLong()); credential.setRealm(in.readString()); - credential.setCheckAAAServerCertStatus(in.readInt() != 0); + credential.setCheckAaaServerCertStatus(in.readInt() != 0); credential.setUserCredential(in.readParcelable(null)); credential.setCertCredential(in.readParcelable(null)); credential.setSimCredential(in.readParcelable(null)); diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl index 62d5603b5982..6d343bde7081 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl @@ -16,4 +16,4 @@ package android.net.wifi.hotspot2.pps; -parcelable HomeSP; +parcelable HomeSp; diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java index 8b3b79c861af..598f4440fd24 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java @@ -37,8 +37,8 @@ import java.util.Objects; * * @hide */ -public final class HomeSP implements Parcelable { - private static final String TAG = "HomeSP"; +public final class HomeSp implements Parcelable { + private static final String TAG = "HomeSp"; /** * Maximum number of bytes allowed for a SSID. @@ -108,12 +108,12 @@ public final class HomeSP implements Parcelable { * Refer to HomeSP/HomeOIList subtree in PerProviderSubscription (PPS) Management Object * (MO) tree for more detail. */ - private long[] mMatchAllOIs = null; - public void setMatchAllOIs(long[] matchAllOIs) { - mMatchAllOIs = matchAllOIs; + private long[] mMatchAllOis = null; + public void setMatchAllOis(long[] matchAllOis) { + mMatchAllOis = matchAllOis; } - public long[] getMatchAllOIs() { - return mMatchAllOIs; + public long[] getMatchAllOis() { + return mMatchAllOis; } /** @@ -129,12 +129,12 @@ public final class HomeSP implements Parcelable { * Refer to HomeSP/HomeOIList subtree in PerProviderSubscription (PPS) Management Object * (MO) tree for more detail. */ - private long[] mMatchAnyOIs = null; - public void setMatchAnyOIs(long[] matchAnyOIs) { - mMatchAnyOIs = matchAnyOIs; + private long[] mMatchAnyOis = null; + public void setMatchAnyOis(long[] matchAnyOis) { + mMatchAnyOis = matchAnyOis; } - public long[] getMatchAnysOIs() { - return mMatchAnyOIs; + public long[] getMatchAnysOis() { + return mMatchAnyOis; } /** @@ -155,25 +155,25 @@ public final class HomeSP implements Parcelable { * List of Organization Identifiers (OIs) identifying a roaming consortium of * which this provider is a member. */ - private long[] mRoamingConsortiumOIs = null; - public void setRoamingConsortiumOIs(long[] roamingConsortiumOIs) { - mRoamingConsortiumOIs = roamingConsortiumOIs; + private long[] mRoamingConsortiumOis = null; + public void setRoamingConsortiumOis(long[] roamingConsortiumOis) { + mRoamingConsortiumOis = roamingConsortiumOis; } - public long[] getRoamingConsortiumOIs() { - return mRoamingConsortiumOIs; + public long[] getRoamingConsortiumOis() { + return mRoamingConsortiumOis; } /** - * Constructor for creating HomeSP with default values. + * Constructor for creating HomeSp with default values. */ - public HomeSP() {} + public HomeSp() {} /** * Copy constructor. * * @param source The source to copy from */ - public HomeSP(HomeSP source) { + public HomeSp(HomeSp source) { if (source == null) { return; } @@ -183,19 +183,19 @@ public final class HomeSP implements Parcelable { if (source.mHomeNetworkIds != null) { mHomeNetworkIds = Collections.unmodifiableMap(source.mHomeNetworkIds); } - if (source.mMatchAllOIs != null) { - mMatchAllOIs = Arrays.copyOf(source.mMatchAllOIs, source.mMatchAllOIs.length); + if (source.mMatchAllOis != null) { + mMatchAllOis = Arrays.copyOf(source.mMatchAllOis, source.mMatchAllOis.length); } - if (source.mMatchAnyOIs != null) { - mMatchAnyOIs = Arrays.copyOf(source.mMatchAnyOIs, source.mMatchAnyOIs.length); + if (source.mMatchAnyOis != null) { + mMatchAnyOis = Arrays.copyOf(source.mMatchAnyOis, source.mMatchAnyOis.length); } if (source.mOtherHomePartners != null) { mOtherHomePartners = Arrays.copyOf(source.mOtherHomePartners, source.mOtherHomePartners.length); } - if (source.mRoamingConsortiumOIs != null) { - mRoamingConsortiumOIs = Arrays.copyOf(source.mRoamingConsortiumOIs, - source.mRoamingConsortiumOIs.length); + if (source.mRoamingConsortiumOis != null) { + mRoamingConsortiumOis = Arrays.copyOf(source.mRoamingConsortiumOis, + source.mRoamingConsortiumOis.length); } } @@ -210,10 +210,10 @@ public final class HomeSP implements Parcelable { dest.writeString(mFriendlyName); dest.writeString(mIconUrl); writeHomeNetworkIds(dest, mHomeNetworkIds); - dest.writeLongArray(mMatchAllOIs); - dest.writeLongArray(mMatchAnyOIs); + dest.writeLongArray(mMatchAllOis); + dest.writeLongArray(mMatchAnyOis); dest.writeStringArray(mOtherHomePartners); - dest.writeLongArray(mRoamingConsortiumOIs); + dest.writeLongArray(mRoamingConsortiumOis); } @Override @@ -221,30 +221,30 @@ public final class HomeSP implements Parcelable { if (this == thatObject) { return true; } - if (!(thatObject instanceof HomeSP)) { + if (!(thatObject instanceof HomeSp)) { return false; } - HomeSP that = (HomeSP) thatObject; + HomeSp that = (HomeSp) thatObject; return TextUtils.equals(mFqdn, that.mFqdn) && TextUtils.equals(mFriendlyName, that.mFriendlyName) && TextUtils.equals(mIconUrl, that.mIconUrl) && (mHomeNetworkIds == null ? that.mHomeNetworkIds == null : mHomeNetworkIds.equals(that.mHomeNetworkIds)) - && Arrays.equals(mMatchAllOIs, that.mMatchAllOIs) - && Arrays.equals(mMatchAnyOIs, that.mMatchAnyOIs) + && Arrays.equals(mMatchAllOis, that.mMatchAllOis) + && Arrays.equals(mMatchAnyOis, that.mMatchAnyOis) && Arrays.equals(mOtherHomePartners, that.mOtherHomePartners) - && Arrays.equals(mRoamingConsortiumOIs, that.mRoamingConsortiumOIs); + && Arrays.equals(mRoamingConsortiumOis, that.mRoamingConsortiumOis); } @Override public int hashCode() { - return Objects.hash(mFqdn, mFriendlyName, mIconUrl, mHomeNetworkIds, mMatchAllOIs, - mMatchAnyOIs, mOtherHomePartners, mRoamingConsortiumOIs); + return Objects.hash(mFqdn, mFriendlyName, mIconUrl, mHomeNetworkIds, mMatchAllOis, + mMatchAnyOis, mOtherHomePartners, mRoamingConsortiumOis); } /** - * Validate HomeSP data. + * Validate HomeSp data. * * @return true on success or false on failure */ @@ -270,25 +270,25 @@ public final class HomeSP implements Parcelable { return true; } - public static final Creator<HomeSP> CREATOR = - new Creator<HomeSP>() { + public static final Creator<HomeSp> CREATOR = + new Creator<HomeSp>() { @Override - public HomeSP createFromParcel(Parcel in) { - HomeSP homeSp = new HomeSP(); + public HomeSp createFromParcel(Parcel in) { + HomeSp homeSp = new HomeSp(); homeSp.setFqdn(in.readString()); homeSp.setFriendlyName(in.readString()); homeSp.setIconUrl(in.readString()); homeSp.setHomeNetworkIds(readHomeNetworkIds(in)); - homeSp.setMatchAllOIs(in.createLongArray()); - homeSp.setMatchAnyOIs(in.createLongArray()); + homeSp.setMatchAllOis(in.createLongArray()); + homeSp.setMatchAnyOis(in.createLongArray()); homeSp.setOtherHomePartners(in.createStringArray()); - homeSp.setRoamingConsortiumOIs(in.createLongArray()); + homeSp.setRoamingConsortiumOis(in.createLongArray()); return homeSp; } @Override - public HomeSP[] newArray(int size) { - return new HomeSP[size]; + public HomeSp[] newArray(int size) { + return new HomeSp[size]; } /** diff --git a/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java b/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java index f7dbf7e54d10..56bb4375acdd 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import android.net.wifi.FakeKeys; import android.net.wifi.hotspot2.pps.Credential; -import android.net.wifi.hotspot2.pps.HomeSP; +import android.net.wifi.hotspot2.pps.HomeSp; import android.test.suitebuilder.annotation.SmallTest; import java.io.BufferedReader; @@ -33,10 +33,10 @@ import java.util.Arrays; import org.junit.Test; /** - * Unit tests for {@link android.net.wifi.hotspot2.ConfigBuilder}. + * Unit tests for {@link android.net.wifi.hotspot2.ConfigParser}. */ @SmallTest -public class ConfigBuilderTest { +public class ConfigParserTest { /** * Hotspot 2.0 Release 1 installation file that contains a Passpoint profile and a * CA (Certificate Authority) X.509 certificate {@link FakeKeys#CA_CERT0}. @@ -83,10 +83,10 @@ public class ConfigBuilderTest { PasspointConfiguration config = new PasspointConfiguration(); // HomeSP configuration. - HomeSP homeSp = new HomeSP(); + HomeSp homeSp = new HomeSp(); homeSp.setFriendlyName("Century House"); homeSp.setFqdn("mi6.co.uk"); - homeSp.setRoamingConsortiumOIs(new long[] {0x112233L, 0x445566L}); + homeSp.setRoamingConsortiumOis(new long[] {0x112233L, 0x445566L}); config.setHomeSp(homeSp); // Credential configuration. @@ -123,7 +123,7 @@ public class ConfigBuilderTest { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_CA_CERT); PasspointConfiguration expectedConfig = generateConfigurationFromProfile(); PasspointConfiguration actualConfig = - ConfigBuilder.buildPasspointConfig( + ConfigParser.parsePasspointConfig( "application/x-wifi-config", configStr.getBytes()); assertTrue(actualConfig.equals(expectedConfig)); } @@ -136,7 +136,7 @@ public class ConfigBuilderTest { @Test public void parseConfigFileWithInvalidMimeType() throws Exception { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_CA_CERT); - assertNull(ConfigBuilder.buildPasspointConfig( + assertNull(ConfigParser.parsePasspointConfig( "application/wifi-config", configStr.getBytes())); } @@ -148,7 +148,7 @@ public class ConfigBuilderTest { @Test public void parseConfigFileWithUnencodedData() throws Exception { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_UNENCODED_DATA); - assertNull(ConfigBuilder.buildPasspointConfig( + assertNull(ConfigParser.parsePasspointConfig( "application/x-wifi-config", configStr.getBytes())); } @@ -160,7 +160,7 @@ public class ConfigBuilderTest { @Test public void parseConfigFileWithInvalidPart() throws Exception { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_INVALID_PART); - assertNull(ConfigBuilder.buildPasspointConfig( + assertNull(ConfigParser.parsePasspointConfig( "application/x-wifi-config", configStr.getBytes())); } @@ -172,7 +172,7 @@ public class ConfigBuilderTest { @Test public void parseConfigFileWithMissingBoundary() throws Exception { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_MISSING_BOUNDARY); - assertNull(ConfigBuilder.buildPasspointConfig( + assertNull(ConfigParser.parsePasspointConfig( "application/x-wifi-config", configStr.getBytes())); } @@ -185,7 +185,7 @@ public class ConfigBuilderTest { @Test public void parseConfigFileWithInvalidContentType() throws Exception { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_INVALID_CONTENT_TYPE); - assertNull(ConfigBuilder.buildPasspointConfig( + assertNull(ConfigParser.parsePasspointConfig( "application/x-wifi-config", configStr.getBytes())); } @@ -197,7 +197,7 @@ public class ConfigBuilderTest { @Test public void parseConfigFileWithoutPasspointProfile() throws Exception { String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITHOUT_PROFILE); - assertNull(ConfigBuilder.buildPasspointConfig( + assertNull(ConfigParser.parsePasspointConfig( "application/x-wifi-config", configStr.getBytes())); } }
\ No newline at end of file diff --git a/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java b/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java index 3aed918527a3..7df4fcf56e8a 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import android.net.wifi.EAPConstants; import android.net.wifi.hotspot2.pps.Credential; -import android.net.wifi.hotspot2.pps.HomeSP; +import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.Policy; import android.net.wifi.hotspot2.pps.UpdateParameter; import android.os.Parcel; @@ -50,11 +50,11 @@ public class PasspointConfigurationTest { * * @return {@link android.net.wifi.hotspot2.pps.HomeSP} */ - private static HomeSP createHomeSp() { - HomeSP homeSp = new HomeSP(); + private static HomeSp createHomeSp() { + HomeSp homeSp = new HomeSp(); homeSp.setFqdn("fqdn"); homeSp.setFriendlyName("friendly name"); - homeSp.setRoamingConsortiumOIs(new long[] {0x55, 0x66}); + homeSp.setRoamingConsortiumOis(new long[] {0x55, 0x66}); return homeSp; } diff --git a/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java b/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java index 15de5c78a995..7cd72f03dd1b 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java @@ -19,10 +19,10 @@ package android.net.wifi.hotspot2.omadm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.net.wifi.hotspot2.omadm.PPSMOParser; +import android.net.wifi.hotspot2.omadm.PpsMoParser; import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.pps.Credential; -import android.net.wifi.hotspot2.pps.HomeSP; +import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.Policy; import android.net.wifi.hotspot2.pps.UpdateParameter; import android.test.suitebuilder.annotation.SmallTest; @@ -43,10 +43,10 @@ import java.util.List; import java.util.Map; /** - * Unit tests for {@link android.net.wifi.hotspot2.omadm.PPSMOParser}. + * Unit tests for {@link android.net.wifi.hotspot2.omadm.PpsMoParser}. */ @SmallTest -public class PPSMOParserTest { +public class PpsMoParserTest { private static final String VALID_PPS_MO_XML_FILE = "assets/pps/PerProviderSubscription.xml"; private static final String PPS_MO_XML_FILE_DUPLICATE_HOMESP = "assets/pps/PerProviderSubscription_DuplicateHomeSP.xml"; @@ -122,17 +122,17 @@ public class PPSMOParserTest { config.setUsageLimitUsageTimePeriodInMinutes(99910); // HomeSP configuration. - HomeSP homeSp = new HomeSP(); + HomeSp homeSp = new HomeSp(); homeSp.setFriendlyName("Century House"); homeSp.setFqdn("mi6.co.uk"); - homeSp.setRoamingConsortiumOIs(new long[] {0x112233L, 0x445566L}); + homeSp.setRoamingConsortiumOis(new long[] {0x112233L, 0x445566L}); homeSp.setIconUrl("icon.test.com"); Map<String, Long> homeNetworkIds = new HashMap<>(); homeNetworkIds.put("TestSSID", 0x12345678L); homeNetworkIds.put("NullHESSID", null); homeSp.setHomeNetworkIds(homeNetworkIds); - homeSp.setMatchAllOIs(new long[] {0x11223344}); - homeSp.setMatchAnyOIs(new long[] {0x55667788}); + homeSp.setMatchAllOis(new long[] {0x11223344}); + homeSp.setMatchAnyOis(new long[] {0x55667788}); homeSp.setOtherHomePartners(new String[] {"other.fqdn.com"}); config.setHomeSp(homeSp); @@ -141,7 +141,7 @@ public class PPSMOParserTest { credential.setCreationTimeInMs(format.parse("2016-01-01T10:00:00Z").getTime()); credential.setExpirationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime()); credential.setRealm("shaken.stirred.com"); - credential.setCheckAAAServerCertStatus(true); + credential.setCheckAaaServerCertStatus(true); Credential.UserCredential userCredential = new Credential.UserCredential(); userCredential.setUsername("james"); userCredential.setPassword("Ym9uZDAwNw=="); @@ -209,53 +209,53 @@ public class PPSMOParserTest { public void parseValidPPSMOTree() throws Exception { String ppsMoTree = loadResourceFile(VALID_PPS_MO_XML_FILE); PasspointConfiguration expectedConfig = generateConfigurationFromPPSMOTree(); - PasspointConfiguration actualConfig = PPSMOParser.parseMOText(ppsMoTree); + PasspointConfiguration actualConfig = PpsMoParser.parseMoText(ppsMoTree); assertTrue(actualConfig.equals(expectedConfig)); } @Test public void parseNullPPSMOTree() throws Exception { - assertEquals(null, PPSMOParser.parseMOText(null)); + assertEquals(null, PpsMoParser.parseMoText(null)); } @Test public void parseEmptyPPSMOTree() throws Exception { - assertEquals(null, PPSMOParser.parseMOText(new String())); + assertEquals(null, PpsMoParser.parseMoText(new String())); } @Test public void parsePPSMOTreeWithDuplicateHomeSP() throws Exception { - assertEquals(null, PPSMOParser.parseMOText( + assertEquals(null, PpsMoParser.parseMoText( loadResourceFile(PPS_MO_XML_FILE_DUPLICATE_HOMESP))); } @Test public void parsePPSMOTreeWithDuplicateValue() throws Exception { - assertEquals(null, PPSMOParser.parseMOText( + assertEquals(null, PpsMoParser.parseMoText( loadResourceFile(PPS_MO_XML_FILE_DUPLICATE_VALUE))); } @Test public void parsePPSMOTreeWithMissingValue() throws Exception { - assertEquals(null, PPSMOParser.parseMOText( + assertEquals(null, PpsMoParser.parseMoText( loadResourceFile(PPS_MO_XML_FILE_MISSING_VALUE))); } @Test public void parsePPSMOTreeWithMissingName() throws Exception { - assertEquals(null, PPSMOParser.parseMOText( + assertEquals(null, PpsMoParser.parseMoText( loadResourceFile(PPS_MO_XML_FILE_MISSING_NAME))); } @Test public void parsePPSMOTreeWithInvalidNode() throws Exception { - assertEquals(null, PPSMOParser.parseMOText( + assertEquals(null, PpsMoParser.parseMoText( loadResourceFile(PPS_MO_XML_FILE_INVALID_NODE))); } @Test public void parsePPSMOTreeWithInvalidName() throws Exception { - assertEquals(null, PPSMOParser.parseMOText( + assertEquals(null, PpsMoParser.parseMoText( loadResourceFile(PPS_MO_XML_FILE_INVALID_NAME))); } } diff --git a/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java b/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java index 6f68e1c868c1..c7ade002c826 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java @@ -59,7 +59,7 @@ public class CredentialTest { cred.setCreationTimeInMs(123455L); cred.setExpirationTimeInMs(2310093L); cred.setRealm("realm"); - cred.setCheckAAAServerCertStatus(true); + cred.setCheckAaaServerCertStatus(true); cred.setUserCredential(userCred); cred.setCertCredential(certCred); cred.setSimCredential(simCred); diff --git a/wifi/tests/src/android/net/wifi/hotspot2/pps/HomeSpTest.java b/wifi/tests/src/android/net/wifi/hotspot2/pps/HomeSpTest.java index 92e94ee51317..c41c11f16acf 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/pps/HomeSpTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/pps/HomeSpTest.java @@ -30,10 +30,10 @@ import java.util.HashMap; import java.util.Map; /** - * Unit tests for {@link android.net.wifi.hotspot2.pps.HomeSP}. + * Unit tests for {@link android.net.wifi.hotspot2.pps.HomeSp}. */ @SmallTest -public class HomeSPTest { +public class HomeSpTest { /** * Helper function for creating a map of home network IDs for testing. @@ -48,68 +48,68 @@ public class HomeSPTest { } /** - * Helper function for creating a HomeSP for testing. + * Helper function for creating a HomeSp for testing. * - * @param homeNetworkIds The map of home network IDs associated with HomeSP - * @return {@link HomeSP} + * @param homeNetworkIds The map of home network IDs associated with HomeSp + * @return {@link HomeSp} */ - private static HomeSP createHomeSp(Map<String, Long> homeNetworkIds) { - HomeSP homeSp = new HomeSP(); + private static HomeSp createHomeSp(Map<String, Long> homeNetworkIds) { + HomeSp homeSp = new HomeSp(); homeSp.setFqdn("fqdn"); homeSp.setFriendlyName("friendly name"); homeSp.setIconUrl("icon.url"); homeSp.setHomeNetworkIds(homeNetworkIds); - homeSp.setMatchAllOIs(new long[] {0x11L, 0x22L}); - homeSp.setMatchAnyOIs(new long[] {0x33L, 0x44L}); + homeSp.setMatchAllOis(new long[] {0x11L, 0x22L}); + homeSp.setMatchAnyOis(new long[] {0x33L, 0x44L}); homeSp.setOtherHomePartners(new String[] {"partner1", "partner2"}); - homeSp.setRoamingConsortiumOIs(new long[] {0x55, 0x66}); + homeSp.setRoamingConsortiumOis(new long[] {0x55, 0x66}); return homeSp; } /** - * Helper function for creating a HomeSP with home network IDs for testing. + * Helper function for creating a HomeSp with home network IDs for testing. * - * @return {@link HomeSP} + * @return {@link HomeSp} */ - private static HomeSP createHomeSpWithHomeNetworkIds() { + private static HomeSp createHomeSpWithHomeNetworkIds() { return createHomeSp(createHomeNetworkIds()); } /** - * Helper function for creating a HomeSP without home network IDs for testing. + * Helper function for creating a HomeSp without home network IDs for testing. * - * @return {@link HomeSP} + * @return {@link HomeSp} */ - private static HomeSP createHomeSpWithoutHomeNetworkIds() { + private static HomeSp createHomeSpWithoutHomeNetworkIds() { return createHomeSp(null); } /** - * Helper function for verifying HomeSP after parcel write then read. + * Helper function for verifying HomeSp after parcel write then read. * @param writeHomeSp * @throws Exception */ - private static void verifyParcel(HomeSP writeHomeSp) throws Exception { + private static void verifyParcel(HomeSp writeHomeSp) throws Exception { Parcel parcel = Parcel.obtain(); writeHomeSp.writeToParcel(parcel, 0); parcel.setDataPosition(0); // Rewind data position back to the beginning for read. - HomeSP readHomeSp = HomeSP.CREATOR.createFromParcel(parcel); + HomeSp readHomeSp = HomeSp.CREATOR.createFromParcel(parcel); assertTrue(readHomeSp.equals(writeHomeSp)); } /** - * Verify parcel read/write for an empty HomeSP. + * Verify parcel read/write for an empty HomeSp. * * @throws Exception */ @Test - public void verifyParcelWithEmptyHomeSP() throws Exception { - verifyParcel(new HomeSP()); + public void verifyParcelWithEmptyHomeSp() throws Exception { + verifyParcel(new HomeSp()); } /** - * Verify parcel read/write for a HomeSP containing Home Network IDs. + * Verify parcel read/write for a HomeSp containing Home Network IDs. * * @throws Exception */ @@ -119,7 +119,7 @@ public class HomeSPTest { } /** - * Verify parcel read/write for a HomeSP without Home Network IDs. + * Verify parcel read/write for a HomeSp without Home Network IDs. * * @throws Exception */ @@ -129,62 +129,62 @@ public class HomeSPTest { } /** - * Verify that a HomeSP is valid when both FQDN and Friendly Name + * Verify that a HomeSp is valid when both FQDN and Friendly Name * are provided. * * @throws Exception */ @Test - public void validateValidHomeSP() throws Exception { - HomeSP homeSp = createHomeSpWithHomeNetworkIds(); + public void validateValidHomeSp() throws Exception { + HomeSp homeSp = createHomeSpWithHomeNetworkIds(); assertTrue(homeSp.validate()); } /** - * Verify that a HomeSP is not valid when FQDN is not provided + * Verify that a HomeSp is not valid when FQDN is not provided * * @throws Exception */ @Test public void validateHomeSpWithoutFqdn() throws Exception { - HomeSP homeSp = createHomeSpWithHomeNetworkIds(); + HomeSp homeSp = createHomeSpWithHomeNetworkIds(); homeSp.setFqdn(null); assertFalse(homeSp.validate()); } /** - * Verify that a HomeSP is not valid when Friendly Name is not provided + * Verify that a HomeSp is not valid when Friendly Name is not provided * * @throws Exception */ @Test public void validateHomeSpWithoutFriendlyName() throws Exception { - HomeSP homeSp = createHomeSpWithHomeNetworkIds(); + HomeSp homeSp = createHomeSpWithHomeNetworkIds(); homeSp.setFriendlyName(null); assertFalse(homeSp.validate()); } /** - * Verify that a HomeSP is valid when the optional Home Network IDs are + * Verify that a HomeSp is valid when the optional Home Network IDs are * not provided. * * @throws Exception */ @Test public void validateHomeSpWithoutHomeNetworkIds() throws Exception { - HomeSP homeSp = createHomeSpWithoutHomeNetworkIds(); + HomeSp homeSp = createHomeSpWithoutHomeNetworkIds(); assertTrue(homeSp.validate()); } /** - * Verify that a HomeSP is invalid when the optional Home Network IDs + * Verify that a HomeSp is invalid when the optional Home Network IDs * contained an invalid SSID (exceeding maximum number of bytes). * * @throws Exception */ @Test public void validateHomeSpWithInvalidHomeNetworkIds() throws Exception { - HomeSP homeSp = createHomeSpWithoutHomeNetworkIds(); + HomeSp homeSp = createHomeSpWithoutHomeNetworkIds(); // HomeNetworkID with SSID exceeding the maximum length. Map<String, Long> homeNetworkIds = new HashMap<>(); byte[] rawSsidBytes = new byte[33]; @@ -202,8 +202,8 @@ public class HomeSPTest { */ @Test public void validateCopyConstructorFromNullSource() throws Exception { - HomeSP copySp = new HomeSP(null); - HomeSP defaultSp = new HomeSP(); + HomeSp copySp = new HomeSp(null); + HomeSp defaultSp = new HomeSp(); assertTrue(copySp.equals(defaultSp)); } @@ -214,8 +214,8 @@ public class HomeSPTest { */ @Test public void validateCopyConstructorFromValidSource() throws Exception { - HomeSP sourceSp = createHomeSpWithHomeNetworkIds(); - HomeSP copySp = new HomeSP(sourceSp); + HomeSp sourceSp = createHomeSpWithHomeNetworkIds(); + HomeSp copySp = new HomeSp(sourceSp); assertTrue(copySp.equals(sourceSp)); } } |