diff options
author | Stephan Herrmann | 2018-05-15 18:58:23 +0000 |
---|---|---|
committer | Stephan Herrmann | 2018-05-15 18:58:23 +0000 |
commit | 5efa719f1dc41994a85b6f91af4c728567cf5fb3 (patch) | |
tree | cc2e501e6ebc743ab6effc9d5d3c6332caa87181 | |
parent | 0a09d8b86ece9ff5f47edf424bbce73ff19998d8 (diff) | |
download | org.eclipse.objectteams-5efa719f1dc41994a85b6f91af4c728567cf5fb3.tar.gz org.eclipse.objectteams-5efa719f1dc41994a85b6f91af4c728567cf5fb3.tar.xz org.eclipse.objectteams-5efa719f1dc41994a85b6f91af4c728567cf5fb3.zip |
Update jdt.core to S4_8_0_M7
- fix regression: OT test change no longer needed
-rw-r--r-- | org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java index 58ed39782..8eb270a59 100644 --- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java +++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java @@ -1355,40 +1355,32 @@ public void testBug426048() { " }\n" + "}\n" }, -//{ObjectTeams: our error recovery drops the 'default' modifier: "----------\n" + - "1. ERROR in MyFunction.java (at line 16)\n" + - " @FunctionalInterface public interface MyFunction<T, @Returns R> {\n" + - " ^^^^^^^^^^\n" + - "Invalid \'@FunctionalInterface\' annotation; MyFunction<T,R> is not a functional interface\n" + -// orig (except for numbering): - "----------\n" + - "2. ERROR in MyFunction.java (at line 19)\n" + + "1. ERROR in MyFunction.java (at line 19)\n" + " default <V> @Throws(((MyFunction<? super V, ? extends T>) before::apply) @Returns MyFunction<V, @Returns R>\n" + " ^\n" + "Syntax error, insert \"Type Identifier (\" to complete MethodHeaderName\n" + "----------\n" + - "3. ERROR in MyFunction.java (at line 19)\n" + + "2. ERROR in MyFunction.java (at line 19)\n" + " default <V> @Throws(((MyFunction<? super V, ? extends T>) before::apply) @Returns MyFunction<V, @Returns R>\n" + " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + "Type mismatch: cannot convert from MyFunction<capture#1-of ? super V,capture#2-of ? extends T> to Class<? extends Throwable>[]\n" + "----------\n" + - "4. ERROR in MyFunction.java (at line 19)\n" + + "3. ERROR in MyFunction.java (at line 19)\n" + " default <V> @Throws(((MyFunction<? super V, ? extends T>) before::apply) @Returns MyFunction<V, @Returns R>\n" + " ^^^^^^\n" + "before cannot be resolved\n" + "----------\n" + - "5. ERROR in MyFunction.java (at line 19)\n" + + "4. ERROR in MyFunction.java (at line 19)\n" + " default <V> @Throws(((MyFunction<? super V, ? extends T>) before::apply) @Returns MyFunction<V, @Returns R>\n" + " ^\n" + "Syntax error, insert \")\" to complete Modifiers\n" + "----------\n" + - "6. ERROR in MyFunction.java (at line 20)\n" + + "5. ERROR in MyFunction.java (at line 20)\n" + " compose(MyFunction<? super V, ? extends T> before) {\n" + " ^\n" + "Syntax error on token \"(\", , expected\n" + "----------\n"); -// SH} } public void testBug426540() { runConformTest( |