archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8172288: Fix Jigsaw related module/package error messages and throw correct exceptions

Browse source 
Reword error messages and throw IllegalStateExceptions where appropriate

Reviewed-by: alanb, acorn, lfoltan, gtriantafill
This commit is contained in:
Harold Seigel 2017-01-13 07:19:03 -05:00
parent 235f29814a
commit c95329970d
3 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hotspot/test/runtime/modules/JVMDefineModule.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* 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
@ -127,27 +127,27 @@ public class JVMDefineModule {
}
}
// Duplicate module name, expect an IAE
m = ModuleHelper.ModuleObject("module.name", cl, new String[] { "mypackage6" });
// Duplicate module name, expect an ISE
m = ModuleHelper.ModuleObject("Module_A", cl, new String[] { "mypackage6" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage6" });
try {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage6a" });
throw new RuntimeException("Failed to get IAE for duplicate module");
} catch(IllegalArgumentException e) {
if (!e.getMessage().contains("Module module.name is already defined")) {
throw new RuntimeException("Failed to get expected IAE message for duplicate module: " + e.getMessage());
throw new RuntimeException("Failed to get ISE for duplicate module");
} catch(IllegalStateException e) {
if (!e.getMessage().contains("Module Module_A is already defined")) {
throw new RuntimeException("Failed to get expected ISE message for duplicate module: " + e.getMessage());
}
}
// Package is already defined for class loader, expect an IAE
// Package is already defined for class loader, expect an ISE
m = ModuleHelper.ModuleObject("dupl.pkg.module", cl, new String[] { "mypackage6b" });
try {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage6" });
throw new RuntimeException("Failed to get IAE for existing package");
} catch(IllegalArgumentException e) {
if (!e.getMessage().contains("Package mypackage6 for module dupl.pkg.module already exists for class loader")) {
throw new RuntimeException("Failed to get expected IAE message for duplicate package: " + e.getMessage());
throw new RuntimeException("Failed to get ISE for existing package");
} catch(IllegalStateException e) {
if (!e.getMessage().contains("Package mypackage6 for module dupl.pkg.module is already in another module, Module_A, defined to the class loader")) {
throw new RuntimeException("Failed to get expected ISE message for duplicate package: " + e.getMessage());
}
}