237381: fix: allow deow annotations in code style aspect

3 files changed, 37 insertions, 6 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
index 3fb9d88bc..413beb85e 100644
--- a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
@@ -16,21 +16,27 @@ import java.util.Set;
 
 import junit.framework.Test;
 
+import org.aspectj.apache.bcel.classfile.JavaClass;
+import org.aspectj.apache.bcel.classfile.LocalVariable;
+import org.aspectj.apache.bcel.classfile.LocalVariableTable;
+import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IRelationshipMap;
+import org.aspectj.testing.Utils;
 import org.aspectj.testing.XMLBasedAjcTestCase;
+import org.aspectj.tools.ajc.Ajc;
 
 public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	
 	// AspectJ1.6.1	
-	public void testGenericAtAround_pr237419() { runTest("generics ataround");}
-	public void testGenericMarkerMatch_pr203367() { runTest("generic marker match");}
+	public void testGenericAtAround_pr237419() { runTest("generics ataround"); }
+	public void testGenericMarkerMatch_pr203367() { runTest("generic marker match"); }
 //	public void testSuperItds_pr134425() { runTest("super itds"); }
 	public void testSuperItds_pr198196_1() { runTest("super itds - 2"); }
 	public void testSuperItds_pr198196_2() { runTest("super itds - 3"); }
 	public void testSuperItds_pr198196_3() { runTest("super itds - 4"); }
-//	public void testDeow_pr237381_1() { runTest("ataspectj deow - 1"); }
-//	public void testDeow_pr237381_2() { runTest("ataspectj deow - 2"); }
+	public void testDeow_pr237381_1() { runTest("ataspectj deow - 1"); }
+	public void testDeow_pr237381_2() { runTest("ataspectj deow - 2"); }
 	public void testRunningBrokenCode_pr102733_2() { runTest("running broken code - 2"); }
 	public void testRunningBrokenCode_pr102733() { runTest("running broken code"); }
 	public void testErrorOnNonabstractGenericAtAspectJAspect_pr168982() { runTest("error on non-abstract generic ataspectj aspect");}
@@ -66,7 +72,28 @@ public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
         }
     }
 
-    public void testITDPrecedence_pr233838_1() { runTest("itd precedence - 1"); }
+//	public void testLVTableAround_pr173978() throws Exception { 
+//		runTest("lv table for around");
+//		JavaClass jc = Utils.getClassFrom(ajc.getSandboxDirectory().getAbsolutePath(),"Test");
+//		Method[] ms = jc.getMethods();
+//		Method m = null;
+//		for (int i = 0; i < ms.length; i++) {
+//			if (ms[i].getName().equals("sayHello")) {
+//				m = ms[i];
+//			}
+//		}
+//		if (m.getLocalVariableTable()==null) fail("Local variable table should not be null");
+//		print(m.getLocalVariableTable());
+//	}
+
+    private void print(LocalVariableTable localVariableTable) {
+    	LocalVariable[] lvs = localVariableTable.getLocalVariableTable();
+    	for (int i = 0; i < lvs.length; i++) {
+			LocalVariable localVariable = lvs[i];
+			System.out.println(localVariable);
+		}
+	}
+	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"); }
diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
index f3c3d7f6f..3f611cc5b 100644
--- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
+++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
@@ -3,6 +3,10 @@
 <!-- AspectJ v1.6.1 Tests -->
 <suite>
 
+	<ajc-test dir="bugs161/pr173978" title="lv table for around">
+    	<compile files="TestAroundAspect.java Test.java" options="-1.5"/>
+    </ajc-test>
+    
 	<ajc-test dir="bugs161/pr237419" title="generics ataround">
     	<compile files="problem/aspect/AnyAspect.java problem/SpecificService.java problem/Specific.java problem/GenericService.java problem/Generic.java" options="-1.5"/>
     	<run class="problem.SpecificService"/>
diff --git a/tests/src/org/aspectj/testing/Utils.java b/tests/src/org/aspectj/testing/Utils.java
index 81b84f8b9..92e0ed833 100644
--- a/tests/src/org/aspectj/testing/Utils.java
+++ b/tests/src/org/aspectj/testing/Utils.java
@@ -69,7 +69,7 @@ public class Utils {
 		return null;
 	}
 	
-	protected static JavaClass getClassFrom(String frompath,String clazzname) throws ClassNotFoundException {
+	public static JavaClass getClassFrom(String frompath,String clazzname) throws ClassNotFoundException {
 		SyntheticRepository repos = createRepos(frompath);
 		return repos.loadClass(clazzname);
 	}