From 3cd47407804d6d1bc6dce614e8b505402a9a4ce4 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 5 Apr 2024 00:17:31 +0900
Subject: [PATCH] Fix unit tests

---
 .../architectury/loom/metadata/ModMetadataFiles.java  |  4 ++--
 .../unit/architectury/ModMetadataFilesTest.groovy     | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/dev/architectury/loom/metadata/ModMetadataFiles.java b/src/main/java/dev/architectury/loom/metadata/ModMetadataFiles.java
index 275e3722..550fee00 100644
--- a/src/main/java/dev/architectury/loom/metadata/ModMetadataFiles.java
+++ b/src/main/java/dev/architectury/loom/metadata/ModMetadataFiles.java
@@ -25,8 +25,8 @@ public final class ModMetadataFiles {
 	private static final Map<String, Function<byte[], ModMetadataFile>> SINGLE_FILE_METADATA_TYPES = ImmutableMap.<String, Function<byte[], ModMetadataFile>>builder()
 			.put(QuiltModJson.FILE_NAME, QuiltModJson::of)
 			.put(ArchitecturyCommonJson.FILE_NAME, ArchitecturyCommonJson::of)
-			.put(ModsToml.FILE_PATH, onError(ModsToml::of, "Could not load mods.toml", () -> new ErroringModMetadataFile(ModsToml.FILE_PATH)))
-			.put(ModsToml.NEOFORGE_FILE_PATH, onError(ModsToml::of, "Could not load mods.toml", () -> new ErroringModMetadataFile(ModsToml.NEOFORGE_FILE_PATH)))
+			.put(ModsToml.FILE_PATH, onError(ModsToml::of, "Could not load mods.toml", () -> new ErroringModMetadataFile("mods.toml")))
+			.put(ModsToml.NEOFORGE_FILE_PATH, onError(ModsToml::of, "Could not load neoforge.mods.toml", () -> new ErroringModMetadataFile("neoforge.mods.toml")))
 			.build();
 
 	private static <A, B> Function<A, B> onError(Function<A, B> fn, String message, Supplier<B> onError) {
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/architectury/ModMetadataFilesTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/architectury/ModMetadataFilesTest.groovy
index 2efdc409..5808879b 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/architectury/ModMetadataFilesTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/architectury/ModMetadataFilesTest.groovy
@@ -118,6 +118,17 @@ class ModMetadataFilesTest extends Specification {
 		modMetadata.fileName == 'mods.toml [erroring]'
 	}
 
+	def "read broken neoforge.mods.toml from directory"() {
+		given:
+		Files.createDirectories(workingDir.resolve('META-INF'))
+		workingDir.resolve('META-INF/neoforge.mods.toml').text = ModsTomlTest.BROKEN_INPUT
+		when:
+		def modMetadata = ModMetadataFiles.fromDirectory(workingDir)
+		then:
+		modMetadata instanceof ErroringModMetadataFile
+		modMetadata.fileName == 'neoforge.mods.toml [erroring]'
+	}
+
 	def "read fabric.mod.json from directory"() {
 		given:
 		workingDir.resolve('fabric.mod.json').text = '''