Restructure Java 14 / AJ 1.9.6 tests

- Java 14 feature sample classes moved from 'bugs' to 'features'
- One test case using a Java 14 preview feature was moved to the
  Java 14-only tests

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

8 files changed, 10 insertions, 9 deletions

diff --git a/tests/bugs196/java14/Jep305.java b/tests/features196/java14/Jep305.java
index 3c526aef3..3c526aef3 100644
--- a/tests/bugs196/java14/Jep305.java
+++ b/tests/features196/java14/Jep305.java
diff --git a/tests/bugs196/java14/Person.java b/tests/features196/java14/Person.java
index a74932c83..a74932c83 100644
--- a/tests/bugs196/java14/Person.java
+++ b/tests/features196/java14/Person.java
diff --git a/tests/bugs196/java14/TraceRecordComponents.aj b/tests/features196/java14/TraceRecordComponents.aj
index 80cc2444e..80cc2444e 100644
--- a/tests/bugs196/java14/TraceRecordComponents.aj
+++ b/tests/features196/java14/TraceRecordComponents.aj
diff --git a/tests/bugs196/java14/UsingPersonRecord.java b/tests/features196/java14/UsingPersonRecord.java
index a974e9913..a974e9913 100644
--- a/tests/bugs196/java14/UsingPersonRecord.java
+++ b/tests/features196/java14/UsingPersonRecord.java
diff --git a/tests/bugs196/java14/p.java b/tests/features196/java14/p.java
index a74932c83..a74932c83 100644
--- a/tests/bugs196/java14/p.java
+++ b/tests/features196/java14/p.java
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196PreviewFeaturesTests.java
index f9c68131e..56c95a265 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196PreviewFeaturesTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196PreviewFeaturesTests.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc196;
 
+import org.aspectj.apache.bcel.Constants;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.testing.XMLBasedAjcTestCaseForJava14Only;
 
@@ -17,6 +18,11 @@ import junit.framework.Test;
  */
 public class Ajc196PreviewFeaturesTests extends XMLBasedAjcTestCaseForJava14Only {
 
+  public void testRecords() {
+    runTest("simple record");
+    checkVersion("Person", Constants.MAJOR_14, Constants.PREVIEW_MINOR_VERSION);
+  }
+
   public void testRecords2() {
     runTest("using a record");
   }
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java
index 7ec224109..7fd25c04b 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java
@@ -22,11 +22,6 @@ public class Ajc196Tests extends XMLBasedAjcTestCaseForJava14OrLater {
     runTest("early resolution of supporting interfaces");
   }
 
-  public void testRecords() {
-    runTest("simple record");
-    checkVersion("Person", Constants.MAJOR_14, Constants.PREVIEW_MINOR_VERSION);
-  }
-
   public void testSwitch1() {
     runTest("switch 1");
     checkVersion("Switch1", Constants.MAJOR_14, 0);
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml
index 3ef3457d2..da38cebf7 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml
@@ -46,11 +46,11 @@
 		</run>
 	</ajc-test>
 
-	<ajc-test dir="bugs196/java14" vm="14" title="simple record">
+	<ajc-test dir="features196/java14" vm="14" title="simple record">
 		<compile files="Person.java" options="--enable-preview  -14" />
 	</ajc-test>
 
-	<ajc-test dir="bugs196/java14" vm="14" title="using a record">
+	<ajc-test dir="features196/java14" vm="14" title="using a record">
 		<compile files="Person.java UsingPersonRecord.java"
 			options="--enable-preview -14" />
 		<run class="UsingPersonRecord" vmargs="--enable-preview">
@@ -61,7 +61,7 @@
 		</run>
 	</ajc-test>
 
-	<ajc-test dir="bugs196/java14" vm="14"
+	<ajc-test dir="features196/java14" vm="14"
 		title="instanceof patterns">
 		<compile files="Jep305.java" options="--enable-preview -14" />
 		<run class="Jep305" vmargs="--enable-preview">
@@ -73,7 +73,7 @@
 	</ajc-test>
 
 
-	<ajc-test dir="bugs196/java14" vm="14"
+	<ajc-test dir="features196/java14" vm="14"
 		title="advising records">
 		<compile
 			files="TraceRecordComponents.aj Person.java UsingPersonRecord.java"