diff options
author | Andrey Loskutov | 2018-07-29 08:01:30 +0000 |
---|---|---|
committer | Andrey Loskutov | 2018-07-29 08:01:30 +0000 |
commit | 252d0c96426a423b4a37ffdf335a15471d2cea6a (patch) | |
tree | 5b28d9fdafc65defb43c1f0aeacba46f20d87c70 | |
parent | 63684dd8b01031f0dc2d269a59c59d3b22725f4a (diff) | |
download | eclipse.jdt.core-252d0c96426a423b4a37ffdf335a15471d2cea6a.tar.gz eclipse.jdt.core-252d0c96426a423b4a37ffdf335a15471d2cea6a.tar.xz eclipse.jdt.core-252d0c96426a423b4a37ffdf335a15471d2cea6a.zip |
Bug 536978 - fixed test failuresI20180729-0800
Change-Id: I0963f70e5d7b2b86a81ece409a109002cf8f6db4
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r-- | org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java | 13 |
1 files changed, 12 insertions, 1 deletions
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 9f1c42e76f..bd19e8a1c7 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 @@ -14428,9 +14428,20 @@ public void testBug536978_comment2() { " protected SimpleResult test(AbstractResult request) {\n" + " ^^^^^^^^^^^^\n" + "The return type is incompatible with AbstractDemo<Request,Response>.test(Request)\n" + - "----------\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" + : "" + )); } public void testBug536978_comment5() { + if(this.complianceLevel < ClassFileConstants.JDK1_7) { + return; + } runConformTest( new String[] { "SimpleDemo.java", |