Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
id 'maven-publish'
}

import org.labkey.gradle.task.RunTestSuite
import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.GroupNames
import org.labkey.gradle.util.PomFileHelper
Expand Down Expand Up @@ -170,8 +171,15 @@ project.tasks.register("convertHarToStressXml", JavaExec) {
}
}

project.tasks.uiTests.dependsOn(initPropertiesTask)
project.parent.parent.tasks.ijConfigure.dependsOn(initPropertiesTask)
project.tasks.named("uiTests").configure {
dependsOn(initPropertiesTask)
}
project.parent.parent.tasks.named("ijConfigure").configure {
dependsOn(initPropertiesTask)
}
project.tasks.withType(RunTestSuite).configureEach { it ->
scanForTestClasses = true // Required for Gradle 9.3
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is required because we are using an older version of JUnit. If I'm understanding correctly, "JUnit Platform" was introduced with JUnit 5. So, could make a note here about possibly removing this if we update our version of JUnit.

}

if (project.hasProperty('doPublishing'))
{
Expand Down
3 changes: 3 additions & 0 deletions src/org/labkey/test/Runner.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@
import org.jetbrains.annotations.NotNull;
import org.junit.Ignore;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.junit.runner.manipulation.Filter;
import org.junit.runner.manipulation.Filterable;
import org.junit.runner.manipulation.NoTestsRemainException;
import org.junit.runners.AllTests;
import org.labkey.junit.runner.WebTestProperties;
import org.labkey.serverapi.reader.Readers;
import org.labkey.serverapi.writer.PrintWriters;
Expand Down Expand Up @@ -92,6 +94,7 @@

import static org.labkey.test.WebTestHelper.logToServer;

@RunWith(AllTests.class)
public class Runner extends TestSuite
{
static
Expand Down