refactored tests for 154552 - use new model testing structure

3 files changed, 18 insertions, 46 deletions

diff --git a/tests/bugs152/pr141730.aj b/tests/bugs152/pr141730.aj
deleted file mode 100644
index 65b90d37a..000000000
--- a/tests/bugs152/pr141730.aj
+++ /dev/null
@@ -1,46 +0,0 @@
-import java.util.List;
-
-aspect A {
-
-	pointcut p() : execution(* *.*(..));
-	
-	before() : p() {}
-	
-	public void MyClass.method() {}
-	
-	public MyClass.new() {super();}
-}
-
-class C {
-	
-	public C() {}
-	
-	public void method() {}
-	
-	public void intMethod(int i) {}
-	
-	public void stringMethod(String s) {}
-	
-	public void myClassMethod(MyClass s) {}
-	
-	public void genericMethod(List<String> l) {}
-	
-	public void twoArgsMethod(int i, String s) {}
-	
-	public void genericMethod2(MyGenericClass<String,MyClass> m) {}
-	
-	public static void main(String[] args) {}
-	
-	public void multiMethod(String[][] s) {}
-	
-	public void intArray(int[] i) {}
-	
-}
-
-class MyClass {
-	
-	public MyClass(String s) {}
-	
-}
-
-class MyGenericClass<X,Y> {}
diff --git a/tests/bugs152/pr141730a.java b/tests/bugs152/pr141730a.java
new file mode 100644
index 000000000..a997fe7dc
--- /dev/null
+++ b/tests/bugs152/pr141730a.java
@@ -0,0 +1,7 @@
+class C {
+	
+	public void stringMethod(String s) {}
+	public static void main(String[] args) {}
+	public void multiMethod(String[][] s) {}
+
+}
diff --git a/tests/bugs152/pr141730b.java b/tests/bugs152/pr141730b.java
new file mode 100644
index 000000000..9d7ad4e76
--- /dev/null
+++ b/tests/bugs152/pr141730b.java
@@ -0,0 +1,11 @@
+import java.util.List;
+class C {
+	
+	public void genericMethod(List<String> l) {}
+	public void genericMethod2(MyGenericClass<String,MyClass> m) {}
+
+}
+
+class MyClass {}
+
+class MyGenericClass<X,Y> {}