Skip to content

Commit 246c7de

Browse files
Test coverage for Server JavaScript Console (#2465)
Co-authored-by: labkey-danield <danield@labkey.com>
1 parent 82ef734 commit 246c7de

3 files changed

Lines changed: 39 additions & 0 deletions

File tree

src/org/labkey/test/pages/core/admin/ShowAdminPage.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,12 @@ public void clickCredits()
240240
clickAndWait(elementCache().creditsLink);
241241
}
242242

243+
public void clickViewPrimarySiteLogFile()
244+
{
245+
goToSettingsSection();
246+
clickAndWait(elementCache().viewPrimarySiteLogFileLink);
247+
}
248+
243249
public void clickPostgresActivity()
244250
{
245251
goToSettingsSection();
@@ -296,6 +302,7 @@ protected class ElementCache extends LabKeyPage.ElementCache
296302
protected WebElement systemPropertiesLink = Locator.linkContainingText("system properties").findWhenNeeded(this);
297303
protected WebElement viewsAndScriptingLink = Locator.linkWithText("views and scripting").findWhenNeeded(this);
298304
protected WebElement creditsLink = Locator.linkWithText("credits").findWhenNeeded(this);
305+
protected WebElement viewPrimarySiteLogFileLink = Locator.linkWithText("view primary site log file").findWhenNeeded(this);
299306

300307
protected WebElement postgresActivityLink = Locator.linkWithText("postgres activity").findWhenNeeded(this);
301308
protected WebElement postgresLocksLink = Locator.linkWithText("postgres locks").findWhenNeeded(this);

src/org/labkey/test/tests/BasicTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.labkey.test.categories.Git;
2929
import org.labkey.test.categories.Hosting;
3030
import org.labkey.test.categories.Smoke;
31+
import org.labkey.test.pages.core.admin.ShowAdminPage;
3132
import org.labkey.test.util.Order;
3233

3334
import java.util.List;
@@ -61,6 +62,21 @@ public void testScripts()
6162
assertTextNotPresent("WARNING:");
6263
}
6364

65+
@Test
66+
public void testStartupLogging()
67+
{
68+
ShowAdminPage adminPage = goToAdminConsole();
69+
adminPage.clickViewPrimarySiteLogFile();
70+
71+
// Issue 52684: Ensure Log4J is capturing startup logging from:
72+
assertTextPresent(
73+
"Starting LabKeyServer using", // Our "embedded" code (the primary entry point)
74+
"Starting Servlet engine", // Spring Boot and Tomcat
75+
"Exploding module archives", // Our "bootstrap" code (extracts modules and sets up webapp classloading)
76+
"LabKey-managed modules to ensure they're recent enough to upgrade" // Our code inside the webapp
77+
);
78+
}
79+
6480
@Override
6581
public List<String> getAssociatedModules()
6682
{

src/org/labkey/test/tests/TriggerScriptTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.labkey.test.WebTestHelper;
3535
import org.labkey.test.categories.Daily;
3636
import org.labkey.test.categories.Data;
37+
import org.labkey.test.components.html.SiteNavBar;
3738
import org.labkey.test.pages.ImportDataPage;
3839
import org.labkey.test.params.FieldDefinition;
3940
import org.labkey.test.params.FieldDefinition.ColumnType;
@@ -448,7 +449,22 @@ public void testDataClassIndividualTriggers() throws Exception
448449
GoToDataUI goToDataClass = () -> goTo("Data Classes", DATA_CLASSES_NAME);
449450

450451
setupDataClass();
452+
453+
// Go to the log view to start capturing messages
454+
new SiteNavBar(getDriver()).clickAdminMenuItem(false, "Developer Links", "Server JavaScript Console");
455+
switchToWindow(1);
456+
waitForText("Message");
457+
458+
switchToMainWindow();
451459
doIndividualTriggerTest("query", goToDataClass, "Name", false, "Yes, Delete", false);
460+
461+
// Go back to the console window
462+
switchToWindow(1);
463+
waitForText("init got triggered with event: delete",
464+
"exp.data: this is from the shared function",
465+
"complete got triggered with event: delete");
466+
getDriver().close();
467+
switchToMainWindow();
452468
}
453469

454470

0 commit comments

Comments
 (0)