Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R"

This commit is contained in:
Treehugger Robot
2021-01-19 04:45:08 +00:00
committed by Gerrit Code Review

View File

@@ -58,7 +58,8 @@ class CaptivePortalDataTest {
@Test @Test
fun testParcelUnparcel() { fun testParcelUnparcel() {
assertParcelSane(data, fieldCount = 8) val fieldCount = if (SdkLevel.isAtLeastS()) 8 else 7
assertParcelSane(data, fieldCount)
assertParcelingIsLossless(makeBuilder().setUserPortalUrl(null).build()) assertParcelingIsLossless(makeBuilder().setUserPortalUrl(null).build())
assertParcelingIsLossless(makeBuilder().setVenueInfoUrl(null).build()) assertParcelingIsLossless(makeBuilder().setVenueInfoUrl(null).build())