Strengthen existing test and fix for Bug 335774 - [compiler] don't flag "bindingconventions" against import in superteam
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
index 4fc8150..055eb43 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
@@ -268,6 +268,25 @@
 			// javac options
 			JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings /* javac test options */);	
 	}
+	/** Additional entry for tests expecting a compiler warning and run. */
+	protected void runTestExpectingWarnings(String[] files, String expectedWarnings, String expectedOutput) {
+    	Map options = getCompilerOptions();
+		runConformTest(
+	 		// test directory preparation
+			true/*flushOutputDirectory*/,
+			files,
+			// compiler options
+			null /* no class libraries */,
+			options /* custom options - happen to be the default not changed by the test suite */,
+			// compiler results
+			expectedWarnings,
+			// runtime results
+			expectedOutput,
+			null /* do not check error string */,
+			// javac options
+			JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings /* javac test options */);	
+	}
+
 	protected void myWriteFiles(String[] testFiles) {
 		// force the directory to comply with the infrastructure from AbstractRegressionTest:
 		String testName = null;
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java
index 3ff9dce..645e529 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java
@@ -33,7 +33,7 @@
 	// Static initializer to specify tests subset using TESTS_* static variables
 	// All specified tests which does not belong to the class are skipped...
 	static {
-//		TESTS_NAMES = new String[] { "testA12_genericRoleFeature16f"};
+//		TESTS_NAMES = new String[] { "testA112_genericTeam3"};
 //		TESTS_NUMBERS = new int[] { 1459 };
 //		TESTS_RANGE = new int[] { 1097, -1 };
 	}
@@ -3040,8 +3040,9 @@
     }
     
     // Bug 332795 - [compiler][generics] import issues with inherited playedBy binding inside parameterized team
+    // Bug 335774 - [compiler] don't flag "bindingconventions" against import in superteam
     public void testA112_genericTeam3() {
-    	runConformTest(
+    	runTestExpectingWarnings(
     		new String[] {
     	"TeamA112gt3_2.java",
     			"public team class TeamA112gt3_2 extends TeamA112gt3_1<String> {\n" +
@@ -3065,6 +3066,12 @@
     			"package mypack;\n" +
     			"public class B1 {}\n"
     		},
+    		"----------\n" + 
+    		"1. WARNING in TeamA112gt3_1.java (at line 3)\n" + 
+    		"	protected class R playedBy B1 {\n" + 
+    		"	                           ^^\n" + 
+    		"It is recommended that base class B1 be imported with the modifier \"base\" (OTJLD 2.1.2(d)).\n" + 
+    		"----------\n",
     		"OK");
     }