Fix tests

And push new tests for ConfigurationUtils

common/src/test/java/net/neoforged/gradle/common/util/ConfigurationUtilsTest.java

@@ -0,0 +1,137 @@
+package net.neoforged.gradle.common.util;
+
+import net.neoforged.gradle.dsl.common.util.ConfigurationUtils;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ConfigurationContainer;
+import org.gradle.api.plugins.ExtensionContainer;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
+
+import java.util.*;
+import java.util.function.Consumer;
+
+import static org.mockito.Mockito.*;
+
+public class ConfigurationUtilsTest {
+
+    @Test
+    public void findCompileClasspathSourceSetHandlesImplementationAndCompileClasspath() {
+        final Configuration compileClasspath = mock(Configuration.class);
+        final Configuration implementation = mock(Configuration.class);
+
+        final ConfigurationContainer configurations = mock(ConfigurationContainer.class);
+        final Project project = mock(Project.class);
+        final ExtensionContainer extensions = mock(ExtensionContainer.class);
+
+        final SourceSetContainer sourceSets = mock(SourceSetContainer.class);
+        final SourceSet mainSourceSet = mock(SourceSet.class);
+
+        when(configurations.findByName("compileClasspath")).thenReturn(compileClasspath);
+        when(configurations.findByName("implementation")).thenReturn(implementation);
+
+        when(project.getConfigurations()).thenReturn(configurations);
+
+        when(project.getExtensions()).thenReturn(extensions);
+        when(extensions.getByType(SourceSetContainer.class)).thenReturn(sourceSets);
+
+        when(sourceSets.getByName("main")).thenReturn(mainSourceSet);
+        when(mainSourceSet.getCompileClasspathConfigurationName()).thenReturn("compileClasspath");
+        when(mainSourceSet.getImplementationConfigurationName()).thenReturn("implementation");
+        doAnswer(invocationOnMock -> {
+            final Consumer<SourceSet> argument = invocationOnMock.getArgument(0);
+            argument.accept(mainSourceSet);
+            return null;
+        }).when(sourceSets).forEach(ArgumentMatchers.any());
+
+        when(compileClasspath.getName()).thenReturn("compileClasspath");
+        when(implementation.getName()).thenReturn("implementation");
+
+        when(compileClasspath.getExtendsFrom()).thenReturn(buildConfigurationSet(implementation));
+
+        final List<Configuration> result = ConfigurationUtils.findCompileClasspathSourceSet(project, implementation);
+
+        Assertions.assertEquals(buildConfigurationList(compileClasspath), result);
+    }
+
+    @Test
+    public void findRuntimeClasspathSourceSetHandlesImplementationAndRuntimeClasspath() {
+        final Configuration runtimeClasspath = mock(Configuration.class);
+        final Configuration implementation = mock(Configuration.class);
+
+        final ConfigurationContainer configurations = mock(ConfigurationContainer.class);
+        final Project project = mock(Project.class);
+        final ExtensionContainer extensions = mock(ExtensionContainer.class);
+
+        final SourceSetContainer sourceSets = mock(SourceSetContainer.class);
+        final SourceSet mainSourceSet = mock(SourceSet.class);
+
+        when(configurations.findByName("runtimeClasspath")).thenReturn(runtimeClasspath);
+        when(configurations.findByName("implementation")).thenReturn(implementation);
+
+        when(project.getConfigurations()).thenReturn(configurations);
+
+        when(project.getExtensions()).thenReturn(extensions);
+        when(extensions.getByType(SourceSetContainer.class)).thenReturn(sourceSets);
+
+        when(sourceSets.getByName("main")).thenReturn(mainSourceSet);
+        when(mainSourceSet.getRuntimeClasspathConfigurationName()).thenReturn("runtimeClasspath");
+        when(mainSourceSet.getImplementationConfigurationName()).thenReturn("implementation");
+        doAnswer(invocationOnMock -> {
+            final Consumer<SourceSet> argument = invocationOnMock.getArgument(0);
+            argument.accept(mainSourceSet);
+            return null;
+        }).when(sourceSets).forEach(ArgumentMatchers.any());
+
+        when(runtimeClasspath.getName()).thenReturn("runtimeClasspath");
+        when(implementation.getName()).thenReturn("implementation");
+
+        when(runtimeClasspath.getExtendsFrom()).thenReturn(buildConfigurationSet(implementation));
+
+        final List<Configuration> result = ConfigurationUtils.findRuntimeClasspathSourceSet(project, implementation);
+
+        Assertions.assertEquals(buildConfigurationList(runtimeClasspath), result);
+    }
+
+    @Test
+    public void getAllExtendingConfigurationOneDeepOnSuperLookup() {
+        final Configuration source = mock(Configuration.class);
+        final Configuration target = mock(Configuration.class);
+
+        when(source.getExtendsFrom()).thenReturn(buildConfigurationSet(target));
+
+        final Set<Configuration> configurations = ConfigurationUtils.getAllSuperConfigurations(source);
+
+        Assertions.assertEquals(buildConfigurationSet(target), configurations);
+    }
+
+    @Test
+    public void getAllExtendingConfigurationRecursiveOnSuperLookup() {
+        final Configuration source = mock(Configuration.class);
+        final Configuration levelOne = mock(Configuration.class);
+        final Configuration levelTwo = mock(Configuration.class);
+
+        when(source.getExtendsFrom()).thenReturn(buildConfigurationSet(levelOne));
+        when(levelOne.getExtendsFrom()).thenReturn(buildConfigurationSet(levelTwo));
+
+        final Set<Configuration> configurations = ConfigurationUtils.getAllSuperConfigurations(source);
+
+        Assertions.assertEquals(buildConfigurationSet(levelOne, levelTwo), configurations);
+    }
+
+    private Set<Configuration> buildConfigurationSet(Configuration... configurations) {
+        final Set<Configuration> configurationSet = new HashSet<>();
+        Collections.addAll(configurationSet, configurations);
+        return configurationSet;
+    }
+
+    private List<Configuration> buildConfigurationList(Configuration... configurations) {
+        final List<Configuration> configurationSet = new ArrayList<>();
+        Collections.addAll(configurationSet, configurations);
+        return configurationSet;
+    }
+
+}

