commit 3d2d28eac5d0ef11ba8d598a8e7340586ca41be0
author Chalard Jean <jchalard@google.com> Thu May 28 04:29:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 28 04:29:24 2020 +0000
tree 3ff38f38474bbc925da8c06a25feeeceaf7f5a47
parent f67675fb765a5c464bf3fea7780c9dbeb37a8fe7
parent f1b160063749eb0eaae258f0288897f8befe15d3

Merge "Adjust tests for renaming groupHint to cluster." am: f1b1600637

Change-Id: I65d0298b17b60c9b4266766bf74928bf967c8b60

tests/net/java/android/net/IpMemoryStoreTest.java

diff --git a/tests/net/java/android/net/IpMemoryStoreTest.java b/tests/net/java/android/net/IpMemoryStoreTest.java
index 442ac56..0b13800 100644
--- a/tests/net/java/android/net/IpMemoryStoreTest.java
+++ b/tests/net/java/android/net/IpMemoryStoreTest.java
@@ -105,7 +105,7 @@
 
     private static NetworkAttributes buildTestNetworkAttributes(String hint, int mtu) {
         return new NetworkAttributes.Builder()
-                .setGroupHint(hint)
+                .setCluster(hint)
                 .setMtu(mtu)
                 .build();
     }

tests/net/java/android/net/ipmemorystore/ParcelableTests.java

diff --git a/tests/net/java/android/net/ipmemorystore/ParcelableTests.java b/tests/net/java/android/net/ipmemorystore/ParcelableTests.java
index 1a3ea60..02f5286 100644
--- a/tests/net/java/android/net/ipmemorystore/ParcelableTests.java
+++ b/tests/net/java/android/net/ipmemorystore/ParcelableTests.java
@@ -54,7 +54,7 @@
 
         builder.setAssignedV4Address((Inet4Address) Inet4Address.getByName("6.7.8.9"));
         builder.setAssignedV4AddressExpiry(System.currentTimeMillis() + 3_600_000);
-        builder.setGroupHint("groupHint");
+        builder.setCluster("groupHint");
         builder.setDnsAddresses(Arrays.asList(
                 InetAddress.getByName("ACA1:652B:0911:DE8F:1200:115E:913B:AA2A"),
                 InetAddress.getByName("6.7.8.9")));