tweaks to 1.9 tests

diff --git a/tests/src/org/aspectj/systemtest/ajc190/SanityTests19.java b/tests/src/org/aspectj/systemtest/ajc190/SanityTests19.java
index 35696931a87fec86005f2691150c5b25b7c4d57e..9434988c10bbbcd4bae2f34dcf60c798fcce47a0 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc190/SanityTests19.java
+++ b/tests/src/org/aspectj/systemtest/ajc190/SanityTests19.java
@@ -72,12 +72,7 @@ public class SanityTests19 extends org.aspectj.testing.XMLBasedAjcTestCase {
 
        public void testVersionCorrect2() throws ClassNotFoundException {
                runTest("simple - k");
-               checkVersion("A", 53, 0);
-       }
-
-       public void testVersionCorrect3() throws ClassNotFoundException {
-               runTest("simple - l");
-               checkVersion("A", 53, 0);
+               checkVersion("A", 46, 0); // source 1.9, default compliance will be 1.4
        }
 
        public void testVersionCorrect4() throws ClassNotFoundException {// check it is 49.0 when -1.5 is specified
@@ -155,7 +150,7 @@ public class SanityTests19 extends org.aspectj.testing.XMLBasedAjcTestCase {
        }
 
        protected File getSpecFile() {
-               return getClassResource("sanity-tests.xml");
+               return getClassResource("sanity-tests-19.xml");
        }
 
 }

diff --git a/tests/src/org/aspectj/systemtest/ajc190/sanity-tests-19.xml b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
new file mode 100644 (file)
index 0000000..6662dbb
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
@@ -0,0 +1,70 @@
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+
+<!-- AspectJ v1.6.0 Tests -->
+<suite>
+
+    <!-- empty class -->
+    <ajc-test dir="bugs160/simplejava" title="simple - a">
+      <compile files="SimpleA.java" options="-1.9"/>
+    </ajc-test>
+
+    <!-- class with one method -->
+    <ajc-test dir="bugs160/simplejava" title="simple - b">
+      <compile files="SimpleB.java" options="-1.9"/>
+      <run class="SimpleB"/>
+    </ajc-test>
+    
+    <!-- empty aspect -->
+    <ajc-test dir="bugs160/simplejava" title="simple - c">
+      <compile files="SimpleC.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- simple before -->
+    <ajc-test dir="bugs160/simplejava" title="simple - d">
+      <compile files="SimpleD.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- simple itd field -->
+    <ajc-test dir="bugs160/simplejava" title="simple - e">
+      <compile files="SimpleE.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- aspect with main calling a static method -->
+    <ajc-test dir="bugs160/simplejava" title="simple - f">
+      <compile files="SimpleF.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- pertarget -->
+    <ajc-test dir="bugs160/simplejava" title="simple - g">
+      <compile files="SimpleG.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- generic ctor itds -->
+    <ajc-test dir="bugs160/simplejava" title="simple - h">
+      <compile files="SimpleH.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- overriding generic itd methods -->
+    <ajc-test dir="bugs160/simplejava" title="simple - i">
+      <compile files="SimpleI.java" options="-1.9"/>
+    </ajc-test>
+    
+    <!-- check class file version is 53.0 -->
+    <ajc-test dir="bugs160/simplejava" title="simple - j">
+      <compile files="SimpleJ.java" options="-1.9"/>
+    </ajc-test>
+
+    <!-- check class file version is 53.0 -->
+    <ajc-test dir="bugs160/simplejava" title="simple - k">
+      <compile files="SimpleJ.java" options="-source 1.9"/>
+    </ajc-test>
+
+    <!-- check class file version is 53.0 -->
+    <ajc-test dir="bugs160/simplejava" title="simple - l">
+      <compile files="SimpleJ.java" options="-source 1.9 -target 1.9"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs160/simplejava" title="simple - n">
+      <compile files="SimpleN.java" options="-1.9"/>
+    </ajc-test>
+</suite>

diff --git a/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
deleted file mode 100644 (file)
index f72350b..0000000
--- a/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-    <!-- empty class -->
-    <ajc-test dir="bugs160/simplejava" title="simple - a">
-      <compile files="SimpleA.java" options="-1.9"/>
-    </ajc-test>
-
-    <!-- class with one method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - b">
-      <compile files="SimpleB.java" options="-1.9"/>
-      <run class="SimpleB"/>
-    </ajc-test>
-    
-    <!-- empty aspect -->
-    <ajc-test dir="bugs160/simplejava" title="simple - c">
-      <compile files="SimpleC.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- simple before -->
-    <ajc-test dir="bugs160/simplejava" title="simple - d">
-      <compile files="SimpleD.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- simple itd field -->
-    <ajc-test dir="bugs160/simplejava" title="simple - e">
-      <compile files="SimpleE.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- aspect with main calling a static method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - f">
-      <compile files="SimpleF.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- pertarget -->
-    <ajc-test dir="bugs160/simplejava" title="simple - g">
-      <compile files="SimpleG.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- generic ctor itds -->
-    <ajc-test dir="bugs160/simplejava" title="simple - h">
-      <compile files="SimpleH.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- overriding generic itd methods -->
-    <ajc-test dir="bugs160/simplejava" title="simple - i">
-      <compile files="SimpleI.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- check class file version is 53.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - j">
-      <compile files="SimpleJ.java" options="-1.9"/>
-    </ajc-test>
-
-    <!-- check class file version is 53.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - k">
-      <compile files="SimpleJ.java" options="-source 1.9"/>
-    </ajc-test>
-
-    <!-- check class file version is 53.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - l">
-      <compile files="SimpleJ.java" options="-source 1.9 -target 1.9"/>
-    </ajc-test>
-
-    <!-- check class file version is 49.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - m">
-      <compile files="SimpleJ.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs160/simplejava" title="simple - n">
-      <compile files="SimpleN.java" options="-1.9"/>
-    </ajc-test>
-</suite>