From 564942953aa13b0449280d4466368b2bd63f8994 Mon Sep 17 00:00:00 2001
From: Thomas Watson <tjwatson@us.ibm.com>
Date: Mon, 26 Aug 2024 16:25:41 -0500
Subject: [PATCH] Adjust tests for rename to heritage

---
 .../io/openliberty/classloading/classpath/fat/FATSuite.java | 4 ++--
 ...EarTests.java => HeritageManifestClassPathEarTests.java} | 6 +++---
 .../bootstrap.properties                                    | 0
 .../jvm.options                                             | 0
 .../server.xml                                              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/{LegacyManifestClassPathEarTests.java => HeritageManifestClassPathEarTests.java} (94%)
 rename dev/com.ibm.ws.classloading_classpath_fat/publish/servers/{classpathTestLegacy => classpathTestHeritage}/bootstrap.properties (100%)
 rename dev/com.ibm.ws.classloading_classpath_fat/publish/servers/{classpathTestLegacy => classpathTestHeritage}/jvm.options (100%)
 rename dev/com.ibm.ws.classloading_classpath_fat/publish/servers/{classpathTestLegacy => classpathTestHeritage}/server.xml (85%)

diff --git a/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/FATSuite.java b/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/FATSuite.java
index 041f38c8882a..493d7f2a0c7c 100644
--- a/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/FATSuite.java
+++ b/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/FATSuite.java
@@ -55,12 +55,12 @@
 @RunWith(Suite.class)
 @SuiteClasses({
     ManifestClassPathEarTests.class,
-    LegacyManifestClassPathEarTests.class,
+    HeritageManifestClassPathEarTests.class,
     LibraryEarTests.class
 })
 public class FATSuite {
     static final String CLASSPATH_TEST_SERVER = "classpathTest";
-    static final String CLASSPATH_TEST_LEGACY_SERVER = "classpathTestLegacy";
+    static final String CLASSPATH_TEST_HERITAGE_SERVER = "classpathTestHeritage";
     static final String PRIVATE_LIBRARY_TEST_SERVER = "privateLibraryTest";
 
     // ##### ARCHIVE NAMES #####
diff --git a/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/LegacyManifestClassPathEarTests.java b/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/HeritageManifestClassPathEarTests.java
similarity index 94%
rename from dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/LegacyManifestClassPathEarTests.java
rename to dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/HeritageManifestClassPathEarTests.java
index a4e29b4392a8..e8e39227cc69 100644
--- a/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/LegacyManifestClassPathEarTests.java
+++ b/dev/com.ibm.ws.classloading_classpath_fat/fat/src/io/openliberty/classloading/classpath/fat/HeritageManifestClassPathEarTests.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package io.openliberty.classloading.classpath.fat;
 
-import static io.openliberty.classloading.classpath.fat.FATSuite.CLASSPATH_TEST_LEGACY_SERVER;
+import static io.openliberty.classloading.classpath.fat.FATSuite.CLASSPATH_TEST_HERITAGE_SERVER;
 import static io.openliberty.classloading.classpath.fat.FATSuite.TEST_CLASS_PATH1_APP;
 import static io.openliberty.classloading.classpath.fat.FATSuite.TEST_CLASS_PATH2_APP;
 import static io.openliberty.classloading.classpath.fat.FATSuite.TEST_CLASS_PATH3_APP;
@@ -36,9 +36,9 @@
  *
  */
 @RunWith(FATRunner.class)
-public class LegacyManifestClassPathEarTests extends FATServletClient {
+public class HeritageManifestClassPathEarTests extends FATServletClient {
 
-    @Server(CLASSPATH_TEST_LEGACY_SERVER)
+    @Server(CLASSPATH_TEST_HERITAGE_SERVER)
     @TestServlets({
         @TestServlet(servlet = LegacyClassPathServletTest1.class, contextRoot = TEST_CLASS_PATH1_APP),
         @TestServlet(servlet = LegacyClassPathServletTest2.class, contextRoot = TEST_CLASS_PATH2_APP),
diff --git a/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/bootstrap.properties b/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/bootstrap.properties
similarity index 100%
rename from dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/bootstrap.properties
rename to dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/bootstrap.properties
diff --git a/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/jvm.options b/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/jvm.options
similarity index 100%
rename from dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/jvm.options
rename to dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/jvm.options
diff --git a/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/server.xml b/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/server.xml
similarity index 85%
rename from dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/server.xml
rename to dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/server.xml
index a51158c5f2a4..131130a87f4d 100644
--- a/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestLegacy/server.xml
+++ b/dev/com.ibm.ws.classloading_classpath_fat/publish/servers/classpathTestHeritage/server.xml
@@ -6,7 +6,7 @@
         <feature>componenttest-1.0</feature>
     </featureManager>
 
-    <classloading useLegacyClassPath="true" />
+    <classloading useHeritageClassPath="true" />
     <include location="../fatTestPorts.xml"/>
 </server>