testcases.

4 files changed, 32 insertions, 2 deletions

diff --git a/tests/bugs150/pr112783.aj b/tests/bugs150/pr112783.aj
new file mode 100644
index 000000000..b8ef21e53
--- /dev/null
+++ b/tests/bugs150/pr112783.aj
@@ -0,0 +1,13 @@
+public aspect pr112783 {
+
+	public NotYetABean.new() {
+		this(new Long(1)); 
+	}
+
+}
+
+class NotYetABean {
+
+	public NotYetABean(Long l) {		
+	}
+}
\ No newline at end of file
diff --git a/tests/bugs150/pr113445.aj b/tests/bugs150/pr113445.aj
new file mode 100644
index 000000000..15d5740c3
--- /dev/null
+++ b/tests/bugs150/pr113445.aj
@@ -0,0 +1,7 @@
+public class pr113445
+{
+    public <T extends Enum<T>> T getEnum(String name, Class<T> enumClass)
+    {
+        return (T)new Object(); 
+    }
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 1aabffea6..e2df7641c 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -41,16 +41,18 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   protected File getSpecFile() {
     return new File("../tests/src/org/aspectj/systemtest/ajc150/ajc150.xml");
   }
+
   /*
-    Andys bug area - enter at your own risk...
   public void testBrokenDispatchByITD_pr72834() { runTest("broken dispatch");}
   public void testMissingAccessor_pr73856() { runTest("missing accessor");}
   public void testCantCallSuperMethods_pr90143() { runTest("cant call super methods");}
   public void testCunningDeclareParents_pr92311() { runTest("cunning declare parents");}
   public void testGenericITDsAndAbstractMethodError_pr102357() { runTest("generic itds and abstract method error");}
+  public void testITDCtor_pr112783()       { runTest("Problem with constructor ITDs");}
   */
   
   public void testUnboundFormal_pr112027() { runTest("unexpected error unboundFormalInPC");}
+  public void testCCEGenerics_pr113445()       { runTest("Generics ClassCastException");}
   
   public void testBadDecp_pr110788_1() { runTest("bad generic decp - 1");}
   public void testBadDecp_pr110788_2() { runTest("bad generic decp - 2");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index b27a89870..32eadcb05 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -6,7 +6,15 @@
     <ajc-test dir="java5/staticImports" title="import static java.lang.System.out">
         <compile files="StaticImport.aj" options="-1.5"/>
     </ajc-test>
-
+    
+    <ajc-test dir="bugs150" title="Problem with constructor ITDs">
+        <compile files="pr112783.aj" options="-1.5"/>
+    </ajc-test>
+ 
+    <ajc-test dir="bugs150" title="Generics ClassCastException">
+        <compile files="pr113445.aj" options="-1.5,-emacssym"/>
+    </ajc-test>
+    
     <ajc-test dir="bugs150" title="test illegal change to pointcut declaration">
         <compile files="pr111915.java" options="-1.5 -showWeaveInfo">
           <message kind="weave" text="Join point 'method-execution(void SomeClass.doSomething())' in Type 'SomeClass' (pr111915.java:4) advised by around advice from 'DoesntCompile' (pr111915.java:15)"/>