test/jdk/com/sun/tools/jextract/JextractToolRunner.java

@@ -44,16 +44,17 @@
 import static org.testng.Assert.fail;
 
 public class JextractToolRunner {
     // utilities to avoid hard-coding generated class, interface names everywhere
     public static String headerInterfaceName(String filename) {
-        int ext = filename.lastIndexOf('.');
-        return ext != -1 ? filename.substring(0, ext) : filename;
+        return staticForwarderName(filename) + "_";
     }
 
     public static String staticForwarderName(String filename) {
-        return headerInterfaceName(filename) + "_h";
+        int ext = filename.lastIndexOf('.');
+        String name = ext != -1 ? filename.substring(0, ext) : filename;
+        return name + "_h";
     }
 
     // struct, enum and callback interfaces are nested types of header interface
     public static String structInterfaceName(String headerFileName, String structName) {
         return headerInterfaceName(headerFileName) + "$" + structName;