changeset 13109:d270fa9dc2c4

Update failing runtime/modules tests
author alanb
date Thu, 26 Jan 2017 14:41:35 +0000
parents 68e5712046cb
children 4bcc8b0ec8c1
files test/runtime/modules/IgnoreModulePropertiesTest.java test/runtime/modules/ModuleOptionsTest.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/runtime/modules/IgnoreModulePropertiesTest.java	Fri Jan 20 11:38:21 2017 +0000
+++ b/test/runtime/modules/IgnoreModulePropertiesTest.java	Thu Jan 26 14:41:35 2017 +0000
@@ -67,8 +67,8 @@
     }
 
     public static void main(String[] args) throws Exception {
-        testOption("--add-modules", "java.sqlx", "jdk.module.addmods.0", "java.lang.module.ResolutionException");
-        testOption("--limit-modules", "java.sqlx", "jdk.module.limitmods", "java.lang.module.ResolutionException");
+        testOption("--add-modules", "java.sqlx", "jdk.module.addmods.0", "java.lang.module.FindException");
+        testOption("--limit-modules", "java.sqlx", "jdk.module.limitmods", "java.lang.module.FindException");
         testOption("--add-reads", "xyzz=yyzd", "jdk.module.addreads.0", "WARNING: Unknown module: xyzz");
         testOption("--add-exports", "java.base/xyzz=yyzd", "jdk.module.addexports.0",
                    "WARNING: package xyzz not in java.base");
--- a/test/runtime/modules/ModuleOptionsTest.java	Fri Jan 20 11:38:21 2017 +0000
+++ b/test/runtime/modules/ModuleOptionsTest.java	Thu Jan 26 14:41:35 2017 +0000
@@ -43,7 +43,7 @@
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             "--add-modules=i_dont_exist", "--add-modules=java.base", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldContain("ResolutionException");
+        output.shouldContain("FindException");
         output.shouldContain("i_dont_exist");
         output.shouldHaveExitValue(1);