Skip to content

Fix test grouping on TeamCity for Gradle 9.3 #2973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-tchad wants to merge 4 commits into
base: release26.3-SNAPSHOT
Choose a base branch
from
+103 −54
Open

Fix test grouping on TeamCity for Gradle 9.3 #2973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b73fce
Fix JUnit test naming to work with TeamCity and Gradle 9.3
labkey-tchad May 1, 2026
60173d9
Code cleanup in Runner.java and JUnitTest.java
labkey-tchad May 1, 2026
41616f8
Improve test logging for Gradle 9.3 compatibility
labkey-tchad May 1, 2026
0ac0fc0
Remove redundant trim
labkey-tchad May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ project.tasks.named("uiTests").configure {
project.parent.parent.tasks.named("ijConfigure").configure {
dependsOn(initPropertiesTask)
}
project.tasks.withType(RunTestSuite).configureEach { it ->
scanForTestClasses = true // Required for Gradle 9.3
}

if (project.hasProperty('doPublishing'))
{
Expand Down
119 changes: 86 additions & 33 deletions src/org/labkey/test/Runner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,24 @@ private void updateRemainingTests(Test test, boolean failed, boolean errored)
Class<?> testClass = getTestClass(test);
_remainingTests.remove(testClass);
if (failed)
_failedTests.add(test.toString());
_failedTests.add(getTestName(test));
else if (errored)
_erroredTests.add(test.toString());
_erroredTests.add(getTestName(test));
else
_passedTests.add(test.toString());
_passedTests.add(getTestName(test));
}

private static void writeRemainingTests()
{
ArrayList<String> failedAndRemaining = new ArrayList<>();
failedAndRemaining.addAll(_failedTests);
failedAndRemaining.addAll(_erroredTests);
for (Class<?> clazz : _remainingTests)
failedAndRemaining.add(clazz.getName());
writeClasses(failedAndRemaining, getRemainingTestsFile());
if (!TestProperties.isTestRunningOnTeamCity()) // Not useful on TeamCity
{
ArrayList<String> failedAndRemaining = new ArrayList<>();
failedAndRemaining.addAll(_failedTests);
failedAndRemaining.addAll(_erroredTests);
for (Class<?> clazz : _remainingTests)
failedAndRemaining.add(clazz.getName());
writeClasses(failedAndRemaining, getRemainingTestsFile());
}
}

private static void writeClasses(List<String> tests, File file)
Expand Down Expand Up @@ -203,7 +206,7 @@ private static Class<?>[] readClasses(File recentlyFailedTestsFile, List<Class<?
filteredRecentlyFailedTests.add(item);
}
}

return filteredRecentlyFailedTests.toArray(new Class[0]);
}

Expand Down Expand Up @@ -273,8 +276,7 @@ else if (test instanceof JUnit4TestAdapter adapter)

if (_failedTests.size() + _erroredTests.size() < _maxTestFailures || _maxTestFailures <= 0)
{
final Class<?> currentTestClass = getTestClass(test);
final String currentTestName = currentTestClass.getSimpleName();
final String currentTestName = getTestName(test);

TestListener classFailListener = new TestListener()
{
Expand All @@ -298,13 +300,16 @@ public void endTest(Test _test) { }
};
testResult.addListener(classFailListener);

logToServer("=== Starting " + currentTestName + getProgress() + " ===");
LOG.info("=============== Starting " + currentTestName + getProgress() + " =================");
if (!(test instanceof JUnitTest.RemoteTest))
{
logToServer("=== Starting " + currentTestName + getProgress() + " ===");
LOG.info("=============== Starting " + currentTestName + getProgress() + " =================");
}

// This stub matches the failure generated by JUnit when it fails during static setup/teardown (e.g. @BeforeClass)
// Without this TeamCity has no way of knowing when a setup/teardown failure has been resolved
final Test loggingStub = test instanceof JUnit4TestAdapter ?
new TestSuite(currentTestClass) :
final Test loggingStub = test instanceof JUnit4TestAdapter jUnit4TestAdapter ?
new TestSuite(jUnit4TestAdapter.getTestClass()) :
null;

if (loggingStub != null)
Expand All @@ -317,10 +322,13 @@ public void endTest(Test _test) { }

testResult.removeListener(classFailListener);

String result = failed.booleanValue() || errored.booleanValue() ? "Failed " : "Completed ";
TestLogger.resetLogger();
LOG.info("=============== " + result + currentTestName + getProgress() + " =================");
logToServer("=== " + result + currentTestName + getProgress() + " ===");
if (!(test instanceof JUnitTest.RemoteTest))
{
String result = failed.booleanValue() || errored.booleanValue() ? "Failed " : "Completed ";
TestLogger.resetLogger();
LOG.info("=============== " + result + currentTestName + getProgress() + " =================");
logToServer("=== " + result + currentTestName + getProgress() + " ===");
}

}
else
Expand Down Expand Up @@ -547,7 +555,7 @@ public String describe()
}
else if (test.countTestCases() > 0)
{
suite.addTest(test);
flattenSuiteInto(suite, (TestSuite) test);
foundServerSideTest = true;
}
}
Expand All @@ -570,7 +578,7 @@ else if (specifiedSuite.startsWith("?") && specifiedSuite.length() > 1)
}
TestSuite dynamicSuite = JUnitTest.dynamicSuite(requestedSuites, excludedSuites);
if (dynamicSuite.countTestCases() > 0)
suite.addTest(dynamicSuite);
flattenSuiteInto(suite, dynamicSuite);
}
}

