From: aclement <aclement>
Date: Mon, 1 Dec 2008 20:26:04 +0000 (+0000)
Subject: 213751: 249216: tests
X-Git-Tag: V1_6_3rc1~75
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd586e1891caecc3760a77305e9fe051759f98ab;p=aspectj.git

213751: 249216: tests
---

diff --git a/tests/bugs163/pr213751/Foo.java b/tests/bugs163/pr213751/Foo.java
new file mode 100644
index 000000000..600ad04d3
--- /dev/null
+++ b/tests/bugs163/pr213751/Foo.java
@@ -0,0 +1,14 @@
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.*;
+
+public abstract aspect Foo {
+	    public abstract pointcut targetPointcut();
+
+	        @Around("targetPointcut()")
+			    public Object someAdvice(ProceedingJoinPoint thisJoinPoint)
+			        {
+					        return thisJoinPoint.proceed();
+						    }
+}
+
+
diff --git a/tests/bugs163/pr249216/Handles.java b/tests/bugs163/pr249216/Handles.java
new file mode 100644
index 000000000..ecf8d0599
--- /dev/null
+++ b/tests/bugs163/pr249216/Handles.java
@@ -0,0 +1,12 @@
+import java.util.*;
+
+public aspect Handles {
+  public java.util.List<String> Ship.i(List<String>[][] u) {
+	        return null;
+  }
+  public java.util.List<String> Ship.i(Set<String>[][] u) {
+	        return null;
+  }
+}
+
+class Ship {}
diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index 60fe1616f..ade3cc854 100644
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -32,6 +32,18 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("getMethod returning null");
 	}
 
+	public void testMixedStyles_pr213751() {
+		runTest("mixed styles");
+	}
+/*
+	public void testHandles_pr249216c24() {
+		runTest("handles - escaped square brackets");
+		IHierarchy top = AsmManager.lastActiveStructureModel.getHierarchy();
+		IProgramElement itd = findElementAtLine(top.getRoot(), 4);
+		// System.out.println(itd.getHandleIdentifier());
+		assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[String;>;", itd.getHandleIdentifier());
+	}
+*/
 	public void testFQType_pr256937() {
 		runTest("fully qualified return type");
 		IHierarchy top = AsmManager.lastActiveStructureModel.getHierarchy();
diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index 400923d5a..59cff5430 100644
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -23,6 +23,14 @@
    	  <compile files="Ship.java ShipAccessor.java" options="-emacssym -1.5"/>
     </ajc-test>
     
+    <ajc-test dir="bugs163/pr213751" title="mixed styles">
+   	  <compile files="Foo.java" options="-emacssym -1.5"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs163/pr249216" title="handles - escaped square brackets">
+   	  <compile files="Handles.java" options="-emacssym -1.5"/>
+    </ajc-test>
+    
     <ajc-test dir="bugs163/pr254207" title="ordering issue">
       <compile files="Abstract.java Concrete.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
         <message kind="error" line="1" text="Bound mismatch"/>