1 /*
   2  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
   3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4  *
   5  * This code is free software; you can redistribute it and/or modify it
   6  * under the terms of the GNU General Public License version 2 only, as
   7  * published by the Free Software Foundation.
   8  *
   9  * This code is distributed in the hope that it will be useful, but WITHOUT
  10  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12  * version 2 for more details (a copy is included in the LICENSE file that
  13  * accompanied this code).
  14  *
  15  * You should have received a copy of the GNU General Public License version
  16  * 2 along with this work; if not, write to the Free Software Foundation,
  17  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18  *
  19  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20  * or visit www.oracle.com if you need additional information or have any
  21  * questions.
  22  */
  23 
  24 /**
  25  * @test
  26  * @library /lib/testlibrary
  27  * @modules jdk.compiler
  28  * @build UpgradeModulePathTest CompilerUtils jdk.testlibrary.*
  29  * @run testng UpgradeModulePathTest
  30  * @summary Basic test for java --upgrade-module-path
  31  */
  32 
  33 import java.io.File;
  34 import java.nio.file.Path;
  35 import java.nio.file.Paths;
  36 

  37 import static jdk.testlibrary.ProcessTools.executeTestJava;
  38 
  39 import org.testng.annotations.BeforeTest;
  40 import org.testng.annotations.Test;
  41 import static org.testng.Assert.*;
  42 
  43 /**
  44  * This test upgrades module java.transaction. The upgraded module has a
  45  * dependency on module java.enterprise that is deployed on the application
  46  * modue path.
  47  */
  48 
  49 
  50 @Test
  51 public class UpgradeModulePathTest {
  52 
  53     private static final String TEST_SRC = System.getProperty("test.src");
  54     private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
  55     private static final Path MODS_DIR = Paths.get("mods");
  56     private static final Path UPGRADEDMODS_DIR = Paths.get("upgradedmods");
  57 
  58 
  59     @BeforeTest
  60     public void setup() throws Exception {
  61 
  62         // javac -d mods/java.enterprise src/java.enterprise/**
  63         boolean compiled = CompilerUtils.compile(
  64                 SRC_DIR.resolve("java.enterprise"),
  65                 MODS_DIR.resolve("java.enterprise"));
  66         assertTrue(compiled);
  67 
  68         // javac -d upgrademods/java.transaction --module-path mods src/java.transaction/**
  69         compiled = CompilerUtils.compile(

   1 /*
   2  * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
   3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4  *
   5  * This code is free software; you can redistribute it and/or modify it
   6  * under the terms of the GNU General Public License version 2 only, as
   7  * published by the Free Software Foundation.
   8  *
   9  * This code is distributed in the hope that it will be useful, but WITHOUT
  10  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12  * version 2 for more details (a copy is included in the LICENSE file that
  13  * accompanied this code).
  14  *
  15  * You should have received a copy of the GNU General Public License version
  16  * 2 along with this work; if not, write to the Free Software Foundation,
  17  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18  *
  19  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20  * or visit www.oracle.com if you need additional information or have any
  21  * questions.
  22  */
  23 
  24 /**
  25  * @test
  26  * @library /lib/testlibrary /test/lib
  27  * @modules jdk.compiler
  28  * @build UpgradeModulePathTest jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  29  * @run testng UpgradeModulePathTest
  30  * @summary Basic test for java --upgrade-module-path
  31  */
  32 
  33 import java.io.File;
  34 import java.nio.file.Path;
  35 import java.nio.file.Paths;
  36 
  37 import jdk.test.lib.compiler.CompilerUtils;
  38 import static jdk.testlibrary.ProcessTools.executeTestJava;
  39 
  40 import org.testng.annotations.BeforeTest;
  41 import org.testng.annotations.Test;
  42 import static org.testng.Assert.*;
  43 
  44 /**
  45  * This test upgrades module java.transaction. The upgraded module has a
  46  * dependency on module java.enterprise that is deployed on the application
  47  * modue path.
  48  */
  49 

  50 @Test
  51 public class UpgradeModulePathTest {
  52 
  53     private static final String TEST_SRC = System.getProperty("test.src");
  54     private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
  55     private static final Path MODS_DIR = Paths.get("mods");
  56     private static final Path UPGRADEDMODS_DIR = Paths.get("upgradedmods");
  57 
  58 
  59     @BeforeTest
  60     public void setup() throws Exception {
  61 
  62         // javac -d mods/java.enterprise src/java.enterprise/**
  63         boolean compiled = CompilerUtils.compile(
  64                 SRC_DIR.resolve("java.enterprise"),
  65                 MODS_DIR.resolve("java.enterprise"));
  66         assertTrue(compiled);
  67 
  68         // javac -d upgrademods/java.transaction --module-path mods src/java.transaction/**
  69         compiled = CompilerUtils.compile(