ug 528057 - [9] Need to signal when tsuper() ctor call is needed to

initialize fields

- test adjustments

Change-Id: I5ddeca27720d5f684233b474aad5925f76c3fde7

3 files changed, 10 insertions, 5 deletions

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 faea5c8b7..e09db599f 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
@@ -2552,6 +2552,7 @@ public void test012_compiler_problems_tuning() {
         expectedProblemAttributes.put("InstantiationAnnotationInNonRole", SKIP);
         expectedProblemAttributes.put("FieldInRoleWithInstantiationPolicy", SKIP);
         expectedProblemAttributes.put("MissingEqualsHashCodeWithInstantation", SKIP);
+        expectedProblemAttributes.put("RoleConstructorNeedingTSuperCall", SKIP);
         expectedProblemAttributes.put("DeclaredLiftingInStaticMethod", SKIP);
         expectedProblemAttributes.put("QualifiedLiftingType", SKIP);
         expectedProblemAttributes.put("LiftingTypeNotAllowedHere", SKIP);
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/OTJStratumFlightbonusTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/OTJStratumFlightbonusTest.java
index 224d5d42a..47c3a8734 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/OTJStratumFlightbonusTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/OTJStratumFlightbonusTest.java
@@ -251,11 +251,11 @@ public class OTJStratumFlightbonusTest extends AbstractSourceMapGeneratorTest {
     	// copy-inherited methods
         FileInfo fileInfo2 = stratum_role1.getOrCreateFileInfo("Bonus.java", "org/eclipse/objectteams/example/bonussystem/Bonus.java");
         
-        LineInfo lineInfo4 = new LineInfo(39,17); // class header (e.g., _OT$getTeam())
-        LineInfo lineInfo6 = new LineInfo(44,26); // method getCollectedCredits
-        LineInfo lineInfo7 = new LineInfo(49,24); // method collectCredits
+        LineInfo lineInfo4 = new LineInfo(39,21); // class header (e.g., _OT$getTeam())
+        LineInfo lineInfo6 = new LineInfo(44,30); // method getCollectedCredits
+        LineInfo lineInfo7 = new LineInfo(49,28); // method collectCredits
         lineInfo7.setRepeatCount(2);
-        LineInfo lineInfo8 = new LineInfo(58,18); // method buy
+        LineInfo lineInfo8 = new LineInfo(58,22); // method buy
         lineInfo8.setRepeatCount(6);
 
         fileInfo2.addLineInfo(lineInfo4);
@@ -264,7 +264,7 @@ public class OTJStratumFlightbonusTest extends AbstractSourceMapGeneratorTest {
         fileInfo2.addLineInfo(lineInfo8);
 
         LineInfo lineInfo1 = new LineInfo(7,7); 	// all lines of class Subscriber
-        lineInfo1.setRepeatCount(10);
+        lineInfo1.setRepeatCount(14);
 
         LineInfo lineInfo2 = new LineInfo(ISMAPConstants.STEP_INTO_LINENUMBER,ISMAPConstants.STEP_INTO_LINENUMBER);
         LineInfo lineInfo3 = new LineInfo(ISMAPConstants.STEP_OVER_LINENUMBER,ISMAPConstants.STEP_OVER_LINENUMBER);
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/JSR-045/src/org/eclipse/objectteams/example/fbapplication/FlightBonus/Subscriber.java b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/JSR-045/src/org/eclipse/objectteams/example/fbapplication/FlightBonus/Subscriber.java
index d05cd63b1..3f5921b42 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/JSR-045/src/org/eclipse/objectteams/example/fbapplication/FlightBonus/Subscriber.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/JSR-045/src/org/eclipse/objectteams/example/fbapplication/FlightBonus/Subscriber.java
@@ -13,4 +13,8 @@ public class Subscriber playedBy Passenger
 
 	// Callout method binding
 	String getName() -> String getName();
+
+	public Subscriber(Passenger pass) {
+		tsuper();
+	}
 }