Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used #9049

Closed
wants to merge 8 commits into from
Closed

8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used #9049

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd25d8a
8287760: Keep do-not-resolve-by-default flag
Thihup Jun 7, 2022
2acbedb
Fix copyright year
Thihup Jun 7, 2022
c4a719e
Add tests
Thihup Jun 8, 2022
c88bc75
Fix test message
Thihup Jun 8, 2022
7362da9
Simplify test names
Thihup Jun 8, 2022
8544abd
Update author
Thihup Jun 9, 2022
962f0ec
Fix copyright year
Thihup Jun 10, 2022
d566ebc
Rename dataprovider
Thihup Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/jdk/tools/jar/modularJar/Basic.java
View file
Open in desktop
Expand Up @@ -947,8 +947,8 @@ public void updateFooModuleVersion() throws IOException {
}
}

@DataProvider(name = "resolutionNames")
public Object[][] resolutionNames() {
@DataProvider(name = "resolutionWarnings")
public Object[][] resolutionWarnings() {
return new Object[][] {
{"incubating", (Predicate<ModuleResolution>) ModuleResolution::hasIncubatingWarning},
{"deprecated", (Predicate<ModuleResolution>) ModuleResolution::hasDeprecatedWarning},
Expand All @@ -961,7 +961,7 @@ public Object[][] resolutionNames() {
* Validate that you can create a jar only specifying --warn-if-resolved
* @throws IOException
*/
@Test(dataProvider = "resolutionNames")
@Test(dataProvider = "resolutionWarnings")
public void shouldAddWarnIfResolved(String resolutionName,
Predicate<ModuleResolution> hasWarning) throws IOException {
Path mp = Paths.get("moduleWarnIfResolved-" + resolutionName);
Expand Down Expand Up @@ -1019,7 +1019,7 @@ public void shouldAddDoNotResolveByDefault() throws IOException {
* --do-not-resolve-by-default
* @throws IOException
*/
@Test(dataProvider = "resolutionNames")
@Test(dataProvider = "resolutionWarnings")
public void shouldAddWarnIfResolvedAndDoNotResolveByDefault(String resolutionName,
Predicate<ModuleResolution> hasWarning) throws IOException {
Path mp = Paths.get("moduleResolutionWarnThenNotResolve-" + resolutionName);
Expand Down Expand Up @@ -1051,7 +1051,7 @@ public void shouldAddWarnIfResolvedAndDoNotResolveByDefault(String resolutionNam
* --warn-if-resolved
* @throws IOException
*/
@Test(dataProvider = "resolutionNames")
@Test(dataProvider = "resolutionWarnings")
public void shouldAddResolutionDoNotResolveByDefaultAndWarnIfResolved(String resolutionName,
Predicate<ModuleResolution> hasWarning) throws IOException {
Path mp = Paths.get("moduleResolutionNotResolveThenWarn-" + resolutionName);
Expand Down