common/src/test/java/net/neoforged/gradle/common/util/MappingUtilsTest.java

@@ -1,7 +1,7 @@
 package net.neoforged.gradle.common.util;
 
 import net.neoforged.gradle.dsl.common.util.NamingConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class MappingUtilsTest {
+
     @Test
     public void mappingVersionIsFoundInMappingVersionData() {
         final Map<String, String> mappingVersionData = new HashMap<>();

dsl/common/build.gradle

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
+    api ("org.codehaus.groovy:groovy-all:${project.groovy_version}", {
+        exclude group: 'junit'
+    })
     api "commons-io:commons-io:${project.commons_io_version}"
     api "org.apache.maven:maven-artifact:${project.maven_artifact_version}"
     api "com.google.guava:guava:${project.guava_version}"

dsl/mixin/build.gradle

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
+    api("org.codehaus.groovy:groovy-all:${project.groovy_version}", {
+        exclude group: 'junit'
+    })
     api "com.google.code.gson:gson:${project.gson_version}"
     api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
 }

dsl/neoform/build.gradle

@@ -6,7 +6,9 @@ dependencies {
     api project(':dsl-common')
     api project(':utils')
 
-    api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
+    api("org.codehaus.groovy:groovy-all:${project.groovy_version}", {
+        exclude group: 'junit'
+    })
     api "com.google.code.gson:gson:${project.gson_version}"
     api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
 }

dsl/platform/build.gradle

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
+    api("org.codehaus.groovy:groovy-all:${project.groovy_version}", {
+        exclude group: 'junit'
+    })
     api "com.google.code.gson:gson:${project.gson_version}"
     api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
 

dsl/userdev/build.gradle

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
+    api("org.codehaus.groovy:groovy-all:${project.groovy_version}", {
+        exclude group: 'junit'
+    })
     api "com.google.code.gson:gson:${project.gson_version}"
     api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
 

dsl/vanilla/build.gradle

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
+    api("org.codehaus.groovy:groovy-all:${project.groovy_version}", {
+        exclude group: 'junit'
+    })
     api "com.google.code.gson:gson:${project.gson_version}"
     api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
 

gradle.properties

@@ -37,3 +37,5 @@ spock_groovy_version=3.0
 mockito_version=4.11.0
 jimfs_version=1.2
 trainingwheels_version=1.0.42
+
+githubCiTesting=true