test/tools/pack200/InstructionTests.java

*** 24,38 ****
  import java.nio.charset.Charset;
  import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  import static java.nio.file.StandardOpenOption.*;
- import java.util.regex.Pattern;
  
  /*
   * @test
!  * @bug 8003549
   * @summary tests class files instruction formats introduced in JSR-335
   * @compile -XDignore.symbol.file Utils.java InstructionTests.java
   * @run main InstructionTests
   * @author ksrini
   */
--- 24,37 ----
  import java.nio.charset.Charset;
  import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  import static java.nio.file.StandardOpenOption.*;
  
  /*
   * @test
!  * @bug 8003549 8007297
   * @summary tests class files instruction formats introduced in JSR-335
   * @compile -XDignore.symbol.file Utils.java InstructionTests.java
   * @run main InstructionTests
   * @author ksrini
   */
*** 46,99 ****
       */
      static void testInvokeOpCodes() throws Exception {
          List<String> scratch = new ArrayList<>();
          final String fname = "A";
          String javaFileName = fname + Utils.JAVA_FILE_EXT;
!         scratch.add("interface IntIterator {");
          scratch.add("    default void forEach(){}");
          scratch.add("    static void next() {}");
          scratch.add("}");
!         scratch.add("class A implements IntIterator {");
!         scratch.add("public void forEach(Object o){");
!         scratch.add("IntIterator.super.forEach();");
!         scratch.add("IntIterator.next();");
          scratch.add("}");
-         scratch.add("}");
          File cwd = new File(".");
          File javaFile = new File(cwd, javaFileName);
          Files.write(javaFile.toPath(), scratch, Charset.defaultCharset(),
                  CREATE, TRUNCATE_EXISTING);
  
!         // make sure we have -g so that we  compare LVT and LNT entries
          Utils.compiler("-g", javaFile.getName());
  
          // jar the file up
          File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
          Utils.jar("cvf", testjarFile.getName(), ".");
  
!         // pack using --repack
!         File outjarFile = new File(cwd, "out" + Utils.JAR_FILE_EXT);
!         scratch.clear();
!         scratch.add(Utils.getPack200Cmd());
!         scratch.add("-J-ea");
!         scratch.add("-J-esa");
!         scratch.add("--repack");
!         scratch.add(outjarFile.getName());
!         scratch.add(testjarFile.getName());
!         List<String> output = Utils.runExec(scratch);
!         // TODO remove this when we get bc escapes working correctly
!         // this test anyhow would  fail  at that time
!         findString("WARNING: Passing.*" + fname + Utils.CLASS_FILE_EXT,
!                         output);
! 
!         Utils.doCompareVerify(testjarFile, outjarFile);
      }
- 
-     static boolean findString(String str, List<String> list) {
-         Pattern p = Pattern.compile(str);
-         for (String x : list) {
-             if (p.matcher(x).matches())
-                 return true;
-         }
-         throw new RuntimeException("Error: " + str + " not found in output");
-     }
  }
--- 45,80 ----
       */
      static void testInvokeOpCodes() throws Exception {
          List<String> scratch = new ArrayList<>();
          final String fname = "A";
          String javaFileName = fname + Utils.JAVA_FILE_EXT;
!         scratch.add("interface I {");
          scratch.add("    default void forEach(){}");
          scratch.add("    static void next() {}");
          scratch.add("}");
!         scratch.add("class A implements I {");
!         scratch.add("    public void forEach(Object o){");
!         scratch.add("        I.super.forEach();");
!         scratch.add("        I.next();");
!         scratch.add("    }");
          scratch.add("}");
          File cwd = new File(".");
          File javaFile = new File(cwd, javaFileName);
          Files.write(javaFile.toPath(), scratch, Charset.defaultCharset(),
                  CREATE, TRUNCATE_EXISTING);
  
!         // -g to compare LVT and LNT entries
          Utils.compiler("-g", javaFile.getName());
  
+         File propsFile = new File("pack.props");
+         scratch.clear();
+         scratch.add("com.sun.java.util.jar.pack.class.format.error=error");
+         scratch.add("pack.unknown.attribute=error");
+         Files.write(propsFile.toPath(), scratch, Charset.defaultCharset(),
+                 CREATE, TRUNCATE_EXISTING);
          // jar the file up
          File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
          Utils.jar("cvf", testjarFile.getName(), ".");
  
!         Utils.testWithRepack(testjarFile, "--config-file=" + propsFile.getName());
      }
  }