mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 02:54:35 +02:00
8062348: langtools tests should close file manager (group 1)
Reviewed-by: darcy
This commit is contained in:
parent
b587478f7c
commit
8bd23f1681
145 changed files with 2701 additions and 2452 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2014, 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
|
||||
|
@ -70,20 +70,21 @@ public class GetTask_DocletClassTest extends APITest {
|
|||
"pkg/C",
|
||||
"package pkg; /** " + key + "*/ public class C { }");
|
||||
DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
|
||||
StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
|
||||
File outDir = getOutDir();
|
||||
fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir));
|
||||
Iterable<? extends JavaFileObject> files = Arrays.asList(srcFile);
|
||||
DocumentationTask t = tool.getTask(null, fm, null, TestDoclet.class, null, files);
|
||||
if (t.call()) {
|
||||
System.err.println("task succeeded");
|
||||
if (TestDoclet.lastCaller.equals(String.valueOf(key)))
|
||||
System.err.println("found expected key: " + key);
|
||||
else
|
||||
error("Expected key not found");
|
||||
checkFiles(outDir, Collections.<String>emptySet());
|
||||
} else {
|
||||
throw new Exception("task failed");
|
||||
try (StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null)) {
|
||||
File outDir = getOutDir();
|
||||
fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir));
|
||||
Iterable<? extends JavaFileObject> files = Arrays.asList(srcFile);
|
||||
DocumentationTask t = tool.getTask(null, fm, null, TestDoclet.class, null, files);
|
||||
if (t.call()) {
|
||||
System.err.println("task succeeded");
|
||||
if (TestDoclet.lastCaller.equals(String.valueOf(key)))
|
||||
System.err.println("found expected key: " + key);
|
||||
else
|
||||
error("Expected key not found");
|
||||
checkFiles(outDir, Collections.<String>emptySet());
|
||||
} else {
|
||||
throw new Exception("task failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -115,20 +116,21 @@ public class GetTask_DocletClassTest extends APITest {
|
|||
public void testBadDoclet() throws Exception {
|
||||
JavaFileObject srcFile = createSimpleJavaFileObject();
|
||||
DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
|
||||
StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
|
||||
File outDir = getOutDir();
|
||||
fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir));
|
||||
Iterable<? extends JavaFileObject> files = Arrays.asList(srcFile);
|
||||
DocumentationTask t = tool.getTask(null, fm, null, BadDoclet.class, null, files);
|
||||
try {
|
||||
t.call();
|
||||
error("call completed without exception");
|
||||
} catch (RuntimeException e) {
|
||||
Throwable c = e.getCause();
|
||||
if (c.getClass() == UnexpectedError.class)
|
||||
System.err.println("exception caught as expected: " + c);
|
||||
else
|
||||
throw e;
|
||||
try (StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null)) {
|
||||
File outDir = getOutDir();
|
||||
fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir));
|
||||
Iterable<? extends JavaFileObject> files = Arrays.asList(srcFile);
|
||||
DocumentationTask t = tool.getTask(null, fm, null, BadDoclet.class, null, files);
|
||||
try {
|
||||
t.call();
|
||||
error("call completed without exception");
|
||||
} catch (RuntimeException e) {
|
||||
Throwable c = e.getCause();
|
||||
if (c.getClass() == UnexpectedError.class)
|
||||
System.err.println("exception caught as expected: " + c);
|
||||
else
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue