changeset 11340:a06e21196366

Merge
author amurillo
date Thu, 26 May 2016 14:24:50 -0700
parents 887c48801f76 a85af5663523
children 86811737fdac
files
diffstat 28 files changed, 121 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed May 25 23:45:17 2016 +0200
+++ b/.hgtags	Thu May 26 14:24:50 2016 -0700
@@ -522,3 +522,4 @@
 88170d3642905b9e6cac03e8efcc976885a7e6da jdk-9+117
 9b1075cac08dc836ec32e7b368415cbe3aceaf8c jdk-9+118
 15f3fe264872766bcb205696198f0c1502420e17 jdk-9+119
+0be6f4f5d18671184e62583668cb1d783dffa128 jdk-9+120
--- a/test/Makefile	Wed May 25 23:45:17 2016 +0200
+++ b/test/Makefile	Thu May 26 14:24:50 2016 -0700
@@ -306,7 +306,10 @@
 endif
 
 ifdef CONCURRENCY
-  EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
+  JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
+endif
+ifdef EXTRA_JTREG_OPTIONS
+  JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 endif
 
 # Default JTREG to run
@@ -326,8 +329,6 @@
 # Multiply by 4 the timeout factor
 JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
-# Add any extra options
-JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 # Set other vm and test options
 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/native/GTestWrapper.java	Thu May 26 14:24:50 2016 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/* @test
+ * @summary a jtreg wrapper for gtest tests
+ * @library /test/lib/share/classes
+ * @modules java.base/jdk.internal.misc
+ * @run main/native GTestWrapper
+ */
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
+
+import java.nio.file.Paths;
+import java.nio.file.Path;
+
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class GTestWrapper {
+    public static void main(String[] args) throws Throwable {
+        // gtestLauncher is located in <test_image>/hotspot/gtest/<vm_variant>/
+        // nativePath points either to <test_image>/hotspot/jtreg/native or to <test_image>/hotspot/gtest
+        Path nativePath = Paths.get(System.getProperty("test.nativepath"));
+        String jvmVariantDir = getJVMVariantSubDir();
+        // let's assume it's <test_image>/hotspot/gtest
+        Path path = nativePath.resolve(jvmVariantDir);
+        if (!path.toFile().exists()) {
+            // maybe it is <test_image>/hotspot/jtreg/native
+            path = nativePath.getParent()
+                             .getParent()
+                             .resolve("gtest")
+                             .resolve(jvmVariantDir);
+        }
+        if (!path.toFile().exists()) {
+            throw new Error("TESTBUG: the library has not been found in " + nativePath);
+        }
+        path = path.resolve("gtestLauncher" + (Platform.isWindows() ? ".exe" : ""));
+        Stream<String> launcherArgs = Stream.of(path.toString(), "-jdk",
+                System.getProperty("test.jdk"));
+        // JVM accepts only -X and -D flags
+        Stream<String> vmFLags = Arrays.stream(Utils.getTestJavaOpts())
+                                       .filter(s -> s.startsWith("-X") || s.startsWith("-D"));
+        String[] cmds = Stream.concat(launcherArgs, vmFLags)
+                              .toArray(String[]::new);
+        ProcessTools.executeCommand(cmds).shouldHaveExitValue(0);
+    }
+
+    private static String getJVMVariantSubDir() {
+        if (Platform.isServer()) {
+            return "server";
+        } else if (Platform.isClient()) {
+            return "client";
+        } else if (Platform.isMinimal()) {
+            return "minimal";
+        } else {
+            throw new Error("TESTBUG: unsuppported vm variant");
+        }
+    }
+}
--- a/test/runtime/modules/AccessCheck/CheckRead.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/CheckRead.java	Thu May 26 14:24:50 2016 -0700
@@ -103,7 +103,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java	Thu May 26 14:24:50 2016 -0700
@@ -103,7 +103,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java	Thu May 26 14:24:50 2016 -0700
@@ -105,7 +105,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java	Thu May 26 14:24:50 2016 -0700
@@ -91,7 +91,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java	Thu May 26 14:24:50 2016 -0700
@@ -92,7 +92,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java	Thu May 26 14:24:50 2016 -0700
@@ -91,7 +91,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/DiffCL_Umod.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_Umod.java	Thu May 26 14:24:50 2016 -0700
@@ -92,7 +92,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MyDiffClassLoader.loader1 = new MyDiffClassLoader();
      MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@@ -141,7 +141,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MyDiffClassLoader.loader1 = new MyDiffClassLoader();
      MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@@ -190,7 +190,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MyDiffClassLoader.loader1 = new MyDiffClassLoader();
      MyDiffClassLoader.loader2 = new MyDiffClassLoader();
