Fix some unintentionally skipped tests

Author: markt-asf

test/org/apache/catalina/util/TestServerInfo.java

@@ -212,11 +212,15 @@ public void testGetJarVersionWithNoVersion() throws Exception {
      */
     @Test
     public void testServerInfoOutputWithApr() throws Exception {
-        // Only run this test if APR is available
-        Assume.assumeTrue("APR not available", AprLifecycleListener.isAprAvailable());
-
         String output = captureServerInfoOutput();
 
+        /*
+         * APR is not initialised (if present) until the version info is captured. Therefore, this test needs to made
+         * after the Server info has been collected.
+         */
+        // Only run this test if APR is available - only know this after ServerInfo has nee
+        Assume.assumeTrue("APR not available", AprLifecycleListener.isAprAvailable());
+
         // Check for APR-specific output
         Assert.assertTrue("Should contain 'APR loaded: true'", output.contains("APR loaded:     true"));
         Assert.assertTrue("Should contain APR Version", output.contains("APR Version:"));
@@ -276,11 +280,14 @@ public void testServerInfoOutputWithoutNativeLibraries() throws Exception {
      */
     @Test
     public void testAprVersionInfo() throws Exception {
-        // Only run if APR is available
-        Assume.assumeTrue("APR not available", AprLifecycleListener.isAprAvailable());
-
         String output = captureServerInfoOutput();
 
+        /*
+         * APR is not initialised (if present) until the version info is captured. Therefore, this test needs to made
+         * after the Server info has been collected.
+         */
+        Assume.assumeTrue("APR not available", AprLifecycleListener.isAprAvailable());
+
         // Verify version info format (should contain version numbers)
         String[] lines = output.split("\n");
         boolean foundAprVersion = false;
@@ -313,7 +320,12 @@ public void testAprVersionInfo() throws Exception {
      */
     @Test
     public void testTomcatNativeVersionWarningWithRealVersion() throws Exception {
-        // Only run if APR is available
+        captureServerInfoOutput();
+
+        /*
+         * APR is not initialised (if present) until the version info is captured. Therefore, this test needs to made
+         * after the Server info has been collected.
+         */
         Assume.assumeTrue("APR not available", AprLifecycleListener.isAprAvailable());
 
         // If APR is available, getTcnVersionWarning() should return non-null if version is old,