archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8044411: Implement classfile tests for RuntimeAnnotations and RuntimeParameterAnnotations attribute

Browse source 
Reviewed-by: jjg, shurailine, anazarov
This commit is contained in:
Andrei Eremeev 2015-07-10 12:42:00 +03:00
parent 7c256783a5
commit a7cf8786ff
19 changed files with 2651 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

86
langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java
View file

@ -24,18 +24,16 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.*;
import java.util.stream.Collectors;
/**
* This class accumulates test results. Test results can be checked with method @{code checkStatus}.
*/
public class TestResult extends TestBase {
private final List<Info> testCases;
private final List<Info> testCasesInfo;
public TestResult() {
testCases = new ArrayList<>();
testCases.add(new Info("Global test info"));
testCasesInfo = new ArrayList<>();
}
/**
@ -44,21 +42,16 @@ public class TestResult extends TestBase {
* @param info the information about test case
*/
public void addTestCase(String info) {
testCases.add(new Info(info));
}
private String errorMessage() {
return testCases.stream().filter(Info::isFailed)
.map(tc -> String.format("Failure in test case:\n%s\n%s", tc.info(), tc.getMessage()))
.collect(Collectors.joining("\n"));
System.err.println("Test case: " + info);
testCasesInfo.add(new Info(info));
}
public boolean checkEquals(Object actual, Object expected, String message) {
echo("Testing : " + message);
if (!Objects.equals(actual, expected)) {
getLastTestCase().addAssert(String.format("%s\n" +
"Expected: %s,\n" +
" Got: %s", message, expected, actual));
"Expected: %s,\n" +
" Got: %s", message, expected, actual));
return false;
}
return true;
@ -96,14 +89,17 @@ public class TestResult extends TestBase {
}
public void addFailure(Throwable th) {
testCases.get(testCases.size() - 1).addFailure(th);
if (testCasesInfo.isEmpty()) {
testCasesInfo.add(new Info("Dummy info"));
}
getLastTestCase().addFailure(th);
}
private Info getLastTestCase() {
if (testCases.size() == 1) {
if (testCasesInfo.isEmpty()) {
throw new IllegalStateException("Test case should be created");
}
return testCases.get(testCases.size() - 1);
return testCasesInfo.get(testCasesInfo.size() - 1);
}
/**
@ -114,22 +110,41 @@ public class TestResult extends TestBase {
* or an exception occurs
*/
public void checkStatus() throws TestFailedException {
if (testCases.stream().anyMatch(Info::isFailed)) {
echo(errorMessage());
int passed = 0;
int failed = 0;
for (Info testCaseInfo : testCasesInfo) {
if (testCaseInfo.isFailed()) {
String info = testCaseInfo.info().replace("\n", LINE_SEPARATOR);
String errorMessage = testCaseInfo.getMessage().replace("\n", LINE_SEPARATOR);
System.err.printf("Failure in test case:%n%s%n%s%n", info, errorMessage);
++failed;
} else {
++passed;
}
}
System.err.printf("Test cases: passed: %d, failed: %d, total: %d.%n", passed, failed, passed + failed);
if (failed > 0) {
throw new TestFailedException("Test failed");
}
if (passed + failed == 0) {
throw new TestFailedException("Test cases were not found");
}
}
private class Info {
@Override
public void printf(String template, Object... args) {
getLastTestCase().printf(template, args);
}
private static class Info {
private final String info;
private final List<String> asserts;
private final List<Throwable> errors;
private final StringWriter writer;
private boolean isFailed;
private Info(String info) {
this.info = info;
asserts = new ArrayList<>();
errors = new ArrayList<>();
writer = new StringWriter();
}
public String info() {
@ -137,34 +152,25 @@ public class TestResult extends TestBase {
}
public boolean isFailed() {
return !asserts.isEmpty() || !errors.isEmpty();
return isFailed;
}
public void printf(String template, Object... args) {
writer.write(String.format(template, args));
}
public void addFailure(Throwable th) {
errors.add(th);
isFailed = true;
printf("[ERROR] : %s\n", getStackTrace(th));
}
public void addAssert(String e) {
asserts.add(e);
isFailed = true;
printf("[ASSERT] : %s\n", e);
}
public String getMessage() {
return (asserts.size() > 0 ? getAssertMessages(asserts) + "\n" : "")
+ getErrorMessages(errors);
}
public String getAssertMessages(List<String> list) {
return list.stream()
.map(message -> String.format("[ASSERT] : %s", message))
.collect(Collectors.joining("\n"));
}
public String getErrorMessages(List<? extends Throwable> list) {
return list.stream()
.map(throwable -> String.format("[ERROR] : %s", getStackTrace(throwable)))
.collect(Collectors.joining("\n"));
return writer.toString();
}
public String getStackTrace(Throwable throwable) {