testcode for 145391,145693

diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index 0500cf75752ae894cd06c398ba748477dec45d08..bf333308eee9864a336e738e4e06f7861b580344 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -24,7 +24,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
-  //public void testBrokenIfArgsCflowAtAj_pr145018() { runTest("ataj crashing with cflow, if and args");}
+//  public void testverifyErrNoTypeCflowField_pr145693() {runTest("verifyErrNoTypeCflowField");}
+//  public void testBrokenIfArgsCflowAtAj_pr145018() { runTest("ataj crashing with cflow, if and args");}
+//  public void testItdCallingGenericMethod_pr145391() { runTest("itd calling generic method");}
+//  public void testItdCallingGenericMethod_pr145391_2() { runTest("itd calling generic method - 2");}
   public void testNoUnnecessaryDeclarationOfThrownExcp_pr129282_1() {runTest("no unnecessary declaration of thrown exception warning - 1");}
   public void testNoUnnecessaryDeclarationOfThrownExcp_pr129282_2() {runTest("no unnecessary declaration of thrown exception warning - 2");}
   public void testNoUnnecessaryDeclarationOfThrownExcp_pr129282_3() {runTest("no unnecessary declaration of thrown exception warning - 3");}

diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index 54718c6c54abe43b2c917dbb9abcdb7ccbfa39fd..ad6ef906f308196ade994c9749282efec53b9788 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -78,7 +78,23 @@
      </run>
     </ajc-test>
     
+    <ajc-test dir="bugs152/pr145693" title="verifyErrNoTypeCflowField">
+      <compile files="Event.java" outjar="cpath.jar"/>
+      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar"/>
+      <compile files="Sample.java" options="-Xlint:ignore" aspectpath="apath.jar" outjar="run.jar"/>
+      <run class="Sample" classpath="run.jar,apath.jar"/>
+    </ajc-test>    
 
+       <ajc-test dir="bugs152/pr145391" title="itd calling generic method">
+     <compile files="GenericType.java" options="-1.5"/>
+     <run class="GenericType"/>
+    </ajc-test>
+
+       <ajc-test dir="bugs152/pr145391" title="itd calling generic method - 2">
+     <compile files="GenericType2.java" options="-1.5"/>
+     <run class="GenericType2"/>
+    </ajc-test>
+    
        <ajc-test dir="bugs152/pr126355" title="bizarre generic error with itds">
      <compile files="Pair.java" options="-1.5"/>
      <compile files="Test.java" options="-1.5"/>