From: aclement <aclement>
Date: Wed, 25 Aug 2010 15:16:01 +0000 (+0000)
Subject: 323438
X-Git-Tag: V1_6_10RC1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eaf3ee32a5887cc90c5570202067fb87be74369b;p=aspectj.git

323438
---

diff --git a/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java b/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
index d49d0e5c9..dbb5faa7f 100644
--- 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 513fad0f5..d6a2b7652 100644
--- 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">