From 581aec7d05f06456a384aa9adef7d781a666bf91 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 26 Mar 2016 17:57:45 +0000 Subject: Remove Mammoth prefix from util classes --- .../org/zwobble/mammoth/tests/DeepReflectionMatcher.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java') diff --git a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java index 35175d6..94bd05a 100644 --- a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java +++ b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java @@ -4,7 +4,7 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.hamcrest.TypeSafeDiagnosingMatcher; -import org.zwobble.mammoth.internal.util.MammothSets; +import org.zwobble.mammoth.internal.util.Sets; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -14,10 +14,10 @@ import java.util.Optional; import java.util.Set; import static java.util.Arrays.asList; -import static org.zwobble.mammoth.internal.util.MammothIterables.any; -import static org.zwobble.mammoth.internal.util.MammothIterables.lazyMap; -import static org.zwobble.mammoth.internal.util.MammothLists.eagerFilter; -import static org.zwobble.mammoth.internal.util.MammothLists.skip; +import static org.zwobble.mammoth.internal.util.Iterables.any; +import static org.zwobble.mammoth.internal.util.Iterables.lazyMap; +import static org.zwobble.mammoth.internal.util.Lists.eagerFilter; +import static org.zwobble.mammoth.internal.util.Lists.skip; public class DeepReflectionMatcher extends TypeSafeDiagnosingMatcher { public static Matcher deepEquals(T value) { @@ -143,7 +143,7 @@ public class DeepReflectionMatcher extends TypeSafeDiagnosingMatcher { } private static boolean handleExtraElements(String path, Map expected, Map actual, Description mismatchDescription, String prefix) { - Set extraElements = MammothSets.difference(actual.keySet(), expected.keySet()); + Set extraElements = Sets.difference(actual.keySet(), expected.keySet()); if (!extraElements.isEmpty()) { appendPath(mismatchDescription, path); mismatchDescription.appendText(prefix + -- cgit v1.2.3