Merge changes I2ddfef0c,I49bee0c9 am: 1feafc2e2a

am: ae62bfc346

Change-Id: I552730badc910df5f5a48c2ded6566071b604783
This commit is contained in:
Chalard Jean
2019-01-21 11:18:35 -08:00
committed by android-build-merger

View File

@@ -27,6 +27,7 @@ import android.support.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.lang.reflect.Modifier;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.Arrays; import java.util.Arrays;
@@ -60,6 +61,12 @@ public class ParcelableTests {
builder.setMtu(null); builder.setMtu(null);
in = builder.build(); in = builder.build();
assertEquals(in, new NetworkAttributes(parcelingRoundTrip(in.toParcelable()))); assertEquals(in, new NetworkAttributes(parcelingRoundTrip(in.toParcelable())));
// Verify that this test does not miss any new field added later.
// If any field is added to NetworkAttributes it must be tested here for parceling
// roundtrip.
assertEquals(4, Arrays.stream(NetworkAttributes.class.getDeclaredFields())
.filter(f -> !Modifier.isStatic(f.getModifiers())).count());
} }
@Test @Test