minimalModel ON by default. demotion ON by default (for AJDT as well as LTW)

tests/bugs1612/pr345515/Code.java

@@ -0,0 +1,26 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface Anno {
+  String string();
+}
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface Anno2 {
+  String string() default "abc";
+}
+
+
+public class Code {
+
+  @Anno(string="hello")
+  int field;
+
+  public static void main(String []argv) {
+  }
+
+}
+
+aspect X {
+  declare @field: @Anno(string=$1) * *: @Anno2(string=$1);
+}

tests/multiIncremental/pr335810/One.java

@@ -0,0 +1,16 @@
+import java.util.List;
+
+public class One {
+
+	@SuppressWarnings("rawtypes")
+	public void m(List l) {
+		
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void m2(List<?> input) {
+		List<String> ls = (List<String>)input;
+		System.out.println(ls);
+	}
+}
+

tests/src/org/aspectj/systemtest/ajc150/ajc150.xml

@@ -1070,7 +1070,7 @@
     </ajc-test>
     
     <ajc-test dir="bugs150" title="bad asm for enums" vm="1.5">
-        <compile files="Rainbow.java" options="-emacssym,-1.5"/>
+        <compile files="Rainbow.java" options="-emacssym,-1.5,-Xset:minimalModel=false"/>
     </ajc-test>
     
     <ajc-test dir="bugs150" pr="10461" title="missing name pattern">

tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java

@@ -11,130 +11,135 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150.ataspectj;
 
+import java.io.File;
+
 import junit.framework.Test;
-import org.aspectj.testing.XMLBasedAjcTestCase;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 /**
  * A suite for @AspectJ aspects located in java5/ataspectj
- *
+ * 
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
 public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
 
-    public static Test suite() {
-        return XMLBasedAjcTestCase.loadSuite(AtAjSyntaxTests.class);
-    }
-
-    protected File getSpecFile() {
-        return new File("../tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml");
-    }
-
-    public void testSimpleBefore() {
-        runTest("SimpleBefore");
-    }
-
-    public void testSimpleAfter() {
-        runTest("SimpleAfter");
-    }
-
-    public void testSingletonAspectBindings() {
-        //Note AV: uncomment setReporting to get it in modules/tests folder
-        // org.aspectj.asm.AsmManager.setReporting("debug.txt",true,true,true,true);
-        runTest("singletonAspectBindings");
-        // same stuff with AJ
-        //org.aspectj.asm.AsmManager.setReporting("debug-aj.txt",true,true,true,true);
-        //runTest("singletonAspectBindings2");
-
-    }
-
-    public void testCflowTest() {
-        runTest("CflowTest");
-    }
-
-    public void testPointcutReferenceTest() {
-        runTest("PointcutReferenceTest");
-    }
-
-    public void testXXJoinPointTest() {
-        runTest("XXJoinPointTest");
-    }
-
-    public void testPrecedenceTest() {
-        runTest("PrecedenceTest");
-    }
-
-    public void testAfterXTest() {
-        runTest("AfterXTest");
-    }
-
-    public void testBindingTest() {
-        runTest("BindingTest");
-    }
-
-    public void testBindingTestNoInline() {
-        runTest("BindingTest no inline");
-    }
-
-    public void testPerClause() {
-        runTest("PerClause");
-    }
-
-    public void testAroundInlineMunger_XnoInline() {
-        runTest("AroundInlineMunger -XnoInline");
-    }
-
-    public void testAroundInlineMunger() {
-        runTest("AroundInlineMunger");
-    }
-
-    public void testAroundInlineMunger2() {
-        runTest("AroundInlineMunger2");
-    }
-
-    public void testDeow() {
-        runTest("Deow");
-    }
-
-    public void testSingletonInheritance() {
-        runTest("singletonInheritance");
-    }
-
-    public void testPerClauseInheritance() {
-        runTest("perClauseInheritance");
-    }
-
-    public void testIfPointcut() {
-        runTest("IfPointcutTest");
-    }
-
-    public void testIfPointcut2() {
-        runTest("IfPointcut2Test");
-    }
-
-    public void testMultipleBinding() {
-        runTest("MultipleBinding");
-    }
-
-    public void testBug104212() {
-        runTest("Bug104212");
-    }
-
-    public void testDeclareParentsInterface() {
-        runTest("DeclareParentsInterface");
-    }
-
-    public void testDeclareParentsImplements() {
-        runTest("DeclareParentsImplements");
-    }
-
-    public void testAbstractAspectNPE() {
-        runTest("AbstractAspectNPE");
-    }
-
-    public void testAbstractInherited() {
-        runTest("AbstractInherited");
-    }
+	public static Test suite() {
+		return XMLBasedAjcTestCase.loadSuite(AtAjSyntaxTests.class);
+	}
+
+	protected File getSpecFile() {
+		return new File("../tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml");
+	}
+
+	public void testSimpleBefore() {
+		runTest("SimpleBefore");
+	}
+
+	public void testSimpleAfter() {
+		runTest("SimpleAfter");
+	}
+
+	public void testSingletonAspectBindings() {
+		// Note AV: uncomment setReporting to get it in modules/tests folder
+		// org.aspectj.asm.AsmManager.setReporting("debug.txt",true,true,true,true);
+		runTest("singletonAspectBindings");
+		// same stuff with AJ
+		// org.aspectj.asm.AsmManager.setReporting("debug-aj.txt",true,true,true,true);
+		// runTest("singletonAspectBindings2");
+
+	}
+
+	public void testCflowTest() {
+		runTest("CflowTest");
+	}
+
+	public void testPointcutReferenceTest() {
+		runTest("PointcutReferenceTest");
+	}
+
+	public void testXXJoinPointTest() {
+		runTest("XXJoinPointTest");
+	}
+
+	public void testPrecedenceTest() {
+		runTest("PrecedenceTest");
+	}
+
+	public void testAfterXTest() {
+		runTest("AfterXTest");
+	}
+
+	public void testBindingTest() {
+		runTest("BindingTest");
+	}
+
+	public void testBindingTestNoInline() {
+		runTest("BindingTest no inline");
+	}
+
+	public void testPerClause() {
+		runTest("PerClause");
+	}
+
+	public void testAroundInlineMunger_XnoInline() {
+		runTest("AroundInlineMunger -XnoInline");
+	}
+
+	public void testAroundInlineMunger() {
+		try {
+			runTest("AroundInlineMunger");
+		} finally {
+			System.out.println(ajc.getLastCompilationResult().getStandardError());
+		}
+	}
+
+	public void testAroundInlineMunger2() {
+		runTest("AroundInlineMunger2");
+	}
+
+	public void testDeow() {
+		runTest("Deow");
+	}
+
+	public void testSingletonInheritance() {
+		runTest("singletonInheritance");
+	}
+
+	public void testPerClauseInheritance() {
+		runTest("perClauseInheritance");
+	}
+
+	public void testIfPointcut() {
+		runTest("IfPointcutTest");
+	}
+
+	public void testIfPointcut2() {
+		runTest("IfPointcut2Test");
+	}
+
+	public void testMultipleBinding() {
+		runTest("MultipleBinding");
+	}
+
+	public void testBug104212() {
+		runTest("Bug104212");
+	}
+
+	public void testDeclareParentsInterface() {
+		runTest("DeclareParentsInterface");
+	}
+
+	public void testDeclareParentsImplements() {
+		runTest("DeclareParentsImplements");
+	}
+
+	public void testAbstractAspectNPE() {
+		runTest("AbstractAspectNPE");
+	}
+
+	public void testAbstractInherited() {
+		runTest("AbstractInherited");
+	}
 
 }

tests/src/org/aspectj/systemtest/ajc152/ajc152.xml

@@ -766,10 +766,10 @@
 
 
    <ajc-test dir="bugs152" title="new iprogramelement method getParameterSignatures">
-      <compile files="pr141730a.java" options="-emacssym"/>
+      <compile files="pr141730a.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
    <ajc-test dir="bugs152" title="new iprogramelement method getParameterSignatures with generics">
-      <compile files="pr141730b.java" options="-1.5 -emacssym"/>
+      <compile files="pr141730b.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 </suite>

tests/src/org/aspectj/systemtest/ajc153/ajc153.xml

@@ -16,7 +16,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs153/pr164340" title="formal comments are set for constructor ipes">
-      <compile files="C.java" options="-emacssym -XjavadocsInModel"/>
+      <compile files="C.java" options="-emacssym -XjavadocsInModel -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice">
@@ -98,7 +98,7 @@
     </ajc-test>
     
 	<ajc-test dir="bugs153/pr148908" title="ensure getSourceSignature correct with static field">
-      <compile files="BadInterface.java" options="-1.5 -emacssym"/>
+      <compile files="BadInterface.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
     </ajc-test> 
     
 	<ajc-test dir="bugs153/pr161502" title="generics in pointcuts">
@@ -835,7 +835,7 @@
     </ajc-test> 
 
     <ajc-test dir="bugs153/pr164356" title="javadoc comments are set if have normal comments">
-      <compile files="C.java" options="-emacssym -XjavadocsInModel"/>
+      <compile files="C.java" options="-emacssym -XjavadocsInModel -Xset:minimalModel=false"/>
     </ajc-test>
     
    <ajc-test dir="bugs153/pr164384" title="compliance java 6 throws usage error">
@@ -869,11 +869,11 @@
     </ajc-test>
 
 	<ajc-test dir="bugs153/StaticImport" title="ensure static import reference have static modifier set">
-      <compile files="StaticImport.java,C.java" options="-1.5 -emacssym"/>
+      <compile files="StaticImport.java,C.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
     </ajc-test> 
     
     <ajc-test dir="bugs153/GenericMethod" title="ensure getSourceSignature correct with generic method">
-      <compile files="C.java" options="-1.5 -emacssym"/>
+      <compile files="C.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
     </ajc-test> 
     
     <ajc-test dir="bugs153/Annotation" title="ensure Annotations are added to import list">

tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml

@@ -117,23 +117,23 @@
     <!-- tests to ensure handle provider produces same as the jdt -->
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="compilation unit same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="class same as jdt">
-      <compile files="C.java" options="-emacssym"/>
+      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="interface same as jdt">
-      <compile files="C.java" options="-emacssym"/>
+      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
    <ajc-test dir="features153/jdtlikehandleprovider" title="constructor same as jdt">
-      <compile files="C.java" options="-emacssym"/>
+      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
    <ajc-test dir="features153/jdtlikehandleprovider" title="constructor with args same as jdt">
-      <compile files="C.java" options="-emacssym"/>
+      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
 <!--    <ajc-test dir="features153/jdtlikehandleprovider" title="package declaration same as jdt">
@@ -141,71 +141,71 @@
     </ajc-test>
 -->
     <ajc-test dir="features153/jdtlikehandleprovider" title="import declaration same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="type same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="field same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="initialization same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with string array as argument same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with int array as argument same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with no args same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with two args same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with two string args same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
+      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="enum same as jdt">
-      <compile files="E.java" options="-emacssym -1.5"/>
+      <compile files="E.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="enum value same as jdt">
-      <compile files="E.java" options="-emacssym -1.5"/>
+      <compile files="E.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="annotation same as jdt">
-      <compile files="MyAnnotation.java" options="-emacssym -1.5"/>
+      <compile files="MyAnnotation.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with list arg same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5"/>
+      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with generic arg same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5"/>
+      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with two generic args same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5"/>
+      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with two type parameters same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5"/>
+      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="method with two args one of which is generic same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5"/>
+      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="ipes with same name have unique handles - method-call">

tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml

@@ -75,7 +75,7 @@
     <ajc-test dir="incremental/model/sourcefiles_updating" 
     	title="Testing incremental structure model: Updating files"
     	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
+        <compile staging="true" options="-incremental,-emacssym,-Xset:minimalModel=false" sourceroots="src"/>
         <!-- On first compile, 5 source files in model, 'root','Alpha','Beta','Gamma','Delta' -->
         <inc-compile tag="20" checkModel="java source file=5,method=4,class=3,FileMapSize=4"/> <!-- Beta changed, method added -->
         <inc-compile tag="30" checkModel="java source file=5,method=4,class=4,advice=1"/> <!-- Delta changed, class added -->
@@ -87,7 +87,7 @@
 	<ajc-test dir="incremental/model/sourcefiles_addremove" 
     	title="Testing incremental structure model: Adding and removing files" 
     	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable" sourceroots="src"/>
+        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable,-Xset:minimalModel=false" sourceroots="src"/>
         <!-- On first compile, two source files in model, 'root' and 'Alpha' -->
         <inc-compile tag="20" checkModel="java source file=3,FileMapSize=2"/> <!-- Adds primary.Beta class -->   
         <inc-compile tag="30" checkModel="java source file=4"/> <!-- Adds secondary.Gamma aspect -->

tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java

@@ -180,6 +180,7 @@ public class IncrementalCompilationTests extends AbstractMultiProjectIncremental
 	public void testModelStructure_333123() throws Exception {
 		String p = "pr333123";
 		initialiseProject(p);
+		configureNonStandardCompileOptions(p, "-Xset:minimalModel=false");
 		build(p);
 		checkWasFullBuild();
 		printModel(p);

tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java

@@ -410,6 +410,8 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 	public void testQualifiedInnerTypeRefs_269082() throws Exception {
 		String p = "pr269082";
 		initialiseProject(p);
+		configureNonStandardCompileOptions(p, "-Xset:minimalModel=false");
+
 		build(p);
 		printModel(p);
 
@@ -1294,6 +1296,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 	public void testImportHandles() {
 		String p = "Imports";
 		initialiseProject(p);
+		configureNonStandardCompileOptions(p, "-Xset:minimalModel=false");
 		build(p);
 
 		IProgramElement root = getModelFor(p).getHierarchy().getRoot();
@@ -1732,6 +1735,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 	public void testHandleQualification_pr265993() throws IOException {
 		String p = "pr265993";
 		initialiseProject(p);
+		configureNonStandardCompileOptions(p, "-Xset:minimalModel=false");
 		build(p);
 		IProgramElement root = getModelFor(p).getHierarchy().getRoot();
 		// dumptree(getModelFor(p).getHierarchy().getRoot(), 0);
@@ -2276,6 +2280,8 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 	public void testBuildingTwoProjectsAndVerifyingModel() {
 		initialiseProject("P1");
 		initialiseProject("P2");
+		configureNonStandardCompileOptions("P1", "-Xset:minimalModel=false");
+		configureNonStandardCompileOptions("P2", "-Xset:minimalModel=false");
 
 		build("P1");
 		checkForNode(getModelFor("P1"), "pkg", "C", true);
@@ -2295,6 +2301,8 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 	public void testBuildingTwoProjectsAndVerifyingStuff() {
 		initialiseProject("P1");
 		initialiseProject("P2");
+		configureNonStandardCompileOptions("P1", "-Xset:minimalModel=false");
+		configureNonStandardCompileOptions("P2", "-Xset:minimalModel=false");
 
 		build("P1");
 		checkForNode(getModelFor("P1"), "pkg", "C", true);

tests/src/org/aspectj/systemtest/model/ModelTestCase.java

@@ -133,9 +133,9 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase {
 	private void compareModel(File expectedF) {
 		if (debugTest)
 			System.out.println("comparing with model in file " + expectedF.getAbsolutePath());
-		List fileContents = new ArrayList();
+		List<String> fileContents = new ArrayList<String>();
 		try {
-			String sandboxDir = ajc.getSandboxDirectory().getAbsolutePath();
+			// String sandboxDir = ajc.getSandboxDirectory().getAbsolutePath();
 			String modelOutput = modelFilename;
 			// Load the file with the expected output
 			BufferedReader expect = new BufferedReader(new FileReader(expectedF));
@@ -144,13 +144,13 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase {
 			while ((expectedLine = expect.readLine()) != null) {
 				fileContents.add(expectedLine);
 			}
-			List expectedFileContents = new ArrayList();
+			List<String> expectedFileContents = new ArrayList<String>();
 			expectedFileContents.addAll(fileContents);
 
 			// Load the file with the output from this test run
 			BufferedReader found = new BufferedReader(new FileReader(new File(modelOutput)));
 			String foundLine = null;
-			List foundFileContents = new ArrayList();
+			List<String> foundFileContents = new ArrayList<String>();
 			while ((foundLine = found.readLine()) != null) {
 				// int i = foundLine.indexOf(sandboxDir);
 				// if (i == -1) {
@@ -168,7 +168,7 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase {
 			}
 
 			// iterate over what we found
-			for (Iterator iter = foundFileContents.iterator(); iter.hasNext();) {
+			for (Iterator<String> iter = foundFileContents.iterator(); iter.hasNext();) {
 				String line = (String) iter.next();
 				if (debugTest)
 					System.err.println("looking at model entry: " + line);
@@ -177,7 +177,7 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase {
 
 					if (debugTest) {
 						System.err.println("couldn't find: " + line);
-						for (Iterator iterator = fileContents.iterator(); iterator.hasNext();) {
+						for (Iterator<String> iterator = fileContents.iterator(); iterator.hasNext();) {
 							String element = (String) iterator.next();
 							System.err.println("compared with: " + element);
 						}
@@ -192,7 +192,7 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase {
 			}
 
 			if (debugTest && !fileContents.isEmpty()) {
-				for (Iterator iter = fileContents.iterator(); iter.hasNext();) {
+				for (Iterator<String> iter = fileContents.iterator(); iter.hasNext();) {
 					String element = (String) iter.next();
 					System.err.println("remaining: " + element);
 				}

tests/src/org/aspectj/systemtest/model/model.xml

@@ -11,15 +11,15 @@
 
 
     <ajc-test dir="model/pr77269_1" title="advice in structure model with anonymous inner class">
-        <compile files="pack/pr77269.aj" options="-emacssym"/>
+        <compile files="pack/pr77269.aj" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test> 
 
     <ajc-test dir="model/pr77269_2" title="advice in structure model with named inner class">
-        <compile files="pr77269b.aj" options="-emacssym"/>
+        <compile files="pr77269b.aj" options="-emacssym -Xset:minimalModel=false"/>
     </ajc-test> 
 
     <ajc-test dir="model/pr77269_3" title="declare warning in structure model with anonymous inner class">
-        <compile files="pack/pr77269c.aj" options="-emacssym">
+        <compile files="pack/pr77269c.aj" options="-emacssym -Xset:minimalModel=false">
         	<message kind="warning" line="8" text="blah blah blah"/>
         </compile>
     </ajc-test> 
@@ -37,13 +37,13 @@
     </ajc-test>
 
    <ajc-test dir="model/pr145963_3" title="aspect in default package">
-      <compile files="C.java" aspectpath="simple.jar" options="-emacssym">
+      <compile files="C.java" aspectpath="simple.jar" options="-emacssym -Xset:minimalModel=false">
 		<message kind="warning" line="6" text="There should be no printlns"/>
 	</compile>
     </ajc-test>
 
    <ajc-test dir="model/pr145963_4" title="aspect in java file">
-      <compile files="C.java" aspectpath="simple.jar" options="-emacssym">
+      <compile files="C.java" aspectpath="simple.jar" options="-emacssym -Xset:minimalModel=false">
 		<message kind="warning" line="6" text="There should be no printlns"/>
 	</compile>
     </ajc-test>
@@ -65,7 +65,7 @@
     </ajc-test>
 
 	<ajc-test dir="model/pr160469_2" title="ensure deow from abstract aspects appear correctly in the model">
-      <compile files="Simple.java" options="-emacssym" aspectpath="aspects.jar">
+      <compile files="Simple.java" options="-emacssym -Xset:minimalModel=false" aspectpath="aspects.jar">
 		<message kind="warning" line="5" text="warning"/>
       </compile>
     </ajc-test>
@@ -73,7 +73,7 @@
 <!-- AspectJ 5 specific tests -->
 
 	<ajc-test dir="model/pr115607" title="declare at type appears correctly in structure model">
-        <compile files="pr115607.java" options="-1.5,-emacssym"/>
+        <compile files="pr115607.java" options="-1.5,-emacssym,-Xset:minimalModel=false"/>
     </ajc-test>
 
     <ajc-test dir="model/pr131932" title="structure model for generic itd">
@@ -81,18 +81,18 @@
     </ajc-test>
 
     <ajc-test dir="model/pr132130" title="declare annotation appears in structure model when in same file">
-        <compile files="pr132130.aj" options="-1.5 -emacssym"/>
+        <compile files="pr132130.aj" options="-1.5 -emacssym -Xset:minimalModel=false"/>
     </ajc-test>
     
     <ajc-test dir="model/pr120356" title="@AJ deow appear correctly when structure model is generated">
-        <compile files="C.java, A.java" options="-1.5, -emacssym">
+        <compile files="C.java, A.java" options="-1.5, -emacssym -Xset:minimalModel=false">
          <message kind="error" line="8" text="error"/>
          <message kind="warning" line="5" text="warning"/>
         </compile>
     </ajc-test>
 
     <ajc-test dir="model/pr143924" title="declare @method relationship">
-     <compile files="pr143924.aj" options="-1.5 -showWeaveInfo -emacssym">
+     <compile files="pr143924.aj" options="-1.5 -showWeaveInfo -emacssym -Xset:minimalModel=false">
         <message kind="weave" text="'public void BankAccount.debit(String,long)' (pr143924.aj:7) is annotated with @Secured"/>
      </compile>
     </ajc-test>
@@ -102,7 +102,7 @@
     </ajc-test>
 
 	<ajc-test dir="model/pr141730_4" title="ensure inpath injar relationships are correct when not filling in model">
-      <compile files="MyBar.aj, MyAnnotation.java, NewClass.java" inpath="inpath.jar" options="-1.5 -emacssym">
+      <compile files="MyBar.aj, MyAnnotation.java, NewClass.java" inpath="inpath.jar" options="-1.5 -emacssym -Xset:minimalModel=false">
 			<message kind="warning" line="20" text="System.out should not be called"/>
 	  </compile>
     </ajc-test>