--- a/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java	Thu May 26 14:24:50 2016 -0700
@@ -87,7 +87,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MyDiffClassLoader.loader1 = new MyDiffClassLoader();
      MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@@ -136,7 +136,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MyDiffClassLoader.loader1 = new MyDiffClassLoader();
      MyDiffClassLoader.loader2 = new MyDiffClassLoader();
--- a/test/runtime/modules/AccessCheck/ExpQualOther.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/ExpQualOther.java	Thu May 26 14:24:50 2016 -0700
@@ -105,7 +105,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/ExpQualToM1.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/ExpQualToM1.java	Thu May 26 14:24:50 2016 -0700
@@ -81,7 +81,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to the same class loader for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/ExpUnqual.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/ExpUnqual.java	Thu May 26 14:24:50 2016 -0700
@@ -81,7 +81,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to the same class loader for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/ExportAllUnnamed.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/ExportAllUnnamed.java	Thu May 26 14:24:50 2016 -0700
@@ -93,7 +93,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/PkgNotExp.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/PkgNotExp.java	Thu May 26 14:24:50 2016 -0700
@@ -91,7 +91,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to the same class loader for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/Umod.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/Umod.java	Thu May 26 14:24:50 2016 -0700
@@ -92,7 +92,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      // map module m1 to class loader.
      // class c2 will be loaded in an unnamed module/loader.
@@ -138,7 +138,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MySameClassLoader loader = new MySameClassLoader();
      // map module m1 to class loader.
@@ -184,7 +184,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MySameClassLoader loader = new MySameClassLoader();
      // map module m1 to class loader.
--- a/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java	Thu May 26 14:24:50 2016 -0700
@@ -92,7 +92,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java	Thu May 26 14:24:50 2016 -0700
@@ -92,7 +92,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java	Thu May 26 14:24:50 2016 -0700
@@ -91,7 +91,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/UmodUPkg.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodUPkg.java	Thu May 26 14:24:50 2016 -0700
@@ -87,7 +87,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      // map module m1 to class loader.
      // class c4 will be loaded in an unnamed module/loader.
@@ -133,7 +133,7 @@
      // Resolves "m1"
      Configuration cf = Layer.boot()
              .configuration()
-             .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+             .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
      MySameClassLoader loader = new MySameClassLoader();
      // map module m1 to class loader.
--- a/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java	Thu May 26 14:24:50 2016 -0700
@@ -92,7 +92,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java	Thu May 26 14:24:50 2016 -0700
@@ -91,7 +91,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java	Thu May 26 14:24:50 2016 -0700
@@ -101,7 +101,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java	Thu May 26 14:24:50 2016 -0700
@@ -89,7 +89,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to the same class loader for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java	Thu May 26 14:24:50 2016 -0700
@@ -101,7 +101,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java	Thu May 26 14:24:50 2016 -0700
@@ -91,7 +91,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to differing class loaders for this test
         Map<String, ClassLoader> map = new HashMap<>();
--- a/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java	Wed May 25 23:45:17 2016 +0200
+++ b/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java	Thu May 26 14:24:50 2016 -0700
@@ -89,7 +89,7 @@
         // Resolves "m1"
         Configuration cf = Layer.boot()
                 .configuration()
-                .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+                .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
 
         // map each module to the same class loader for this test
         Map<String, ClassLoader> map = new HashMap<>();