From fbe9d7bc4b51385a0f85220c9b08402bd54be9c4 Mon Sep 17 00:00:00 2001
From: Trey Chadick <tchad@labkey.com>
Date: Wed, 10 Jan 2024 15:20:06 -0800
Subject: [PATCH] Fix tests to work with embedded tomcat (#1779)

---
 src/org/labkey/test/tests/AuditLogTest.java         |  3 +--
 .../labkey/test/tests/DatabaseDiagnosticsTest.java  | 13 +++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/org/labkey/test/tests/AuditLogTest.java b/src/org/labkey/test/tests/AuditLogTest.java
index 5d7dc7d444..9e354d8e9c 100644
--- a/src/org/labkey/test/tests/AuditLogTest.java
+++ b/src/org/labkey/test/tests/AuditLogTest.java
@@ -33,7 +33,6 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestFileUtils;
-import org.labkey.test.TestProperties;
 import org.labkey.test.TestTimeoutException;
 import org.labkey.test.WebTestHelper;
 import org.labkey.test.categories.Daily;
@@ -175,7 +174,7 @@ protected void turnOnAuditLogFile()
     protected ArrayList<String> getAuditLogFromFile() throws IOException
     {
         ArrayList<String> auditLog = new ArrayList<>();
-        File auditLogFile = new File(TestProperties.getTomcatHome(), "logs/labkey-audit.log");
+        File auditLogFile = new File(TestFileUtils.getServerLogDir(), "labkey-audit.log");
 
         try (FileReader fileReader = new FileReader(auditLogFile))
         {
diff --git a/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java b/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java
index 7c28a3b611..72a6cdcbfb 100644
--- a/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java
+++ b/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java
@@ -19,7 +19,7 @@
 import org.junit.experimental.categories.Category;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
-import org.labkey.test.TestProperties;
+import org.labkey.test.TestFileUtils;
 import org.labkey.test.WebTestHelper;
 import org.labkey.test.categories.BVT;
 import org.labkey.test.categories.CustomModules;
@@ -27,9 +27,9 @@
 import org.labkey.test.categories.Git;
 import org.labkey.test.io.Grep;
 import org.labkey.test.util.Maps;
+import org.labkey.test.util.Order;
 import org.labkey.test.util.PasswordUtil;
 import org.labkey.test.util.PipelineStatusTable;
-import org.labkey.test.util.Order;
 import org.openqa.selenium.WebElement;
 
 import java.io.File;
@@ -78,11 +78,8 @@ public void databaseCheckTest()
     @Test
     public void testTomcatLogs() throws Exception
     {
-        File tomcatHome = TestProperties.getTomcatHome();
-        assertTrue("Specified tomcat.home does not exist: " + tomcatHome +
-                "\nMake sure CATALINA_HOME is set or specify 'tomcat.home' when running tests",
-                tomcatHome != null && tomcatHome.exists());
-        File logDir = new File(tomcatHome, "logs");
+        File logDir = TestFileUtils.getServerLogDir();
+        assertTrue("Server log directory does not exist: " + logDir, logDir.isDirectory());
         File[] logs = logDir.listFiles();
         Map<File, Integer> contaminatedLogs = Grep.grep(PasswordUtil.getPassword(), logs);
         Map<String, String> failureFiles = new TreeMap<>();
@@ -90,7 +87,7 @@ public void testTomcatLogs() throws Exception
                 file -> failureFiles.put(file.getName(), "line " + contaminatedLogs.get(file)));
 
         assertTrue(String.format("These tomcat logs (in %s) contained unwanted text [%s]:\n%s",
-                tomcatHome.getAbsolutePath(), PasswordUtil.getPassword(), failureFiles.toString()),
+                logDir.getAbsolutePath(), PasswordUtil.getPassword(), failureFiles.toString()),
                 failureFiles.isEmpty());
     }