oops - bug number not quite right, fixed now.

diff --git a/tests/bugs151/pr112458.aj b/tests/bugs151/pr112458.aj
deleted file mode 100644 (file)
index d99f09c..0000000
--- a/tests/bugs151/pr112458.aj
+++ /dev/null
@@ -1,6 +0,0 @@
-public class pr112458<V>
-{
-    public void setInnerClasses(InnerClass[] classes){};
-
-    public static class InnerClass {}
-}

diff --git a/tests/bugs151/pr112458_2.aj b/tests/bugs151/pr112458_2.aj
deleted file mode 100644 (file)
index f17abfe..0000000
--- a/tests/bugs151/pr112458_2.aj
+++ /dev/null
@@ -1,15 +0,0 @@
-public class pr112458_2<V>
-{
-    public void setInnerClasses(InnerClass[] classes){};
-
-    public static class InnerClass {}
-
-   public static void main(String []argv) {
-     new pr112458_2();
-   }
-}
-
-aspect X {
-  before(pr112458_2.InnerClass[] ics): execution(void setInnerClasses(..)) && args(ics) {
-  }
-}

diff --git a/tests/bugs151/pr122458.aj b/tests/bugs151/pr122458.aj
new file mode 100644 (file)
index 0000000..17b0a87
--- /dev/null
+++ b/tests/bugs151/pr122458.aj
@@ -0,0 +1,6 @@
+public class pr122458<V>
+{
+    public void setInnerClasses(InnerClass[] classes){};
+
+    public static class InnerClass {}
+}

diff --git a/tests/bugs151/pr122458_2.aj b/tests/bugs151/pr122458_2.aj
new file mode 100644 (file)
index 0000000..df7da50
--- /dev/null
+++ b/tests/bugs151/pr122458_2.aj
@@ -0,0 +1,15 @@
+public class pr122458_2<V>
+{
+    public void setInnerClasses(InnerClass[] classes){};
+
+    public static class InnerClass {}
+
+   public static void main(String []argv) {
+     new pr122458_2();
+   }
+}
+
+aspect X {
+  before(pr122458_2.InnerClass[] ics): execution(void setInnerClasses(..)) && args(ics) {
+  }
+}

diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index fb6dfeaeb033316b75719c4031331383e601b84d..92c4705b58111585b8d5e4dbe0c59ab1224fa915 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -18,8 +18,8 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
          
-  public void testMemberTypesInGenericTypes_pr112458()    { runTest("member types in generic types");}
-  public void testMemberTypesInGenericTypes_pr112458_2()  { runTest("member types in generic types - 2");}
+  public void testMemberTypesInGenericTypes_pr122458()    { runTest("member types in generic types");}
+  public void testMemberTypesInGenericTypes_pr122458_2()  { runTest("member types in generic types - 2");}
   
   
   /////////////////////////////////////////

diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index ac841e12e10a4d1d06dd0abe2825253af2e82499..9a8b081a1ae621d18ceb1ce4cb0834ac2bfd75cf 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -4,12 +4,12 @@
 <suite>
     
     <ajc-test dir="bugs151" title="member types in generic types">
-        <compile files="pr112458.aj" options="-1.5 -emacssym"/>
+        <compile files="pr122458.aj" options="-1.5 -emacssym"/>
     </ajc-test>
     
     <ajc-test dir="bugs151" title="member types in generic types - 2">
-        <compile files="pr112458_2.aj" options="-1.5 -emacssym"/>
-        <run class="pr112458_2"/>
+        <compile files="pr122458_2.aj" options="-1.5 -emacssym"/>
+        <run class="pr122458_2"/>
     </ajc-test>
 
 </suite>
\ No newline at end of file