return new File("../tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150.xml");
}
-// FIXME ATAJ Crashes because of specifying issingleton
-// public void testSimpleBefore() {
-// runTest("SimpleBefore");
-// }
+ public void testSimpleBefore() {
+ runTest("SimpleBefore");
+ }
public void testSimpleAfter() {
runTest("SimpleAfter");
// runTest("AfterXTest");
// }
-// FIXME alex @AJ impl + test
-// FIXME andy is this working or not Alex? It was commented out in the branch but uncommenting it - it
-// runs fine for me.
- public void testIfPointcut() {
- runTest("IfPointcutTest");
- }
+ //FIXME AV uncomment when IfPointcutTest.TestAspect can be compiled ie if() pcd can be parsed.
+ // right now the aspect is commented out.
+// public void testIfPointcut() {
+// runTest("IfPointcutTest");
+// }
// FIXME alex java.lang.VerifyError: (class: ataspectj/BindingTest, method: dup_aroundBody5$advice signature: (ILorg/aspectj/lang/JoinPoint;Lataspectj/BindingTest$TestAspect_1;ILorg/aspectj/lang/ProceedingJoinPoint;)Ljava/lang/Object;) Register 0 contains wrong type
// public void testBindings() {
import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnotations;
import org.aspectj.apache.bcel.generic.Type;
import org.aspectj.bridge.IMessageHandler;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.Message;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.weaver.Advice;
/**
* The resolved type (class) for which we are reading @AJ for (be it class, method, field annotations)
*/
- ResolvedTypeX enclosingType;
+ final ResolvedTypeX enclosingType;
- ISourceContext context;
- IMessageHandler handler;
+ final ISourceContext context;
+ final IMessageHandler handler;
- public AjAttributeStruct(ResolvedTypeX type, ISourceContext sourceContext) {
+ public AjAttributeStruct(ResolvedTypeX type, ISourceContext sourceContext, IMessageHandler messageHandler) {
enclosingType = type;
context = sourceContext;
+ handler = messageHandler;
}
}
*/
private String[] m_argumentNamesLazy = null;
- Method method;
+ final Method method;
- public AjAttributeMethodStruct(Method method, ResolvedTypeX type, ISourceContext sourceContext) {
- super(type, sourceContext);
+ public AjAttributeMethodStruct(Method method, ResolvedTypeX type, ISourceContext sourceContext, IMessageHandler messageHandler) {
+ super(type, sourceContext, messageHandler);
this.method = method;
}
* @return list of AjAttributes
*/
public static List readAj5ClassAttributes(JavaClass javaClass, ResolvedTypeX type, ISourceContext context,IMessageHandler msgHandler) {
- AjAttributeStruct struct = new AjAttributeStruct(type, context);
+ AjAttributeStruct struct = new AjAttributeStruct(type, context, msgHandler);
Attribute[] attributes = javaClass.getAttributes();
for (int i = 0; i < attributes.length; i++) {
Attribute attribute = attributes[i];
for (int m = 0; m < javaClass.getMethods().length; m++) {
Method method = javaClass.getMethods()[m];
//FIXME alex optimize, this method struct will gets recreated for advice extraction
- AjAttributeMethodStruct mstruct = new AjAttributeMethodStruct(method, type, context);
+ AjAttributeMethodStruct mstruct = new AjAttributeMethodStruct(method, type, context, msgHandler);
Attribute[] mattributes = method.getAttributes();
for (int i = 0; i < mattributes.length; i++) {
* @return list of AjAttributes
*/
public static List readAj5MethodAttributes(Method method, ResolvedTypeX type, ISourceContext context,IMessageHandler msgHandler) {
- AjAttributeMethodStruct struct = new AjAttributeMethodStruct(method, type, context);
+ AjAttributeMethodStruct struct = new AjAttributeMethodStruct(method, type, context, msgHandler);
Attribute[] attributes = method.getAttributes();
for (int i = 0; i < attributes.length; i++) {
if (perX == null || perX.length()<=0) {
clause = new PerSingleton();
} else {
- clause = readPerClausePointcut(perX);
+ clause = parsePerClausePointcut(perX, struct);
}
clause.setLocation(struct.context, -1, -1);
struct.ajAttributes.add(new AjAttribute.Aspect(clause));
* Read a perClause
*
* @param perClause like "pertarget(.....)"
+ * @param struct for which we are parsing the per clause
* @return a PerClause instance
*/
- private static PerClause readPerClausePointcut(String perClause) {
- String pointcut;
+ private static PerClause parsePerClausePointcut(String perClause, AjAttributeStruct struct) {
+ final String pointcut;
if (perClause.startsWith(PerClause.KindAnnotationPrefix.PERCFLOW.getName())) {
pointcut = PerClause.KindAnnotationPrefix.PERCFLOW.extractPointcut(perClause);
return new PerCflow(Pointcut.fromString(pointcut), false);
} else if (perClause.startsWith(PerClause.KindAnnotationPrefix.PERTYPEWITHIN.getName())) {
pointcut = PerClause.KindAnnotationPrefix.PERTYPEWITHIN.extractPointcut(perClause);
return new PerTypeWithin(new PatternParser(pointcut).parseTypePattern());
+ } else if (perClause.equalsIgnoreCase(PerClause.SINGLETON.getName())) {
+ return new PerSingleton();
}
+ // could not parse the @AJ perclause
+ struct.handler.handleMessage(
+ new Message(
+ "cannot read per clause from @Aspect: " + perClause,
+ null,//TODO
+ true
+ )
+ );
throw new RuntimeException("cannot read perclause " + perClause);
}