From 1522b023d0cb083371e635312b57a8d20da27b79 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Wed, 8 Apr 2020 07:58:15 +0000 Subject: [PATCH] CTS test for DhcpInfo parcel/unparcel Bug: 139268426 Bug: 135998869 Test: atest CtsNetTestCasesLatestSdk:android.net.cts.DhcpInfoTest Change-Id: I20d9faba899c7eef026e155e329c5c3a89253209 Merged-In: I076241072688fca37b8451873183f9597bc5fe79 (cherry picked from commit 130479fb2aa2457eb590202382ed31f72cc5386e) --- .../net/src/android/net/cts/DhcpInfoTest.java | 105 +++++++++++++----- 1 file changed, 78 insertions(+), 27 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/DhcpInfoTest.java b/tests/cts/net/src/android/net/cts/DhcpInfoTest.java index 085fdd9132..b8d239272a 100644 --- a/tests/cts/net/src/android/net/cts/DhcpInfoTest.java +++ b/tests/cts/net/src/android/net/cts/DhcpInfoTest.java @@ -16,48 +16,99 @@ package android.net.cts; +import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTL; + +import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; +import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import android.annotation.Nullable; import android.net.DhcpInfo; -import android.test.AndroidTestCase; -public class DhcpInfoTest extends AndroidTestCase { +import androidx.test.runner.AndroidJUnit4; - public void testConstructor() { - new DhcpInfo(); +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.net.Inet4Address; +import java.net.InetAddress; + +@RunWith(AndroidJUnit4.class) +public class DhcpInfoTest { + private static final String STR_ADDR1 = "255.255.255.255"; + private static final String STR_ADDR2 = "127.0.0.1"; + private static final String STR_ADDR3 = "192.168.1.1"; + private static final String STR_ADDR4 = "192.168.1.0"; + private static final int LEASE_TIME = 9999; + + private int ipToInteger(String ipString) throws Exception { + return inet4AddressToIntHTL((Inet4Address) InetAddress.getByName(ipString)); } - public void testToString() { - String expectedDefault = "ipaddr 0.0.0.0 gateway 0.0.0.0 netmask 0.0.0.0 dns1 0.0.0.0 " - + "dns2 0.0.0.0 DHCP server 0.0.0.0 lease 0 seconds"; - String STR_ADDR1 = "255.255.255.255"; - String STR_ADDR2 = "127.0.0.1"; - String STR_ADDR3 = "192.168.1.1"; - String STR_ADDR4 = "192.168.1.0"; - int leaseTime = 9999; - String expected = "ipaddr " + STR_ADDR1 + " gateway " + STR_ADDR2 + " netmask " - + STR_ADDR3 + " dns1 " + STR_ADDR4 + " dns2 " + STR_ADDR4 + " DHCP server " - + STR_ADDR2 + " lease " + leaseTime + " seconds"; - - DhcpInfo dhcpInfo = new DhcpInfo(); - - // Test default string. - assertEquals(expectedDefault, dhcpInfo.toString()); - + private DhcpInfo createDhcpInfoObject() throws Exception { + final DhcpInfo dhcpInfo = new DhcpInfo(); dhcpInfo.ipAddress = ipToInteger(STR_ADDR1); dhcpInfo.gateway = ipToInteger(STR_ADDR2); dhcpInfo.netmask = ipToInteger(STR_ADDR3); dhcpInfo.dns1 = ipToInteger(STR_ADDR4); dhcpInfo.dns2 = ipToInteger(STR_ADDR4); dhcpInfo.serverAddress = ipToInteger(STR_ADDR2); - dhcpInfo.leaseDuration = leaseTime; + dhcpInfo.leaseDuration = LEASE_TIME; + return dhcpInfo; + } + @Test + public void testConstructor() { + new DhcpInfo(); + } + + @Test + public void testToString() throws Exception { + final String expectedDefault = "ipaddr 0.0.0.0 gateway 0.0.0.0 netmask 0.0.0.0 " + + "dns1 0.0.0.0 dns2 0.0.0.0 DHCP server 0.0.0.0 lease 0 seconds"; + + DhcpInfo dhcpInfo = new DhcpInfo(); + + // Test default string. + assertEquals(expectedDefault, dhcpInfo.toString()); + + dhcpInfo = createDhcpInfoObject(); + + final String expected = "ipaddr " + STR_ADDR1 + " gateway " + STR_ADDR2 + " netmask " + + STR_ADDR3 + " dns1 " + STR_ADDR4 + " dns2 " + STR_ADDR4 + " DHCP server " + + STR_ADDR2 + " lease " + LEASE_TIME + " seconds"; // Test with new values assertEquals(expected, dhcpInfo.toString()); } - private int ipToInteger(String ipString) { - String ipSegs[] = ipString.split("[.]"); - int tmp = Integer.parseInt(ipSegs[3]) << 24 | Integer.parseInt(ipSegs[2]) << 16 | - Integer.parseInt(ipSegs[1]) << 8 | Integer.parseInt(ipSegs[0]); - return tmp; + private boolean dhcpInfoEquals(@Nullable DhcpInfo left, @Nullable DhcpInfo right) { + if (left == null && right == null) return true; + + if (left == null || right == null) return false; + + return left.ipAddress == right.ipAddress + && left.gateway == right.gateway + && left.netmask == right.netmask + && left.dns1 == right.dns1 + && left.dns2 == right.dns2 + && left.serverAddress == right.serverAddress + && left.leaseDuration == right.leaseDuration; + } + + @Test + public void testParcelDhcpInfo() throws Exception { + // Cannot use assertParcelSane() here because this requires .equals() to work as + // defined, but DhcpInfo has a different legacy behavior that we cannot change. + final DhcpInfo dhcpInfo = createDhcpInfoObject(); + assertFieldCountEquals(7, DhcpInfo.class); + + final DhcpInfo dhcpInfoRoundTrip = parcelingRoundTrip(dhcpInfo); + assertTrue(dhcpInfoEquals(null, null)); + assertFalse(dhcpInfoEquals(null, dhcpInfoRoundTrip)); + assertFalse(dhcpInfoEquals(dhcpInfo, null)); + assertTrue(dhcpInfoEquals(dhcpInfo, dhcpInfoRoundTrip)); } }