diff --git a/src/test/java/net/fabricmc/mappingio/test/visitors/NopMappingVisitor.java b/src/main/java/net/fabricmc/mappingio/adapter/NopMappingVisitor.java similarity index 92% rename from src/test/java/net/fabricmc/mappingio/test/visitors/NopMappingVisitor.java rename to src/main/java/net/fabricmc/mappingio/adapter/NopMappingVisitor.java index e2206f56..5d2c0066 100644 --- a/src/test/java/net/fabricmc/mappingio/test/visitors/NopMappingVisitor.java +++ b/src/main/java/net/fabricmc/mappingio/adapter/NopMappingVisitor.java @@ -14,16 +14,21 @@ * limitations under the License. */ -package net.fabricmc.mappingio.test.visitors; +package net.fabricmc.mappingio.adapter; import java.io.IOException; import java.util.List; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import net.fabricmc.mappingio.MappedElementKind; import net.fabricmc.mappingio.MappingVisitor; +/** + * Experimental feature, may be removed or changed without further notice. + */ +@ApiStatus.Experimental public class NopMappingVisitor implements MappingVisitor { public NopMappingVisitor(boolean visitSubVisitors) { this.visitSubVisitors = visitSubVisitors; diff --git a/src/test/java/net/fabricmc/mappingio/test/visitors/SubsetAssertingVisitor.java b/src/main/java/net/fabricmc/mappingio/adapter/SubsetEnforcer.java similarity index 95% rename from src/test/java/net/fabricmc/mappingio/test/visitors/SubsetAssertingVisitor.java rename to src/main/java/net/fabricmc/mappingio/adapter/SubsetEnforcer.java index e256e6fc..0773c3a6 100644 --- a/src/test/java/net/fabricmc/mappingio/test/visitors/SubsetAssertingVisitor.java +++ b/src/main/java/net/fabricmc/mappingio/adapter/SubsetEnforcer.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package net.fabricmc.mappingio.test.visitors; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +package net.fabricmc.mappingio.adapter; import java.io.IOException; import java.util.ArrayList; @@ -33,7 +30,7 @@ import net.fabricmc.mappingio.format.FeatureSet; import net.fabricmc.mappingio.format.FeatureSet.ElementCommentSupport; import net.fabricmc.mappingio.format.FeatureSet.FeaturePresence; -import net.fabricmc.mappingio.format.FeatureSetInstantiator; +import net.fabricmc.mappingio.format.FeatureSetBuilder; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.tree.MappingTreeView; import net.fabricmc.mappingio.tree.MappingTreeView.ClassMappingView; @@ -44,19 +41,21 @@ /** * A visitor which asserts that the visited mappings are a subset of a superset tree. + * + *

Experimental feature, may be removed or changed without further notice. */ -public class SubsetAssertingVisitor implements FlatMappingVisitor { +public class SubsetEnforcer implements FlatMappingVisitor { /** * @param supTree The superset tree. * @param supFormat The superset format, or null if supTree has all the original data. * @param subFormat The subset format, or null if lossless (i.e. if the visits are coming from a tree). */ - public SubsetAssertingVisitor(MappingTreeView supTree, @Nullable MappingFormat supFormat, @Nullable MappingFormat subFormat) { + public SubsetEnforcer(MappingTreeView supTree, @Nullable MappingFormat supFormat, @Nullable MappingFormat subFormat) { this.supTree = supTree; this.subFormat = subFormat; this.supDstNsCount = supTree.getMaxNamespaceId(); - this.supFeatures = supFormat == null ? FeatureSetInstantiator.withFullSupport() : supFormat.features(); - this.subFeatures = subFormat == null ? FeatureSetInstantiator.withFullSupport() : subFormat.features(); + this.supFeatures = supFormat == null ? new FeatureSetBuilder(true).build() : supFormat.features(); + this.subFeatures = subFormat == null ? new FeatureSetBuilder(true).build() : subFormat.features(); } @Override @@ -275,7 +274,7 @@ public void visitFieldComment(String srcClsName, String srcName, @Nullable Strin ClassMappingView supCls = Objects.requireNonNull(supTree.getClass(srcClsName), "Incoming field comment's parent class not contained in supTree: " + subFldId); FieldMappingView supFld = Objects.requireNonNull(supCls.getField(srcName, srcDesc), "Incoming field comment's parent field not contained in supTree: " + subFldId); - assertEquals(supFld.getComment(), comment); + assertEquals(supFld.getComment(), comment, "Incoming comment differs from supTree"); } @Override @@ -360,7 +359,7 @@ public void visitMethodComment(String srcClsName, String srcName, @Nullable Stri ClassMappingView supCls = Objects.requireNonNull(supTree.getClass(srcClsName), "Incoming method comment's parent class not contained in supTree: " + subMthId); MethodMappingView supMth = Objects.requireNonNull(supCls.getMethod(srcName, srcDesc), "Incoming method comment's parent method not contained in supTree: " + subMthId); - assertEquals(supMth.getComment(), comment); + assertEquals(supMth.getComment(), comment, "Incoming comment differs from supTree"); } @Override @@ -436,7 +435,7 @@ public void visitMethodArgComment(String srcClsName, String srcMethodName, @Null MethodMappingView supMth = Objects.requireNonNull(supCls.getMethod(srcMethodName, srcMethodDesc), "Incoming arg comment's parent method not contained in supTree: " + subArgId); MethodArgMappingView supArg = Objects.requireNonNull(supMth.getArg(argPosition, lvIndex, srcArgName), "Incoming arg comment's parent arg not contained in supTree: " + subArgId); - assertEquals(supArg.getComment(), comment); + assertEquals(supArg.getComment(), comment, "Incoming comment differs from supTree"); } @Override @@ -524,7 +523,19 @@ public void visitMethodVarComment(String srcClsName, String srcMethodName, @Null MethodMappingView supMth = Objects.requireNonNull(supCls.getMethod(srcMethodName, srcMethodDesc), "Incoming var comment's parent method not contained in supTree: " + subVarId); MethodVarMappingView supVar = Objects.requireNonNull(supMth.getVar(lvtRowIndex, lvIndex, startOpIdx, endOpIdx, srcVarName), "Incoming var comment's parent var not contained in supTree: " + subVarId); - assertEquals(supVar.getComment(), comment); + assertEquals(supVar.getComment(), comment, "Incoming comment differs from supTree"); + } + + private void assertTrue(boolean condition, String message) { + if (!condition) { + throw new AssertionError(message); + } + } + + private void assertEquals(Object expected, Object actual, String message) { + if (!Objects.equals(expected, actual)) { + throw new AssertionError(message + ": Expected: " + expected + ", Actual: " + actual); + } } private boolean isEmpty(String[] arr) { diff --git a/src/test/java/net/fabricmc/mappingio/test/visitors/VisitOrderVerifyingVisitor.java b/src/main/java/net/fabricmc/mappingio/adapter/VisitOrderVerifier.java similarity index 97% rename from src/test/java/net/fabricmc/mappingio/test/visitors/VisitOrderVerifyingVisitor.java rename to src/main/java/net/fabricmc/mappingio/adapter/VisitOrderVerifier.java index 905d6f9f..35ade007 100644 --- a/src/test/java/net/fabricmc/mappingio/test/visitors/VisitOrderVerifyingVisitor.java +++ b/src/main/java/net/fabricmc/mappingio/adapter/VisitOrderVerifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.mappingio.test.visitors; +package net.fabricmc.mappingio.adapter; import java.io.IOException; import java.util.HashMap; @@ -22,22 +22,25 @@ import java.util.Map; import java.util.Objects; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import net.fabricmc.mappingio.MappedElementKind; import net.fabricmc.mappingio.MappingVisitor; -import net.fabricmc.mappingio.adapter.ForwardingMappingVisitor; /** * Visitor which verifies on each visit call that the invoked visits were in accordance * with the expected order of visitation, as defined in {@link MappingVisitor}'s Javadocs. + * + *

Experimental feature, may be removed or changed without further notice. */ -public class VisitOrderVerifyingVisitor extends ForwardingMappingVisitor { - public VisitOrderVerifyingVisitor(MappingVisitor next) { +@ApiStatus.Experimental +public class VisitOrderVerifier extends ForwardingMappingVisitor { + public VisitOrderVerifier(MappingVisitor next) { this(next, false); } - public VisitOrderVerifyingVisitor(MappingVisitor next, boolean allowConsecutiveDuplicateElementVisits) { + public VisitOrderVerifier(MappingVisitor next, boolean allowConsecutiveDuplicateElementVisits) { super(next); this.allowConsecutiveDuplicateElementVisits = allowConsecutiveDuplicateElementVisits; init(); diff --git a/src/main/java/net/fabricmc/mappingio/format/FeatureSetBuilder.java b/src/main/java/net/fabricmc/mappingio/format/FeatureSetBuilder.java index d6d399ad..272584a2 100644 --- a/src/main/java/net/fabricmc/mappingio/format/FeatureSetBuilder.java +++ b/src/main/java/net/fabricmc/mappingio/format/FeatureSetBuilder.java @@ -55,7 +55,8 @@ public static FeatureSetBuilder createFrom(FeatureSet featureSet) { featureSet.hasFileComments()); } - FeatureSetBuilder(boolean initWithFullSupport) { + @ApiStatus.Internal + public FeatureSetBuilder(boolean initWithFullSupport) { this(initWithFullSupport, initWithFullSupport ? MetadataSupport.ARBITRARY : MetadataSupport.NONE, initWithFullSupport ? MetadataSupport.ARBITRARY : MetadataSupport.NONE, diff --git a/src/test/java/net/fabricmc/mappingio/format/FeatureSetInstantiator.java b/src/test/java/net/fabricmc/mappingio/format/FeatureSetInstantiator.java deleted file mode 100644 index 388deab9..00000000 --- a/src/test/java/net/fabricmc/mappingio/format/FeatureSetInstantiator.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2024 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.mappingio.format; - -public class FeatureSetInstantiator { - public static FeatureSet withFullSupport() { - return new FeatureSetBuilder(true).build(); - } -} diff --git a/src/test/java/net/fabricmc/mappingio/test/TestMappings.java b/src/test/java/net/fabricmc/mappingio/test/TestMappings.java index 6060e9d3..6adc02a8 100644 --- a/src/test/java/net/fabricmc/mappingio/test/TestMappings.java +++ b/src/test/java/net/fabricmc/mappingio/test/TestMappings.java @@ -35,12 +35,12 @@ import net.fabricmc.mappingio.MappingUtil; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.ForwardingMappingVisitor; +import net.fabricmc.mappingio.adapter.NopMappingVisitor; import net.fabricmc.mappingio.adapter.OuterClassNamePropagator; +import net.fabricmc.mappingio.adapter.VisitOrderVerifier; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.format.intellij.MigrationMapConstants; import net.fabricmc.mappingio.test.lib.jool.Unchecked; -import net.fabricmc.mappingio.test.visitors.NopMappingVisitor; -import net.fabricmc.mappingio.test.visitors.VisitOrderVerifyingVisitor; /* * After any changes to the "generate" methods, run the "generateTestMappings" Gradle task @@ -50,7 +50,7 @@ */ public class TestMappings { public static T generateValid(T target) throws IOException { - MappingVisitor delegate = target instanceof VisitOrderVerifyingVisitor ? target : new VisitOrderVerifyingVisitor(target); + MappingVisitor delegate = target instanceof VisitOrderVerifier ? target : new VisitOrderVerifier(target); if (delegate.visitHeader()) { delegate.visitNamespaces(MappingUtil.NS_SOURCE_FALLBACK, Arrays.asList(MappingUtil.NS_TARGET_FALLBACK, MappingUtil.NS_TARGET_FALLBACK + "2")); @@ -89,7 +89,7 @@ public static T generateValid(T target) throws IOExce } public static T generateRepeatedElements(T target, boolean repeatComments, boolean repeatClasses) throws IOException { - generateValid(new ForwardingMappingVisitor(new VisitOrderVerifyingVisitor(target, true)) { + generateValid(new ForwardingMappingVisitor(new VisitOrderVerifier(target, true)) { private final List replayQueue = new ArrayList<>(); @Override @@ -179,7 +179,7 @@ public void visitComment(MappedElementKind targetKind, String comment) throws IO } public static T generateHoles(T target) throws IOException { - MappingVisitor delegate = target instanceof VisitOrderVerifyingVisitor ? target : new VisitOrderVerifyingVisitor(target); + MappingVisitor delegate = target instanceof VisitOrderVerifier ? target : new VisitOrderVerifier(target); if (delegate.visitHeader()) { delegate.visitNamespaces(MappingUtil.NS_SOURCE_FALLBACK, Arrays.asList(MappingUtil.NS_TARGET_FALLBACK, MappingUtil.NS_TARGET_FALLBACK + "2")); @@ -291,7 +291,7 @@ public static T generateHoles(T target) throws IOExce } public static T generateOuterClassNamePropagation(T target) throws IOException { - MappingVisitor delegate = target instanceof VisitOrderVerifyingVisitor ? target : new VisitOrderVerifyingVisitor(target); + MappingVisitor delegate = target instanceof VisitOrderVerifier ? target : new VisitOrderVerifier(target); String srcNs = MappingUtil.NS_SOURCE_FALLBACK; List dstNamespaces = Arrays.asList("dstNs0", "dstNs1", "dstNs2", "dstNs3", "dstNs4", "dstNs5", "dstNs6"); diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/OuterClassNamePropagationTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/OuterClassNamePropagationTest.java index 8bc1128c..91ca4590 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/OuterClassNamePropagationTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/OuterClassNamePropagationTest.java @@ -32,12 +32,12 @@ import net.fabricmc.mappingio.MappingFlag; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.FlatAsRegularMappingVisitor; +import net.fabricmc.mappingio.adapter.NopMappingVisitor; import net.fabricmc.mappingio.adapter.OuterClassNamePropagator; +import net.fabricmc.mappingio.adapter.SubsetEnforcer; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.test.TestMappings; import net.fabricmc.mappingio.test.TestMappings.MappingDir; -import net.fabricmc.mappingio.test.visitors.NopMappingVisitor; -import net.fabricmc.mappingio.test.visitors.SubsetAssertingVisitor; import net.fabricmc.mappingio.tree.MappingTreeView; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.fabricmc.mappingio.tree.VisitableMappingTree; @@ -134,8 +134,8 @@ private void checkDiskEquivalence(VisitableMappingTree tree, boolean processRema VisitableMappingTree diskTree = dir.read(format, new MemoryMappingTree()); - tree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(diskTree, format, null))); - diskTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(tree, null, format))); + tree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(diskTree, format, null))); + diskTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(tree, null, format))); } } diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/reading/DetectionTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/reading/DetectionTest.java index 000cb2cb..d4dc56b0 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/reading/DetectionTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/reading/DetectionTest.java @@ -30,10 +30,10 @@ import org.opentest4j.AssertionFailedError; import net.fabricmc.mappingio.MappingReader; +import net.fabricmc.mappingio.adapter.NopMappingVisitor; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.test.TestMappings; import net.fabricmc.mappingio.test.TestMappings.MappingDir; -import net.fabricmc.mappingio.test.visitors.NopMappingVisitor; public class DetectionTest { @Test diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/reading/EmptyContentReadTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/reading/EmptyContentReadTest.java index 491f9e55..d67899d8 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/reading/EmptyContentReadTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/reading/EmptyContentReadTest.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import net.fabricmc.mappingio.MappingVisitor; +import net.fabricmc.mappingio.adapter.VisitOrderVerifier; import net.fabricmc.mappingio.format.enigma.EnigmaFileReader; import net.fabricmc.mappingio.format.intellij.MigrationMapFileReader; import net.fabricmc.mappingio.format.jobf.JobfFileReader; @@ -35,7 +36,6 @@ import net.fabricmc.mappingio.format.srg.TsrgFileReader; import net.fabricmc.mappingio.format.tiny.Tiny1FileReader; import net.fabricmc.mappingio.format.tiny.Tiny2FileReader; -import net.fabricmc.mappingio.test.visitors.VisitOrderVerifyingVisitor; import net.fabricmc.mappingio.tree.MemoryMappingTree; public class EmptyContentReadTest { @@ -43,7 +43,7 @@ public class EmptyContentReadTest { @BeforeEach public void instantiateTree() { - target = new VisitOrderVerifyingVisitor(new MemoryMappingTree()); + target = new VisitOrderVerifier(new MemoryMappingTree()); } @Test diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/reading/ValidContentReadTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/reading/ValidContentReadTest.java index 10eac065..3a5baad2 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/reading/ValidContentReadTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/reading/ValidContentReadTest.java @@ -25,11 +25,11 @@ import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.FlatAsRegularMappingVisitor; import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch; +import net.fabricmc.mappingio.adapter.SubsetEnforcer; +import net.fabricmc.mappingio.adapter.VisitOrderVerifier; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.test.TestMappings; import net.fabricmc.mappingio.test.TestMappings.MappingDir; -import net.fabricmc.mappingio.test.visitors.SubsetAssertingVisitor; -import net.fabricmc.mappingio.test.visitors.VisitOrderVerifyingVisitor; import net.fabricmc.mappingio.tree.MappingTreeView; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.fabricmc.mappingio.tree.VisitableMappingTree; @@ -62,7 +62,7 @@ private void check(MappingDir dir, MappingFormat format) throws Exception { VisitableMappingTree referenceTree = dir.generate(new MemoryMappingTree()); VisitableMappingTree tree = new MemoryMappingTree(); - dir.read(format, new VisitOrderVerifyingVisitor(tree, allowConsecutiveDuplicateElementVisits)); + dir.read(format, new VisitOrderVerifier(tree, allowConsecutiveDuplicateElementVisits)); assertEqual(tree, format, referenceTree, allowConsecutiveDuplicateElementVisits); if (dir == TestMappings.READING.HOLES && !format.features().hasNamespaces()) { @@ -74,9 +74,9 @@ private void check(MappingDir dir, MappingFormat format) throws Exception { ? referenceTree.getDstNamespaces().get(0) : MappingUtil.NS_TARGET_FALLBACK; MappingVisitor target = new MappingSourceNsSwitch( - new VisitOrderVerifyingVisitor( + new VisitOrderVerifier( new MappingSourceNsSwitch( - new VisitOrderVerifyingVisitor(tree, allowConsecutiveDuplicateElementVisits), + new VisitOrderVerifier(tree, allowConsecutiveDuplicateElementVisits), referenceTree.getSrcNamespace()), allowConsecutiveDuplicateElementVisits), newSrcNs); @@ -91,9 +91,9 @@ private void assertEqual(MappingTreeView tree, MappingFormat format, MappingTree } private void assertSubset(MappingTreeView subTree, @Nullable MappingFormat subFormat, MappingTreeView supTree, @Nullable MappingFormat supFormat, boolean allowConsecutiveDuplicateElementVisits) throws Exception { - subTree.accept(new VisitOrderVerifyingVisitor( + subTree.accept(new VisitOrderVerifier( new FlatAsRegularMappingVisitor( - new SubsetAssertingVisitor(supTree, supFormat, subFormat)), + new SubsetEnforcer(supTree, supFormat, subFormat)), allowConsecutiveDuplicateElementVisits)); } } diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/tree/MergeTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/tree/MergeTest.java index 1924316b..aa75e37c 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/tree/MergeTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/tree/MergeTest.java @@ -33,9 +33,9 @@ import net.fabricmc.mappingio.MappingReader; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.FlatAsRegularMappingVisitor; +import net.fabricmc.mappingio.adapter.SubsetEnforcer; +import net.fabricmc.mappingio.adapter.VisitOrderVerifier; import net.fabricmc.mappingio.test.TestMappings; -import net.fabricmc.mappingio.test.visitors.SubsetAssertingVisitor; -import net.fabricmc.mappingio.test.visitors.VisitOrderVerifyingVisitor; import net.fabricmc.mappingio.tree.MappingTree.ClassMapping; import net.fabricmc.mappingio.tree.MappingTree.FieldMapping; import net.fabricmc.mappingio.tree.MemoryMappingTree; @@ -61,7 +61,7 @@ public class MergeTest { @BeforeEach public void setup() { tree = new MemoryMappingTree(); - delegate = new VisitOrderVerifyingVisitor(tree); + delegate = new VisitOrderVerifier(tree); } @Test @@ -290,14 +290,14 @@ public void diskMappings() throws IOException { MemoryMappingTree referenceTree = new MemoryMappingTree(); MappingReader.read(dir.resolve("tree1+2.tiny"), referenceTree); - tree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(referenceTree, null, null))); - referenceTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(tree, null, null))); + tree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(referenceTree, null, null))); + referenceTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(tree, null, null))); MappingReader.read(dir.resolve("tree3.tiny"), delegate); referenceTree = new MemoryMappingTree(); MappingReader.read(dir.resolve("tree1+2+3.tiny"), referenceTree); - tree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(referenceTree, null, null))); - referenceTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(tree, null, null))); + tree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(referenceTree, null, null))); + referenceTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(tree, null, null))); } } diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/tree/MetadataTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/tree/MetadataTest.java index b652fa46..770fc074 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/tree/MetadataTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/tree/MetadataTest.java @@ -31,8 +31,8 @@ import org.junit.jupiter.api.Test; import net.fabricmc.mappingio.MappingFlag; +import net.fabricmc.mappingio.adapter.NopMappingVisitor; import net.fabricmc.mappingio.test.TestMappings; -import net.fabricmc.mappingio.test.visitors.NopMappingVisitor; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.fabricmc.mappingio.tree.VisitableMappingTree; diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/visiting/VisitEndTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/visiting/VisitEndTest.java index 253af226..c68474a7 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/visiting/VisitEndTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/visiting/VisitEndTest.java @@ -32,11 +32,11 @@ import net.fabricmc.mappingio.MappingFlag; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.FlatAsRegularMappingVisitor; +import net.fabricmc.mappingio.adapter.SubsetEnforcer; +import net.fabricmc.mappingio.adapter.VisitOrderVerifier; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.test.TestMappings; import net.fabricmc.mappingio.test.TestMappings.MappingDir; -import net.fabricmc.mappingio.test.visitors.SubsetAssertingVisitor; -import net.fabricmc.mappingio.test.visitors.VisitOrderVerifyingVisitor; import net.fabricmc.mappingio.tree.MappingTree; import net.fabricmc.mappingio.tree.MappingTreeView; import net.fabricmc.mappingio.tree.MemoryMappingTree; @@ -80,7 +80,7 @@ private void check(MappingDir dir, MappingFormat format) throws Exception { private VisitEndComplianceChecker checkCompliance(MappingDir dir, MappingFormat format, int visitPassCountToFinish, boolean setFlag, MappingTreeView supTree) throws Exception { VisitEndComplianceChecker visitor = new VisitEndComplianceChecker(visitPassCountToFinish, setFlag, supTree, format, dir); - dir.read(format, new VisitOrderVerifyingVisitor(visitor)); + dir.read(format, new VisitOrderVerifier(visitor)); assertEquals(visitor.finishedVisitPassCount, visitPassCountToFinish); return visitor; } @@ -229,8 +229,8 @@ private void checkContent() throws IOException { } subTree = tree; - subTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(supTree, supFormat, subFormat))); - supTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(subTree, subFormat, supFormat))); + subTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(supTree, supFormat, subFormat))); + supTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(subTree, subFormat, supFormat))); } private final int visitPassCountToFinish; diff --git a/src/test/java/net/fabricmc/mappingio/test/tests/writing/WriteTest.java b/src/test/java/net/fabricmc/mappingio/test/tests/writing/WriteTest.java index 6fd5a540..9596c528 100644 --- a/src/test/java/net/fabricmc/mappingio/test/tests/writing/WriteTest.java +++ b/src/test/java/net/fabricmc/mappingio/test/tests/writing/WriteTest.java @@ -31,11 +31,11 @@ import net.fabricmc.mappingio.adapter.FlatAsRegularMappingVisitor; import net.fabricmc.mappingio.adapter.ForwardingMappingVisitor; import net.fabricmc.mappingio.adapter.MappingNsCompleter; +import net.fabricmc.mappingio.adapter.SubsetEnforcer; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.test.TestMappings; import net.fabricmc.mappingio.test.TestMappings.MappingDir; import net.fabricmc.mappingio.test.TestUtil; -import net.fabricmc.mappingio.test.visitors.SubsetAssertingVisitor; import net.fabricmc.mappingio.tree.MappingTreeView; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.fabricmc.mappingio.tree.VisitableMappingTree; @@ -86,8 +86,8 @@ private void readWithMio(MappingTreeView origTree, Path outputPath, MappingForma VisitableMappingTree writtenTree = new MemoryMappingTree(); MappingReader.read(outputPath, outputFormat, writtenTree); - writtenTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(origTree, null, outputFormat))); - origTree.accept(new FlatAsRegularMappingVisitor(new SubsetAssertingVisitor(writtenTree, outputFormat, null))); + writtenTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(origTree, null, outputFormat))); + origTree.accept(new FlatAsRegularMappingVisitor(new SubsetEnforcer(writtenTree, outputFormat, null))); } private void readWithLorenz(Path path, MappingFormat format) throws Exception {