more language tests

tests/bugs170/language/MultiCatchAspect.java

@@ -0,0 +1,36 @@
+public class MultiCatchAspect {
+
+	public static void main(String[] args) {
+        }
+}
+
+aspect X {
+
+	before(): execution(* main(..)) {
+		try {
+			foo("abc");
+		} catch (ExceptionA | ExceptionB ex) {
+			bar(ex);
+		}
+	}
+
+	public static void bar(Exception ea) {
+
+	}
+
+	public static void foo(String s) throws ExceptionA, ExceptionB {
+		if (s.equals("ta")) {
+			throw new ExceptionA();
+		} else {
+			throw new ExceptionB();
+		}
+	}
+}
+
+@SuppressWarnings("serial")
+class ExceptionA extends Exception {
+}
+
+@SuppressWarnings("serial")
+class ExceptionB extends Exception {
+}

tests/bugs170/language/TryResourcesAspect.java

@@ -0,0 +1,25 @@
+import java.io.*;
+
+public class TryResourcesAspect {
+}
+
+aspect Foo {
+  before(): execution(* *(..)) {
+    String src = "foo.txt";
+    String dest = "foocopy.txt";
+    try (
+ //     InputStream in = new FileInputStream(src);
+//      OutputStream out = new FileOutputStream(dest))
+MyCustomInputStream is = new MyCustomInputStream(src))
+      {
+         // code
+      }
+  }
+
+
+  static class MyCustomInputStream implements Closeable {
+     MyCustomInputStream(String src) {}
+     public void close() throws IOException {
+     }
+  }
+}

tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java

@@ -82,6 +82,10 @@ public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("multi catch with handler 1");
 	}
 
+	public void testMultiCatchAspect1() {
+		runTest("multi catch aspect 1");
+	}
+
 	// public void testMultiCatchWithHandler2() {
 	// runTest("multi catch with handler 2");
 	// }
@@ -102,6 +106,14 @@ public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("stackoverflow");
 	}
 
+	// public void testTryResources1() {
+	// runTest("try resources 1");
+	// }
+	//
+	// public void testTryResources2() {
+	// runTest("try resources 2");
+	// }
+
 	// ---
 
 	public static Test suite() {

tests/src/org/aspectj/systemtest/ajc170/ajc170.xml

@@ -81,6 +81,21 @@
    	</compile>
    </ajc-test>
    
+   <ajc-test dir="bugs170/language" title="multi catch aspect 1">
+   	<compile files="MultiCatchAspect.java" options="-1.7">
+   	</compile>
+   </ajc-test>
+
+   <ajc-test dir="bugs170/language" title="try resources 1">
+   	<compile files="TryResources.java" options="-1.7">
+   	</compile>
+   </ajc-test>
+   
+   <ajc-test dir="bugs170/language" title="try resources 2">
+   	<compile files="TryResourcesAspect.java" options="-1.7">
+   	</compile>
+   </ajc-test>
+   
    <ajc-test dir="bugs170/language" title="multi catch with handler 2">
    	<compile files="MultiCatchWithHandler2.java" options="-1.7">
    	</compile>