Update internal tests to use ConcurrentHashMap
Change-Id: I6c6896785235a9efced4dcf0246febb1a429259b
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java
index ec6f04b..71be57c 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java
@@ -17,15 +17,15 @@
import it.unimi.dsi.fastutil.ints.IntList;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
public class R8GMSCoreDeterministicTest extends GMSCoreCompilationTestBase {
private static class CompilationResult {
AndroidApp app;
- Map<String, IntList> methodProcessingIds = new HashMap<>();
+ Map<String, IntList> methodProcessingIds = new ConcurrentHashMap<>();
String proguardMap;
}
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreLatestTreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreLatestTreeShakeJarVerificationTest.java
index d9d4c20..49fb1b5 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreLatestTreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreLatestTreeShakeJarVerificationTest.java
@@ -11,9 +11,9 @@
import com.google.common.collect.ImmutableList;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
public class R8GMSCoreLatestTreeShakeJarVerificationTest
@@ -28,7 +28,7 @@
ImmutableList.of(
ToolHelper.PROGUARD_SETTINGS_FOR_INTERNAL_APPS + "GmsCore_proguard.config");
- Map<String, IntList> methodProcessingIds = new HashMap<>();
+ Map<String, IntList> methodProcessingIds = new ConcurrentHashMap<>();
AndroidApp app1 =
buildAndTreeShakeFromDeployJar(
CompilationMode.RELEASE,
@@ -46,7 +46,7 @@
ToolHelper.consumeString(proguardMap -> this.proguardMap1 = proguardMap);
});
- Map<String, IntList> otherMethodProcessingIds = new HashMap<>();
+ Map<String, IntList> otherMethodProcessingIds = new ConcurrentHashMap<>();
AndroidApp app2 =
buildAndTreeShakeFromDeployJar(
CompilationMode.RELEASE,
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
index 18d0060..a4019b0 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
@@ -14,8 +14,8 @@
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import java.io.File;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
public class R8GMSCoreV10DeployJarVerificationTest extends GMSCoreDeployJarVerificationTest {
@@ -29,7 +29,7 @@
File tempFolder = temp.newFolder();
File app1Zip = new File(tempFolder, "app1.zip");
- Map<String, IntList> methodProcessingIds = new HashMap<>();
+ Map<String, IntList> methodProcessingIds = new ConcurrentHashMap<>();
AndroidApp app1 =
buildFromDeployJar(
CompilerUnderTest.R8,
@@ -48,7 +48,7 @@
() -> new ArchiveConsumer(app1Zip.toPath(), true));
File app2Zip = new File(tempFolder, "app2.zip");
- Map<String, IntList> otherMethodProcessingIds = new HashMap<>();
+ Map<String, IntList> otherMethodProcessingIds = new ConcurrentHashMap<>();
AndroidApp app2 =
buildFromDeployJar(
CompilerUnderTest.R8,
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java
index 772b75b..1cf833c 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java
@@ -10,8 +10,8 @@
import com.android.tools.r8.utils.AndroidApp;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
public class R8GMSCoreV10TreeShakeJarVerificationTest
@@ -23,7 +23,7 @@
@Test
public void buildAndTreeShakeFromDeployJar() throws Exception {
// TODO(tamaskenez): set hasReference = true when we have the noshrink file for V10
- Map<String, IntList> methodProcessingIds = new HashMap<>();
+ Map<String, IntList> methodProcessingIds = new ConcurrentHashMap<>();
AndroidApp app1 =
buildAndTreeShakeFromDeployJar(
CompilationMode.RELEASE,
@@ -39,7 +39,7 @@
options.proguardMapConsumer =
ToolHelper.consumeString(proguardMap -> this.proguardMap1 = proguardMap);
});
- Map<String, IntList> otherMethodProcessingIds = new HashMap<>();
+ Map<String, IntList> otherMethodProcessingIds = new ConcurrentHashMap<>();
AndroidApp app2 =
buildAndTreeShakeFromDeployJar(
CompilationMode.RELEASE,