Expand Down Expand Up @@ -603,9 +611,9 @@ public void run(TestResult testResult)

private static void writeTimeReport()
{
int width = 60;
int width = 64;
long total = 0;
LOG.info("======================= Time Report ========================");
LOG.info(getCenteredText("Time Report", '=', width));

Duration totalCrawlTime = Duration.ZERO;
int totalUniquePages = 0;
Expand All @@ -619,7 +627,7 @@ private static void writeTimeReport()
}
for (Map.Entry<Test, Long> entry : _testStats.entrySet())
{
String testName = entry.getKey().toString();
String testName = getTestName(entry.getKey());
long duration = entry.getValue();

long percent = Math.round(100.0 * (duration / (double) total));
Expand All @@ -630,7 +638,6 @@ private static void writeTimeReport()
(_erroredTests.contains(testName) ? "ERROR" : "not run"))) +
" - " +
formatDuration(duration) + " " + percentStr;
testName = testName.substring(testName.lastIndexOf('.') + 1);

LOG.info(getFixedWidthString(testName, durationAndPercent, width));

Expand Down Expand Up @@ -686,7 +693,7 @@ private static void writeTimeReport()
}
if (!TeamCityUtils.getBuildStatistics().isEmpty())
{
LOG.info("--------------------- Build Statistics ---------------------");
LOG.info(getCenteredText("Build Statistics", '-', width));
for (String stat : TeamCityUtils.getBuildStatistics().keySet())
{
List<Number> values = TeamCityUtils.getBuildStatistics().get(stat);
Expand All @@ -702,7 +709,7 @@ private static void writeTimeReport()
Map<String, Collection<String>> actionWarnings = WebDriverWrapper.getActionWarnings();
if (!actionWarnings.isEmpty())
{
LOG.info("---------------------- Test Warnings -----------------------");
LOG.info(getCenteredText("Test Warnings", '-', width));
for (String warning : actionWarnings.keySet())
{
LOG.info(" " + warning + ":");
Expand All @@ -714,7 +721,7 @@ private static void writeTimeReport()
}
}
}
LOG.info("------------------------------------------------------------");
LOG.info("-".repeat(width));
LOG.info(getFixedWidthString("Total duration:", formatDuration(total), width) + "\n");
LOG.info("Completed " + FastDateFormat.getInstance("yyyy-MM-dd HH:mm").format(new Date()));
}
Expand Down Expand Up @@ -744,10 +751,23 @@ private static String getRowString(String[] list, int columnWidth)
private static String getFixedWidthString(String prefix, String suffix, int length)
{
int contentLength = prefix.length() + suffix.length();
int padding = Math.max(0, length - contentLength);
int padding = Math.max(1, length - contentLength);
return prefix + " ".repeat(padding) + suffix;
}

private static String getCenteredText(String text, char paddingChar, int width)
{
text = StringUtils.trimToEmpty(text);
if (text.length() > width)
return text;

text = text.isEmpty() ? "" : " " + text + " ";
int paddingLength = width - text.length();
int leftPadding = paddingLength / 2;
int rightPadding = paddingLength - leftPadding;
return Character.toString(paddingChar).repeat(leftPadding) + text + Character.toString(paddingChar).repeat(rightPadding);
}

