diff --git a/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedPackValidationPublicationTest.java b/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedPackValidationPublicationTest.java index 03d146a34..16337e351 100644 --- a/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedPackValidationPublicationTest.java +++ b/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedPackValidationPublicationTest.java @@ -7,6 +7,7 @@ import art.arcane.iris.pack.PackValidationCache; import art.arcane.iris.pack.PackValidationResult; import art.arcane.iris.pack.PackValidator; import org.junit.After; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -31,8 +32,18 @@ public class ModdedPackValidationPublicationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + private final AtomicReference context = new AtomicReference<>("context"); + private MockedStatic cache; + + @Before + public void pinValidationContext() { + cache = mockStatic(PackValidationCache.class); + cache.when(PackValidationCache::contextFingerprint).thenAnswer(ignored -> context.get()); + } + @After public void clearValidation() { + cache.close(); PackValidationRegistry.clear(); } @@ -71,12 +82,10 @@ public class ModdedPackValidationPublicationTest { @Test public void snapshotValidationReparsesChangedRegistryContext() throws Exception { File root = temporaryFolder.newFolder("snapshot"); - AtomicReference context = new AtomicReference<>("first"); + context.set("first"); PackValidationResult first = loadable(root); PackValidationResult second = loadable(root); - try (MockedStatic validator = mockStatic(PackValidator.class); - MockedStatic cache = mockStatic(PackValidationCache.class)) { - cache.when(PackValidationCache::contextFingerprint).thenAnswer(ignored -> context.get()); + try (MockedStatic validator = mockStatic(PackValidator.class)) { validator.when(() -> PackValidator.validate(root)).thenReturn(first, second); assertSame(first, ModdedGenerationHistoryStorage.validatePack(root.toPath(), null)); context.set("second"); diff --git a/adapters/neoforge/build.gradle b/adapters/neoforge/build.gradle index 9cae8f598..9cb685f77 100644 --- a/adapters/neoforge/build.gradle +++ b/adapters/neoforge/build.gradle @@ -248,6 +248,7 @@ tasks.named('compileJava', JavaCompile).configure { tasks.named('test').configure { useJUnitPlatform() classpath = classpath.minus(developmentModLibraries).plus(sourceSets.modLibraries.output) + exclude('art/arcane/volmlib/nativelib/minecraft26_2/modded/mixin/**') } processResources {