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

*** 42,59 ****
  import static org.testng.Assert.assertNotNull;
  import static org.testng.Assert.assertTrue;
  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;
      }
  
      public static String staticForwarderName(String filename) {
!         return headerInterfaceName(filename) + "_h";
      }
  
      // struct, enum and callback interfaces are nested types of header interface
      public static String structInterfaceName(String headerFileName, String structName) {
          return headerInterfaceName(headerFileName) + "$" + structName;
--- 42,63 ----
  import static org.testng.Assert.assertNotNull;
  import static org.testng.Assert.assertTrue;
  import static org.testng.Assert.fail;
  
  public class JextractToolRunner {
!     private static String safeFileName(String filename) {
          int ext = filename.lastIndexOf('.');
          return ext != -1 ? filename.substring(0, ext) : filename;
      }
  
+     // utilities to avoid hard-coding generated class, interface names everywhere
+     public static String headerInterfaceName(String filename) {
+         return safeFileName(filename) + "_h";
+     }
+ 
      public static String staticForwarderName(String filename) {
!         return safeFileName(filename) + "_lib";
      }
  
      // struct, enum and callback interfaces are nested types of header interface
      public static String structInterfaceName(String headerFileName, String structName) {
          return headerInterfaceName(headerFileName) + "$" + structName;