Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-07-09 12:05:42 -0400
committerStephan Herrmann2010-07-09 12:05:42 -0400
commit62ebf80b1d334b8d204f34e4795cd16529b8a4d0 (patch)
tree302de4bfece17727fd9a24f5614142a42528697a /org.eclipse.jdt.core.tests.compiler
parent7464c32cd7645d260024901926bddbe6a31738e2 (diff)
downloadorg.eclipse.objectteams-62ebf80b1d334b8d204f34e4795cd16529b8a4d0.tar.gz
org.eclipse.objectteams-62ebf80b1d334b8d204f34e4795cd16529b8a4d0.tar.xz
org.eclipse.objectteams-62ebf80b1d334b8d204f34e4795cd16529b8a4d0.zip
Implementation for Bug 318815 - [otjld] [compiler] Support the "Internal Role" pattern
Diffstat (limited to 'org.eclipse.jdt.core.tests.compiler')
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java3
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java2
2 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
index 3854ba7fb..6aa6070e4 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
@@ -1679,6 +1679,8 @@ public void test012b(){
//OT:
" basecall + base call not issued exactly once on each path\n" +
" (OTJLD 4.3(b,c))\n" +
+ " baseclasscycle + role involved in a baseclass-member cycle\n" +
+ " (OTJLD 2.1.2(b)\n" +
//OT:
" bindingconventions + discouraged use of import / import base\n" +
" (OTJLD 2.1.2(d))\n" +
@@ -1933,6 +1935,7 @@ public void test012b(){
" <option key=\"org.eclipse.objectteams.otdt.compiler.problem.adapting_deprecated\" value=\"error\"/>\n" +
" <option key=\"org.eclipse.objectteams.otdt.compiler.problem.ambiguous_lowering\" value=\"warning\"/>\n" +
" <option key=\"org.eclipse.objectteams.otdt.compiler.problem.basecall\" value=\"warning\"/>\n" +
+ " <option key=\"org.eclipse.objectteams.otdt.compiler.problem.baseclass_cycle\" value=\"warning\"/>\n" +
" <option key=\"org.eclipse.objectteams.otdt.compiler.problem.binding_conventions\" value=\"warning\"/>\n" +
" <option key=\"org.eclipse.objectteams.otdt.compiler.problem.decapsulation\" value=\"warning\"/>\n" +
" <option key=\"org.eclipse.objectteams.otdt.compiler.problem.definite_ambiguity\" value=\"error\"/>\n" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java
index 58dcd83ee..518309cc0 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java
@@ -1710,6 +1710,7 @@ public void test012_compiler_problems_tuning() {
expectedProblemAttributes.put("BaseConstructorCallInLiftingConstructor", SKIP);
expectedProblemAttributes.put("CallsCtorWithMismatchingBaseCtor", SKIP);
expectedProblemAttributes.put("InvalidExplicitTSuperConstructorCall", SKIP);
+ expectedProblemAttributes.put("BaseAllocationDespiteBaseclassCycle", SKIP);
expectedProblemAttributes.put("BaseCtorCallIsNotFirst", SKIP);
expectedProblemAttributes.put("MissingCallToBaseConstructor", SKIP);
expectedProblemAttributes.put("TooManyCallsToBaseConstructor", SKIP);
@@ -1726,6 +1727,7 @@ public void test012_compiler_problems_tuning() {
expectedProblemAttributes.put("CALLOUT_RELATED", SKIP);
expectedProblemAttributes.put("CalloutMappingInNonRole", SKIP);
expectedProblemAttributes.put("CalloutMappingInUnboundRole", SKIP);
+ expectedProblemAttributes.put("CalloutToEnclosing", SKIP);
expectedProblemAttributes.put("UnresolvedCalloutMethodSpec", SKIP);
expectedProblemAttributes.put("AmbiguousCalloutMethodSpec", SKIP);
expectedProblemAttributes.put("DifferentReturnInCalloutMethodSpec", SKIP);

Back to the top