diff options
| author | Andy Clement <andrew.clement@gmail.com> | 2013-02-05 10:45:03 -0800 |
|---|---|---|
| committer | Andy Clement <andrew.clement@gmail.com> | 2013-02-05 10:45:03 -0800 |
| commit | 46f90792c01a4333eb62bc2ea6a1dcfb3efb0d23 (patch) | |
| tree | cb87366ed08b03f6a9a32a6084878406b4c7aaca /tests/src/org | |
| parent | 4af4b1e634c9dbb8af1741aad22a2c3441aa1751 (diff) | |
| download | aspectj-46f90792c01a4333eb62bc2ea6a1dcfb3efb0d23.tar.gz aspectj-46f90792c01a4333eb62bc2ea6a1dcfb3efb0d23.zip | |
394535: fix
Diffstat (limited to 'tests/src/org')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java | 18 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc172/ajc172.xml | 7 |
2 files changed, 20 insertions, 5 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java b/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java index e6f5c292c..059faf8a5 100644 --- a/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java @@ -23,6 +23,19 @@ import org.aspectj.testing.XMLBasedAjcTestCase; */ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { + // if the test is failing because the classes won't run, remove the run blocks from the ajc172.xml entry and re-run to check signatures. + public void testSignatures_pr394535() throws Exception { + runTest("signatures"); + + JavaClass jc = getClassFrom(ajc.getSandboxDirectory(),"Bug2$ClassA2"); // the working one + String sss = jc.getSignatureAttribute().getSignature(); + assertEquals("<T::LBug2$Interface12;:LBug2$Interface22;>Ljava/lang/Object;Ljava/io/Serializable;", sss); + + jc = getClassFrom(ajc.getSandboxDirectory(),"Bug$ClassA"); + sss = jc.getSignatureAttribute().getSignature(); + assertEquals("<T::LBug$Interface1;:LBug$Interface2;>Ljava/lang/Object;Ljava/io/Serializable;", sss); + } + // extends public void testPSignatures_pr399590() throws Exception { runTest("p signatures 1"); @@ -32,7 +45,6 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<+LCage2<TT;>;>;>LBar2;Ljava/io/Serializable;", sss); - jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); } // extends two classes @@ -44,7 +56,6 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<+LCage2<TT;LIntf2;>;LIntf2;>;Q:Ljava/lang/Object;>LBar2;Ljava/io/Serializable;", sss); - jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); } // super @@ -56,7 +67,6 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<-LXXX2<TT;>;>;>LBar2;Ljava/io/Serializable;", sss); - jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); } // super @@ -68,7 +78,6 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<-LXXX2<TT;>;LYYY2;>;>LBar2;Ljava/io/Serializable;", sss); - jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); } // unbound @@ -80,7 +89,6 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<*>;>LBar2;Ljava/io/Serializable;", sss); - jc = getClassFrom(ajc.getSandboxDirectory(),"Cage2"); } public void testIfPointcutNames_pr398246() throws Exception { diff --git a/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml b/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml index 6d6ffa6f8..5c0739fb2 100644 --- a/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml +++ b/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml @@ -2,6 +2,13 @@ <suite> + <ajc-test dir="bugs172/pr394535" title="signatures"> + <compile files="Bug.java" options="-1.5"/> + <compile files="Bug2.java" options="-1.5"/> + <run class="Bug2"/> + <run class="Bug"/> + </ajc-test> + <ajc-test dir="bugs172/pr399590" title="p signatures 1"> <compile files="Cage.java" options="-1.5"/> <compile files="Cage2.java" options="-1.5"/> |