Bug 416781 - reconcile compiler changes from BETA_JAVA8 with OT/J
- adjust expected syntax errors
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutParameterBinding_LiftingAndLowering.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutParameterBinding_LiftingAndLowering.java
index ec12b40..fa2eb83 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutParameterBinding_LiftingAndLowering.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutParameterBinding_LiftingAndLowering.java
@@ -351,13 +351,14 @@
"----------\n" +
"2. ERROR in Team321ciwmp6.java (at line 5)\n" +
" int doSomethingOther(int r1) -> int doSomething(int b1) wrong\n" +
- " ^^^^^\n" +
- "Syntax error on token \"wrong\", delete this token\n" +
+ " with {\n" +
+ " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
+ "Syntax error on tokens, EmptyParameterMappings expected instead\n" +
"----------\n" +
- "3. ERROR in Team321ciwmp6.java (at line 9)\n" +
- " };\n" +
- " ^\n" +
- "Syntax error, insert \"}\" to complete ClassBody\n" +
+ "3. ERROR in Team321ciwmp6.java (at line 7)\n" +
+ " r1 -> b1,\n" +
+ " ^\n" +
+ "Syntax error on token \",\", ; expected\n" +
"----------\n" +
"4. ERROR in Team321ciwmp6.java (at line 9)\n" +
" };\n" +
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java
index c50fe96..28d4669 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java
@@ -533,7 +533,7 @@
// a parameter mapping separates parts with semicolon
// 8.6.1-otjld-parammap-illegal-semi-1
public void test861_parammapIllegalSemi1() {
- runNegativeTestMatching(
+ runNegativeTest(
new String[] {
"Team861pis1.java",
"\n" +
@@ -549,7 +549,18 @@
"}\n" +
" \n"
},
- "\";\"");
+ "----------\n" +
+ "1. WARNING in Team861pis1.java (at line 3)\n" +
+ " protected class Role playedBy Object {\n" +
+ " ^^^^^^\n" +
+ "Base class java.lang.Object appears to be a system class, which means that load time weaving could possibly fail\n" +
+ "if this class is loaded from rt.jar/the bootstrap classpath.\n" +
+ "----------\n" +
+ "2. ERROR in Team861pis1.java (at line 7)\n" +
+ " this -> other;\n" +
+ " ^^^^^^^^^^^^^^\n" +
+ "Syntax error on tokens, delete these tokens\n" +
+ "----------\n");
}
// a parameter mapping is terminated by semicolon