Browse Source

fixed order of join points during initialization to match 1.1

tags/V_1_1_b5
jhugunin 21 years ago
parent
commit
4cfe43bc0c
1 changed files with 15 additions and 5 deletions
  1. 15
    5
      tests/new/NegativeSourceLocation.java

+ 15
- 5
tests/new/NegativeSourceLocation.java View File

} }
public static final void found(String s) { public static final void found(String s) {
Tester.event(s); Tester.event(s);
//System.err.println(s);
} }
public static final void checkAll() { public static final void checkAll() {
Tester.checkAllEvents(); Tester.checkAllEvents();
staticString = u.toString(); staticString = u.toString();
} }
public void run() { // execute - no thisEnclosingJoinPoint when called from Thread.start() public void run() { // execute - no thisEnclosingJoinPoint when called from Thread.start()
boolean doNotOptimize = (TargetClass.class != null);
boolean doNotOptimize = (staticString != null);
if (doNotOptimize) internalRun(); if (doNotOptimize) internalRun();
} }
private void internalRun() { // execute private void internalRun() { // execute
aspect Aspect { aspect Aspect {


// ------------------------------- pointcuts select logical sets of join points // ------------------------------- pointcuts select logical sets of join points
// 1.1 includes StringBuffer calls that weren't in 1.0
pointcut allTargetJoinPoints() pointcut allTargetJoinPoints()
: within(TargetClass) ;
: within(TargetClass) &&
!call(* StringBuffer.*(..)) && !call(StringBuffer.new(..))
&& !call(* String.valueOf(Object));


/** these have no enclosing join point */ /** these have no enclosing join point */
pointcut noEnclosingJoinPoint() pointcut noEnclosingJoinPoint()
/** @testcase all join points have non-null thisJoinPoint and thisJoinPointStaticPart */ /** @testcase all join points have non-null thisJoinPoint and thisJoinPointStaticPart */
before(): allTargetJoinPoints() { before(): allTargetJoinPoints() {
Signal.found("before AllTargetJoinPoints " + thisJoinPointStaticPart); Signal.found("before AllTargetJoinPoints " + thisJoinPointStaticPart);
//System.err.println(thisJoinPointStaticPart + " at " + thisJoinPointStaticPart.getSourceLocation());
String test = "all join points have non-null thisJoinPointStaticPart"; String test = "all join points have non-null thisJoinPointStaticPart";
if (null == thisJoinPoint) { if (null == thisJoinPoint) {
Signal.failed(test + " failed with null thisJoinPoint: " + thisJoinPointStaticPart); Signal.failed(test + " failed with null thisJoinPoint: " + thisJoinPointStaticPart);
"before AllTargetJoinPoints staticinitialization(TargetClass.<clinit>)" "before AllTargetJoinPoints staticinitialization(TargetClass.<clinit>)"
, "before AllTargetJoinPoints set(String TargetClass.staticString)" , "before AllTargetJoinPoints set(String TargetClass.staticString)"
, "before AllTargetJoinPoints get(String TargetClass.staticString)" , "before AllTargetJoinPoints get(String TargetClass.staticString)"
, "before AllTargetJoinPoints get(String TargetClass.staticString)"
, "before AllTargetJoinPoints set(String TargetClass.staticString)" , "before AllTargetJoinPoints set(String TargetClass.staticString)"
, "before AllTargetJoinPoints set(String TargetClass.staticString)" , "before AllTargetJoinPoints set(String TargetClass.staticString)"
, "before AllTargetJoinPoints preinitialization(TargetClass())"
, "before AllTargetJoinPoints initialization(java.lang.Runnable())"
, "before AllTargetJoinPoints execution(java.lang.Runnable())"
, "before AllTargetJoinPoints initialization(TargetClass())" , "before AllTargetJoinPoints initialization(TargetClass())"
, "before AllTargetJoinPoints execution(TargetClass.<init>)"
//, "before AllTargetJoinPoints execution(TargetClass.<init>)"
, "before AllTargetJoinPoints set(String TargetClass.string)" , "before AllTargetJoinPoints set(String TargetClass.string)"
, "before AllTargetJoinPoints execution(TargetClass())" , "before AllTargetJoinPoints execution(TargetClass())"
, "before AllTargetJoinPoints execution(void TargetClass.run())" , "before AllTargetJoinPoints execution(void TargetClass.run())"
, "before AllTargetJoinPoints get(String TargetClass.staticString)" , "before AllTargetJoinPoints get(String TargetClass.staticString)"
, "before AllTargetJoinPoints set(String TargetClass.staticString)" , "before AllTargetJoinPoints set(String TargetClass.staticString)"
, "before AllTargetJoinPoints call(TargetClass())" , "before AllTargetJoinPoints call(TargetClass())"
, "before AllTargetJoinPoints preinitialization(TargetClass())"
, "before AllTargetJoinPoints initialization(TargetClass())" , "before AllTargetJoinPoints initialization(TargetClass())"
, "before AllTargetJoinPoints execution(TargetClass.<init>)"
, "before AllTargetJoinPoints initialization(java.lang.Runnable())"
, "before AllTargetJoinPoints execution(java.lang.Runnable())"
//, "before AllTargetJoinPoints execution(TargetClass.<init>)"
, "before AllTargetJoinPoints set(String TargetClass.string)" , "before AllTargetJoinPoints set(String TargetClass.string)"
, "before AllTargetJoinPoints execution(TargetClass())" , "before AllTargetJoinPoints execution(TargetClass())"
, "before AllTargetJoinPoints call(String java.lang.Object.toString())" , "before AllTargetJoinPoints call(String java.lang.Object.toString())"

Loading…
Cancel
Save