|
|
@@ -11,15 +11,36 @@ |
|
|
|
package org.aspectj.systemtest.ajc161; |
|
|
|
|
|
|
|
import java.io.File; |
|
|
|
import java.util.Iterator; |
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
import junit.framework.Test; |
|
|
|
|
|
|
|
import org.aspectj.asm.AsmManager; |
|
|
|
import org.aspectj.asm.IRelationshipMap; |
|
|
|
import org.aspectj.testing.XMLBasedAjcTestCase; |
|
|
|
|
|
|
|
public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase { |
|
|
|
|
|
|
|
// AspectJ1.6.1 |
|
|
|
public void testITDPrecedence_pr233838_1() { runTest("itd precedence - 1"); } |
|
|
|
public void testIncorrectRelationship_pr235204() { |
|
|
|
runTest("incorrect call relationship"); |
|
|
|
IRelationshipMap irm = AsmManager.getDefault().getRelationshipMap(); |
|
|
|
Set entries = irm.getEntries(); |
|
|
|
String gotit = ""; |
|
|
|
for (Iterator iterator = entries.iterator(); iterator.hasNext();) { |
|
|
|
Object object = (Object) iterator.next(); |
|
|
|
gotit = (String) object; |
|
|
|
break; |
|
|
|
} |
|
|
|
if (gotit.indexOf("method-call") == -1) { |
|
|
|
String expected = "<recursivepackage{RecursiveCatcher.java}RecursiveCatcher~recursiveCall~I?method-call(void recursivepackage.RecursiveCatcher.recursiveCall(int))"; |
|
|
|
fail("Expected '" + expected + "' but got '" + gotit + "'"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public void testITDPrecedence_pr233838_1() { |
|
|
|
runTest("itd precedence - 1"); } |
|
|
|
public void testITDPrecedence_pr233838_2() { runTest("itd precedence - 2"); } |
|
|
|
public void testGetFieldGenerics_pr227401() { runTest("getfield problem with generics");} |
|
|
|
public void testGenericAbstractAspects_pr231478() { runTest("generic abstract aspects"); } |