use java 6.0 regression exclusions

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1991 f5eafffb-2e1d-0410-98e4-8ec43c5233c4

com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java

@@ -11,6 +11,7 @@
 package com.ibm.wala.cast.java.test;
 
 import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
+import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.eclipse.util.EclipseProjectPath;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
@@ -24,11 +25,13 @@ public class JLexTest extends IRTests {
   }
 
   protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors) {
-    return new JavaSourceAnalysisEngine() {
+    JavaSourceAnalysisEngine engine = new JavaSourceAnalysisEngine() {
       protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
         return Util.makeMainEntrypoints(EclipseProjectPath.SOURCE_REF, cha, new String[] { "LJLex/Main" });
       }
     };
+    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    return engine;
   }
 
   protected String singleInputForTest() {

com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java

@@ -27,6 +27,7 @@ import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
 import com.ibm.wala.cast.java.ipa.slicer.AstJavaSlicer;
 import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.slicer.SlicerTest;
 import com.ibm.wala.eclipse.util.EclipseProjectPath;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
@@ -61,11 +62,13 @@ public class JavaIRTests extends IRTests {
   }
 
   protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors) {
-    return new JavaSourceAnalysisEngine() {
+    JavaSourceAnalysisEngine engine = new JavaSourceAnalysisEngine() {
       protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
         return Util.makeMainEntrypoints(EclipseProjectPath.SOURCE_REF, cha, mainClassDescriptors);
       }
     };
+    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    return engine;
   }
 
   protected String singleInputForTest() {

com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java

@@ -20,6 +20,7 @@ import com.ibm.wala.cast.tree.CAst;
 import com.ibm.wala.cast.tree.impl.CAstRewriter;
 import com.ibm.wala.cast.tree.impl.CAstRewriterFactory;
 import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.eclipse.util.EclipseProjectPath;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
@@ -38,19 +39,12 @@ public class SyncDuplicatorTest extends IRTests {
     super("SyncDuplicatorTest");
   }
 
-  private final static CallSiteReference testMethod =
+  private final static CallSiteReference testMethod = CallSiteReference.make(0, MethodReference.findOrCreate(TypeReference
-    CallSiteReference.make(
+      .findOrCreate(EclipseProjectPath.SOURCE_REF, TypeName.string2TypeName("LMonitor2")), Atom.findOrCreateUnicodeAtom("test"),
-      0, 
+      Descriptor.findOrCreateUTF8("(Ljava/lang/Object;)Z")), IInvokeInstruction.Dispatch.STATIC);
-      MethodReference.findOrCreate(
-        TypeReference.findOrCreate(
-	  EclipseProjectPath.SOURCE_REF,
-	  TypeName.string2TypeName("LMonitor2")),
-	Atom.findOrCreateUnicodeAtom("test"),
-	Descriptor.findOrCreateUTF8("(Ljava/lang/Object;)Z")),
-      IInvokeInstruction.Dispatch.STATIC);
 
   protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors) {
-    return new JavaSourceAnalysisEngine() {
+    JavaSourceAnalysisEngine engine = new JavaSourceAnalysisEngine() {
       protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
         return Util.makeMainEntrypoints(EclipseProjectPath.SOURCE_REF, cha, mainClassDescriptors);
       }
@@ -66,6 +60,8 @@ public class SyncDuplicatorTest extends IRTests {
       }
 
     };
+    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    return engine;
   }
 
   protected String singleInputForTest() {