Fix tests.

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

@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -21,6 +23,7 @@ public class ConfigurationUtilsTest {
     @Test
     public void findCompileClasspathSourceSetHandlesImplementationAndCompileClasspath() {
         final Configuration compileClasspath = mock(Configuration.class);
+        final Configuration compileOnly = mock(Configuration.class);
         final Configuration implementation = mock(Configuration.class);
 
         final ConfigurationContainer configurations = mock(ConfigurationContainer.class);
@@ -30,6 +33,7 @@ public void findCompileClasspathSourceSetHandlesImplementationAndCompileClasspat
         final SourceSetContainer sourceSets = mock(SourceSetContainer.class);
         final SourceSet mainSourceSet = mock(SourceSet.class);
 
+        when(configurations.findByName("compileOnly")).thenReturn(compileOnly);
         when(configurations.findByName("compileClasspath")).thenReturn(compileClasspath);
         when(configurations.findByName("implementation")).thenReturn(implementation);
 
@@ -41,20 +45,22 @@ public void findCompileClasspathSourceSetHandlesImplementationAndCompileClasspat
         when(sourceSets.getByName("main")).thenReturn(mainSourceSet);
         when(mainSourceSet.getCompileClasspathConfigurationName()).thenReturn("compileClasspath");
         when(mainSourceSet.getImplementationConfigurationName()).thenReturn("implementation");
+        when(mainSourceSet.getCompileOnlyConfigurationName()).thenReturn("compileOnly");
         doAnswer(invocationOnMock -> {
             final Consumer<SourceSet> argument = invocationOnMock.getArgument(0);
             argument.accept(mainSourceSet);
             return null;
         }).when(sourceSets).forEach(ArgumentMatchers.any());
 
+        when(compileOnly.getName()).thenReturn("compileOnly");
         when(compileClasspath.getName()).thenReturn("compileClasspath");
         when(implementation.getName()).thenReturn("implementation");
 
-        when(compileClasspath.getExtendsFrom()).thenReturn(buildConfigurationSet(implementation));
+        when(compileClasspath.getExtendsFrom()).thenReturn(buildConfigurationSet(implementation, compileOnly));
 
         final List<Configuration> result = ConfigurationUtils.findCompileOnlyConfigurationForSourceSetReplacement(project, implementation);
 
-        Assertions.assertEquals(buildConfigurationList(compileClasspath), result);
+        Assertions.assertEquals(buildConfigurationList(compileOnly), result);
     }
 
     @Test
@@ -72,6 +78,17 @@ public void findRuntimeClasspathSourceSetHandlesImplementationAndRuntimeClasspat
         when(configurations.findByName("runtimeClasspath")).thenReturn(runtimeClasspath);
         when(configurations.findByName("implementation")).thenReturn(implementation);
 
+        final List<Configuration> newConfigurations = new ArrayList<>();
+        when(configurations.maybeCreate(any())).thenAnswer((Answer<Configuration>) invocationOnMock -> {
+            final String name = invocationOnMock.getArgument(0);
+            final Configuration configuration = mock(Configuration.class);
+            when(configuration.getName()).thenReturn(name);
+
+            newConfigurations.add(configuration);
+
+            return configuration;
+        });
+
         when(project.getConfigurations()).thenReturn(configurations);
 
         when(project.getExtensions()).thenReturn(extensions);
@@ -80,6 +97,7 @@ public void findRuntimeClasspathSourceSetHandlesImplementationAndRuntimeClasspat
         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);
@@ -93,7 +111,7 @@ public void findRuntimeClasspathSourceSetHandlesImplementationAndRuntimeClasspat
 
         final List<Configuration> result = ConfigurationUtils.findRuntimeOnlyConfigurationFromSourceSetReplacement(project, implementation);
 
-        Assertions.assertEquals(buildConfigurationList(runtimeClasspath), result);
+        Assertions.assertEquals(newConfigurations, result);
     }
 
     @Test

gradle.properties

@@ -36,4 +36,4 @@ spock_version=2.1
 spock_groovy_version=3.0
 mockito_version=4.11.0
 jimfs_version=1.2
-trainingwheels_version=1.0.44
+trainingwheels_version=1.0.45