From e136805cb6db5243307cb6579cd2cfe84f87c2e6 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Thu, 21 Sep 2017 17:57:49 -0700
Subject: [PATCH] tweaks to 1.9 tests

---
 .../src/org/aspectj/systemtest/ajc190/SanityTests19.java | 9 ++-------
 .../ajc190/{sanity-tests.xml => sanity-tests-19.xml}     | 5 -----
 2 files changed, 2 insertions(+), 12 deletions(-)
 rename tests/src/org/aspectj/systemtest/ajc190/{sanity-tests.xml => sanity-tests-19.xml} (92%)

diff --git a/tests/src/org/aspectj/systemtest/ajc190/SanityTests19.java b/tests/src/org/aspectj/systemtest/ajc190/SanityTests19.java
index 35696931a..9434988c1 100644
--- 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.xml b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
similarity index 92%
rename from tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
rename to tests/src/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
index f72350b30..6662dbb7a 100644
--- a/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
@@ -64,11 +64,6 @@
       <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>
-- 
2.39.5