diff --git a/build.gradle b/build.gradle index 1f0d90b7d8..fceaad1240 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ spotless { format 'misc', { target fileTree('.') { include '**/*.md', '**/.gitignore' - exclude '**/build/**', '**/build-*/**' + exclude '**/build/**', '**/build-*/**', '**/node_modules/**' } trimTrailingWhitespace() indentWithSpaces(2) diff --git a/photon-core/src/test/java/org/photonvision/common/configuration/NetworkConfigTest.java b/photon-core/src/test/java/org/photonvision/common/configuration/NetworkConfigTest.java index 0cc3c027c4..cd4d5e1f62 100644 --- a/photon-core/src/test/java/org/photonvision/common/configuration/NetworkConfigTest.java +++ b/photon-core/src/test/java/org/photonvision/common/configuration/NetworkConfigTest.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.nio.file.Path; import org.junit.jupiter.api.Test; +import org.photonvision.common.util.TestUtils; public class NetworkConfigTest { @Test @@ -39,13 +40,13 @@ public void testSerialization() throws IOException { @Test public void testDeserializeTeamNumberOrNtServerAddress() { { - var folder = Path.of("test-resources/network-old-team-number"); + var folder = TestUtils.getResourcesFolderPath(true).resolve("network-old-team-number"); var configMgr = new ConfigManager(folder, new LegacyConfigProvider(folder)); configMgr.load(); assertEquals("9999", configMgr.getConfig().getNetworkConfig().ntServerAddress); } { - var folder = Path.of("test-resources/network-new-team-number"); + var folder = TestUtils.getResourcesFolderPath(true).resolve("network-new-team-number"); var configMgr = new ConfigManager(folder, new LegacyConfigProvider(folder)); configMgr.load(); assertEquals("9999", configMgr.getConfig().getNetworkConfig().ntServerAddress); diff --git a/shared/common.gradle b/shared/common.gradle index d383ac5918..5ed2f857a1 100644 --- a/shared/common.gradle +++ b/shared/common.gradle @@ -71,7 +71,7 @@ tasks.register('testHeadless', Test) { showStandardStreams = true } exclude '**/*BenchmarkTest*' - workingDir = "../" + workingDir = new File("${rootDir}") } jacoco { @@ -96,3 +96,10 @@ jacocoTestReport { })) } } + +// Only run headless tests from the build task +gradle.taskGraph.whenReady { graph -> + if (graph.hasTask(build)) { + test.enabled = false + } +}