167197: moved test code to 1.6

diff --git a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
index c2abd1bab8d85d5821ff78bcbbe9d7cca916049a..266114d59f66e2f247e95f6b37475f88cb928a3c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
@@ -93,7 +93,6 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        public void testNoErrorForAtDecpInNormalClass_pr169428() { runTest( "no error for atDecp in normal class");}
 
        public void testJarsZipsNonStandardSuffix_pr186673() { runTest("jars and zips with non-standard suffix");}
-       //public void testGenericTypeParameterizedWithArrayType_pr167197() { runTest("generic type parameterized with array type");}
        
        
        public void testItdOnGenericInnerInterface_pr203646() { runTest("npe with itd on inner generic interface");}

diff --git a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
index 6c4e8c9b7adbf4e08b9a03f08f962156625fcc22..5a264299ba1498db223717de44bde1dedf74ef38 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
+++ b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
@@ -281,10 +281,6 @@
      <compile options="-1.5" files="AspectJBugTestCase.java"/>
    </ajc-test>
    
-   <ajc-test dir="bugs154/pr167197" title="generic type parameterized with array type">
-     <compile options="-1.5" files="AspectBreaker.java"/>
-   </ajc-test>
-   
    <ajc-test dir="bugs154/pr186673" title="jars and zips with non-standard suffix">
      <compile options="-1.5" files="Apple.java" outjar="apple.jar.0"/>
      <compile options="-1.5" files="Orange.java" outjar="orange.zipfoo"/>