Implementation for  Bug 318815 -  [otjld] [compiler] Support the "Internal Role" pattern
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 3854ba7..6aa6070 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 @@
 //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 @@
 			"		<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 58dcd83..518309c 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 @@
         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 @@
         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);