323438

diff --git a/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java b/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
index d49d0e5c9ae72949e3e4baab69ffe2955961cd56..dbb5faa7f5f669895594670cffdf1355519198a0 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
+++ b/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
@@ -34,6 +34,18 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
        }
   }
   
+ 
+  
+  public void testMakeSJPOptimizationCollapsedSJPYes14() { 
+         this.
+         runTest("makeSJP optimization - Collapsed SJP - Yes 1.4");
+         try {
+               JavaClass myClass = getMyClass("B");
+       } catch (Exception e) {
+               NewFeatures.fail(e.toString());
+       }
+  }
+  
   public void testMakeSJPOptimizationLDCYes() { 
          this.
          runTest("makeSJP optimization - LDC - Yes");

diff --git a/tests/src/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml b/tests/src/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml
index 513fad0f5f1142c7684baf4acd2fcae6a67cc519..d6a2b7652ddc64cdc83ef33cb1586dc55f08e096 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml
@@ -46,6 +46,19 @@
       </run>
     </ajc-test>  
  
+      <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - Collapsed SJP - Yes 1.4">
+      <compile files="B.java Azpect.aj" options="-1.4 -Xset:targetRuntime1_6_10=true"/>
+      <run class="B">
+               <stdout>
+                <line text="execution(public static void B.main(java.lang.String[]))"/>
+                <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
+                <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>                
+                <line text="execution(private void B.method3())"/>
+                <line text="execution(public static void B.method4())"/>
+       </stdout>
+      </run>
+    </ajc-test>  
+ 
     <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - Collapsed SJP - No">
       <compile files="B.java Azpect.aj" options="-1.5 -Xset:targetRuntime1_6_10=false"/>
       <run class="B">