private static TestSet getCompositeTestSet(List<String> suitesColl)
{
if (suitesColl.isEmpty())
Expand Down Expand Up @@ -1021,7 +1041,7 @@ else if (testNames.isEmpty())
Test test = e.nextElement();
Class<?> testClass = getTestClass(test);
_remainingTests.add(testClass);
LOG.info(" " + testClass.getSimpleName());
LOG.info(" " + getTestName(test));
for (String testMethod : specifiedTestMethods.getOrDefault(testClass, Collections.emptyList()))
{
LOG.info(" ." + testMethod);
Expand Down Expand Up @@ -1126,10 +1146,43 @@ private static String getModuleNameFromPath(File path)
return null;
}

private static void flattenSuiteInto(TestSuite destination, TestSuite source)
Copy link
Copy Markdown
Contributor

@labkey-danield labkey-danield May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Why not just flattenSuite ? The unanswered 'Into' is strange.

{
if (TestProperties.isTestRunningOnTeamCity())
{
// Flatten test suites so that TeamCity will correlate with results from before Gradle 9.3
Enumeration<Test> tests = source.tests();
while (tests.hasMoreElements())
{
Test t = tests.nextElement();
if (t instanceof TestSuite nested)
flattenSuiteInto(destination, nested);
else
destination.addTest(t);
}
}
else
{
destination.addTest(source);
}
}

private static String getTestName(Test test)
{
if (test instanceof JUnit4TestAdapter testAdapter)
return testAdapter.getTestClass().getSimpleName();
else if (test instanceof JUnitTest.RemoteTest remoteTest)
return remoteTest.getName();
else
return test.getClass().getSimpleName();
}

private static Class<?> getTestClass(Test test)
{
if (test instanceof JUnit4TestAdapter)
return ((JUnit4TestAdapter) test).getTestClass();
if (test instanceof JUnit4TestAdapter testAdapter)
return testAdapter.getTestClass();
else if (test instanceof JUnitTest.RemoteTest)
return JUnitTest.class;
else
return test.getClass();
}
Expand Down
35 changes: 17 additions & 18 deletions src/org/labkey/test/tests/JUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public JUnitTest()

public static TestSuite suite() throws Exception
{
return JUnitTest._suite((p) -> true, false);
return JUnitTest._suite(_ -> true, false);
}

private static String getWhen(Map<String,Object> test)
Expand Down Expand Up @@ -136,12 +136,9 @@ private static void upgradeHelper(boolean skipInitialUserChecks)
}
catch (Throwable t)
{
if (bootstrapBrowser.getWrappedDriver() != null)
{
ArtifactCollector artifactCollector = new ArtifactCollector(bootstrapBrowser, JUnitTest.class.getSimpleName());
artifactCollector.dumpPageSnapshot("ServerBootstrap", null);
artifactCollector.publishDumpedArtifacts();
}
ArtifactCollector artifactCollector = new ArtifactCollector(bootstrapBrowser, JUnitTest.class.getSimpleName());
artifactCollector.dumpPageSnapshot("ServerBootstrap", null);
artifactCollector.publishDumpedArtifacts();
throw t;
}
finally
Expand Down Expand Up @@ -176,8 +173,7 @@ public static TestSuite dynamicSuite(Collection<String> categories, Collection<S
}
catch (Throwable t)
{
LOG.error("Unable to fetch Remote JUnit tests");
t.printStackTrace();
LOG.error("Unable to fetch Remote JUnit tests", t);
TestSuite testSuite = new TestSuite();
testSuite.addTest(new Runner.ErrorTest(JUnitTest.class.getSimpleName(), t));
return testSuite;
Expand Down Expand Up @@ -289,7 +285,7 @@ else if (responseBody.contains("<title>Upgrade Status</title>") ||
catch (Throwable t)
{
upgradeError = t;
t.printStackTrace();
LOG.warn("Error during upgrade/bootstrap", t);
}
TestSuite testSuite;
try
Expand All @@ -298,7 +294,7 @@ else if (responseBody.contains("<title>Upgrade Status</title>") ||
}
catch (Exception retryException)
{
retryException.printStackTrace();
LOG.warn("Error fetching remote test suite", retryException);
testSuite = new TestSuite();
testSuite.addTest(new Runner.ErrorTest("", retryException));
}
Expand All @@ -321,7 +317,7 @@ else if (responseBody.contains("<title>Upgrade Status</title>") ||
for (String key : json.keySet())
{
AtomicInteger ioeCounter = new AtomicInteger(0);
TestSuite testsuite = new TestSuite(key);
TestSuite moduleSuite = new TestSuite(key + " Tests");
JSONArray testClassArray = json.getJSONArray(key);
// Individual tests include both the class name and the requested timeout
for (int i = 0; i < testClassArray.length(); i++)
Expand All @@ -334,17 +330,20 @@ else if (responseBody.contains("<title>Upgrade Status</title>") ||
// Timeout is represented in seconds
int timeout = testClass.getInt("timeout");
if (accept.test(testClass.toMap()))
testsuite.addTest(new RemoteTest(className, timeout, ioeCounter));
moduleSuite.addTest(new RemoteTest(className, timeout, ioeCounter));
}

}
if (!addedHeader && testsuite.countTestCases() > 0)
if (moduleSuite.countTestCases() > 0)
{
BaseJUnitTestWrapper.extraSetup = !skipInitialUserChecks;
remotesuite.addTest(new JUnit4TestAdapter(JUnitHeader.class));
addedHeader = true;
if (!addedHeader)
{
BaseJUnitTestWrapper.extraSetup = !skipInitialUserChecks;
remotesuite.addTest(new JUnit4TestAdapter(JUnitHeader.class));
addedHeader = true;
}
remotesuite.addTest(moduleSuite);
}
remotesuite.addTest(testsuite);
}
if (addedHeader)
{
Expand Down
Loading