Bug 536978 - Test fix slightly modified
Change-Id: I462a78fa1f75efd96760db5a36b69ba21e2c5610
Signed-off-by: Stephan Herrmann <stephan.herrmann@berlin.de>
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
index bd19e8a..ce7b60c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
@@ -14417,7 +14417,7 @@
" }\n" +
" \n" +
" public static void main(String... args) {\n" +
- " AbstractDemo<OtherResult,OtherResult> demo = new SimpleDemo<>();\n" +
+ " AbstractDemo<OtherResult,OtherResult> demo = new SimpleDemo<OtherResult,OtherResult>();\n" +
" OtherResult result = demo.test(new OtherResult());\n" +
" }\n" +
"\n" +
@@ -14428,20 +14428,9 @@
" protected SimpleResult test(AbstractResult request) {\n" +
" ^^^^^^^^^^^^\n" +
"The return type is incompatible with AbstractDemo<Request,Response>.test(Request)\n" +
- "----------\n" +
- (this.complianceLevel < ClassFileConstants.JDK1_7
- ? "2. ERROR in SimpleDemo.java (at line 27)\n" +
- " AbstractDemo<OtherResult,OtherResult> demo = new SimpleDemo<>();\n" +
- " ^^^^^^^^^^\n" +
- "'<>' operator is not allowed for source level below 1.7\n" +
- "----------\n"
- : ""
- ));
+ "----------\n");
}
public void testBug536978_comment5() {
- if(this.complianceLevel < ClassFileConstants.JDK1_7) {
- return;
- }
runConformTest(
new String[] {
"SimpleDemo.java",
@@ -14474,7 +14463,7 @@
" }\n" +
"\n" +
" public static void main(String... args) {\n" +
- " AbstractDemo<OtherResult, OtherResult> demo = new SimpleDemo<>();\n" +
+ " AbstractDemo<OtherResult, OtherResult> demo = new SimpleDemo<OtherResult, OtherResult>();\n" +
" try {\n" +
" OtherResult result = demo.test(new OtherResult());\n" +
" } catch (ClassCastException e) {\n" +
