fix for problem with transform of static synchronized method on pre Java5.

2 files changed, 35 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java b/tests/src/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java
index ec4c1280a..92785bfef 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java
@@ -178,6 +178,15 @@ public class SynchronizationTransformTests extends XMLBasedAjcTestCase {
     public void testTransformWithLTW() {
     	runTest("transform with LTW");
     }
+    
+
+    public void testTransformStaticMethodPreJava5() {
+    	runTest("transform static method - preJ5");
+    }
+
+    public void testTransformStaticMethodPreJava5_2() {
+    	runTest("transform static method - packages - preJ5");
+    }
 
     // more complex code sequences...
     public void testOtherTargeters() {
diff --git a/tests/src/org/aspectj/systemtest/ajc152/synchronization.xml b/tests/src/org/aspectj/systemtest/ajc152/synchronization.xml
index 8b4a7ed47..2803a1622 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/synchronization.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/synchronization.xml
@@ -576,6 +576,32 @@
       </run>
     </ajc-test>
     
+    
+    <ajc-test dir="features152/synchronization/transformed" title="transform static method - preJ5">
+      <compile files="Fifteen.java" options="-Xjoinpoints:synchronization -1.4">
+      </compile>
+      <run class="Fifteen">
+        <stderr>
+          <line text="Locking occurring at lock(lock(Object))"/>
+          <line text="Fifteen.java"/>
+          <line text="hello"/>
+        </stderr>
+      </run>
+    </ajc-test>
+    
+    
+    <ajc-test dir="features152/synchronization/transformed" title="transform static method - packages - preJ5">
+      <compile files="Sixteen.java" options="-Xjoinpoints:synchronization -1.4">
+      </compile>
+      <run class="a.b.c.d.Sixteen">
+        <stderr>
+          <line text="Locking occurring at lock(lock(Object))"/>
+          <line text="Sixteen.java"/>
+          <line text="hello"/>
+        </stderr>
+      </run>
+    </ajc-test>
+    
     <ajc-test dir="features152/synchronization" title="obtaining locked object through getArgs">
       <compile files="LockingWithTJP.java" options="-Xjoinpoints:synchronization">
       </compile>