test/java/lang/invoke/modules/Driver.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2017, 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.
*** 19,81 ****
   * 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.
   */
  
- import java.nio.file.Path;
- import java.nio.file.Paths;
- import java.util.Arrays;
- import java.util.List;
- 
- import static jdk.testlibrary.ProcessTools.executeTestJava;
- 
- import org.testng.annotations.BeforeTest;
- import org.testng.annotations.Test;
- import static org.testng.Assert.*;
- 
  /**
   * @test
!  * @library /lib/testlibrary
!  * @modules jdk.compiler
!  * @build CompilerUtils jdk.testlibrary.*
!  * @run testng ModuleAccessControlTest
!  * @summary Driver for testing module access checking by MethodHandles.Lookup
!  */
! 
! public class ModuleAccessControlTest {
! 
!     private static final String TEST_SRC = System.getProperty("test.src");
! 
!     private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
!     private static final Path MODS_DIR = Paths.get("mods");
! 
!     // the names of the modules in this test
!     private static List<String> modules = Arrays.asList("m1", "m2");
! 
! 
!     /**
!      * Compiles all modules used by the test
       */
-     @BeforeTest
-     public void compileAll() throws Exception {
-         for (String mn : modules) {
-             Path msrc = SRC_DIR.resolve(mn);
-             assertTrue(CompilerUtils
-                 .compile(msrc, MODS_DIR, "--module-source-path", SRC_DIR.toString()));
-         }
-     }
- 
-     /**
-      * Launch the test
-      */
-     @Test
-     public void runTest() throws Exception {
-         int exitValue = executeTestJava("--module-path", MODS_DIR.toString(),
-                                         "-m", "m1/p1.Main")
-                 .outputTo(System.out)
-                 .errorTo(System.out)
-                 .getExitValue();
- 
-         assertTrue(exitValue == 0);
-     }
- 
- }
--- 19,29 ----
   * 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
!  * @build m1/* m2/* Unnamed
!  * @run testng/othervm m1/p1.Main
!  * @summary Basic test case for module access checks and Lookup.in.
   */