From 58657a93a19ac004574d2cdd16cee0dc286afde6 Mon Sep 17 00:00:00 2001 From: David Su Date: Tue, 17 Dec 2019 18:43:46 -0800 Subject: [PATCH] Use public getters for WifiP2pConfig fields CTS cannot test @hide fields, need to use public getters instead. Bug: 146463839 Test: atest WifiP2pConfigTest Change-Id: I182a232d64e3ad66664ee78c96c0f73ea5c08386 --- .../net/wifi/p2p/cts/WifiP2pConfigTest.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/cts/net/src/android/net/wifi/p2p/cts/WifiP2pConfigTest.java b/tests/cts/net/src/android/net/wifi/p2p/cts/WifiP2pConfigTest.java index 639db8a7c3..e93d573484 100644 --- a/tests/cts/net/src/android/net/wifi/p2p/cts/WifiP2pConfigTest.java +++ b/tests/cts/net/src/android/net/wifi/p2p/cts/WifiP2pConfigTest.java @@ -22,41 +22,41 @@ import android.net.wifi.p2p.WifiP2pGroup; import android.test.AndroidTestCase; public class WifiP2pConfigTest extends AndroidTestCase { - static final String TEST_NETWORK_NAME = "DIRECT-xy-Hello"; - static final String TEST_PASSPHRASE = "8etterW0r1d"; - static final int TEST_OWNER_BAND = WifiP2pConfig.GROUP_OWNER_BAND_5GHZ; - static final int TEST_OWNER_FREQ = 2447; - static final String TEST_DEVICE_ADDRESS = "aa:bb:cc:dd:ee:ff"; + private static final String TEST_NETWORK_NAME = "DIRECT-xy-Hello"; + private static final String TEST_PASSPHRASE = "8etterW0r1d"; + private static final int TEST_OWNER_BAND = WifiP2pConfig.GROUP_OWNER_BAND_5GHZ; + private static final int TEST_OWNER_FREQ = 2447; + private static final String TEST_DEVICE_ADDRESS = "aa:bb:cc:dd:ee:ff"; public void testWifiP2pConfigBuilderForPersist() { - WifiP2pConfig.Builder builder = new WifiP2pConfig.Builder(); - builder.setNetworkName(TEST_NETWORK_NAME) + WifiP2pConfig config = new WifiP2pConfig.Builder() + .setNetworkName(TEST_NETWORK_NAME) .setPassphrase(TEST_PASSPHRASE) .setGroupOperatingBand(TEST_OWNER_BAND) .setDeviceAddress(MacAddress.fromString(TEST_DEVICE_ADDRESS)) - .enablePersistentMode(true); - WifiP2pConfig config = builder.build(); + .enablePersistentMode(true) + .build(); - assertTrue(config.deviceAddress.equals(TEST_DEVICE_ADDRESS)); - assertTrue(config.networkName.equals(TEST_NETWORK_NAME)); - assertTrue(config.passphrase.equals(TEST_PASSPHRASE)); - assertEquals(config.groupOwnerBand, TEST_OWNER_BAND); - assertEquals(config.netId, WifiP2pGroup.PERSISTENT_NET_ID); + assertEquals(config.deviceAddress, TEST_DEVICE_ADDRESS); + assertEquals(config.getNetworkName(), TEST_NETWORK_NAME); + assertEquals(config.getPassphrase(), TEST_PASSPHRASE); + assertEquals(config.getGroupOwnerBand(), TEST_OWNER_BAND); + assertEquals(config.getNetworkId(), WifiP2pGroup.PERSISTENT_NET_ID); } public void testWifiP2pConfigBuilderForNonPersist() { - WifiP2pConfig.Builder builder = new WifiP2pConfig.Builder(); - builder.setNetworkName(TEST_NETWORK_NAME) + WifiP2pConfig config = new WifiP2pConfig.Builder() + .setNetworkName(TEST_NETWORK_NAME) .setPassphrase(TEST_PASSPHRASE) .setGroupOperatingFrequency(TEST_OWNER_FREQ) .setDeviceAddress(MacAddress.fromString(TEST_DEVICE_ADDRESS)) - .enablePersistentMode(false); - WifiP2pConfig config = builder.build(); + .enablePersistentMode(false) + .build(); - assertTrue(config.deviceAddress.equals(TEST_DEVICE_ADDRESS)); - assertTrue(config.networkName.equals(TEST_NETWORK_NAME)); - assertTrue(config.passphrase.equals(TEST_PASSPHRASE)); - assertEquals(config.groupOwnerBand, TEST_OWNER_FREQ); - assertEquals(config.netId, WifiP2pGroup.TEMPORARY_NET_ID); + assertEquals(config.deviceAddress, TEST_DEVICE_ADDRESS); + assertEquals(config.getNetworkName(), TEST_NETWORK_NAME); + assertEquals(config.getPassphrase(), TEST_PASSPHRASE); + assertEquals(config.getGroupOwnerBand(), TEST_OWNER_FREQ); + assertEquals(config.getNetworkId(), WifiP2pGroup.TEMPORARY_NET_ID); } }