test/tools/pack200/ModuleAttributes.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 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.
*** 37,76 ****
      public static void main(String... args) throws Exception {
          new ModuleAttributes().run();
      }
  
      public void run() throws Exception {
!         File file = createModuleJar();
          Utils.testWithRepack(file,
                  "--effort=1",
                  "--unknown-attribute=error");
      }
- 
-     File createModuleJar() throws IOException {
-         File libDir = new File(Utils.JavaHome, "lib");
-         File modules = new File(libDir, "modules");
-         File outDir = new File("out");
- 
-         List<String> cmdList = new ArrayList<>();
-         cmdList.add(Utils.getJimageCmd());
-         cmdList.add("extract");
-         cmdList.add(modules.getAbsolutePath());
-         cmdList.add("--dir");
-         cmdList.add(outDir.getName());
-         Utils.runExec(cmdList);
- 
-         FileFilter filter = (File file) -> file.getName().equals("module-info.class");
-         List<File> mfiles = Utils.findFiles(outDir, filter);
- 
-         List<String> contents = new ArrayList<>(mfiles.size());
-         mfiles.stream().forEach((f) -> {
-             contents.add(f.getAbsolutePath());
-         });
- 
-         File listFile = new File("mfiles.list");
-         Utils.createFile(listFile, contents);
-         File testFile = new File("test.jar");
-         Utils.jar("cvf", testFile.getName(), "@" + listFile.getName());
-         Utils.recursiveDelete(outDir);
-         return testFile;
-     }
  }
--- 37,48 ----
      public static void main(String... args) throws Exception {
          new ModuleAttributes().run();
      }
  
      public void run() throws Exception {
!         File file = Utils.createRtJar(".*module-info\\.class");
          Utils.testWithRepack(file,
                  "--effort=1",
                  "--unknown-attribute=error");
+         Utils.cleanup();
      }
  }