Revert "Merge pull request #299 from thiakil/validation-changes"

This reverts commit 112a49dccb1fe7792366112bc829352462cd298c, reversing
changes made to b8f06abafc47065f980a94c4ddf7be70cee83411.

4 files changed, 0 insertions, 145 deletions

diff --git a/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java b/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java
deleted file mode 100644
index ce82e38..0000000
--- a/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cuchaz.enigma;
-
-import java.io.IOException;
-import java.nio.file.Paths;
-
-import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
-import org.junit.Test;
-
-import cuchaz.enigma.classprovider.ClasspathClassProvider;
-import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.EntryRemapper;
-import cuchaz.enigma.translation.mapping.serde.MappingFormat;
-import cuchaz.enigma.translation.mapping.serde.MappingParseException;
-import cuchaz.enigma.translation.mapping.tree.EntryTree;
-import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
-import cuchaz.enigma.translation.representation.entry.MethodEntry;
-import cuchaz.enigma.utils.validation.ValidationContext;
-
-/**
- * Test that we can accept some name clashes that are allowed by javac
- */
-public class TestAllowableClashes {
-
-        @Test
-        public void test() throws IOException, MappingParseException {
-                //Load produced mappings
-                Enigma enigma = Enigma.create();
-                EnigmaProject project = enigma.openJar(Paths.get("build/test-obf/visibility.jar"), new ClasspathClassProvider(), ProgressListener.none());
-                EntryTree<EntryMapping> obfToDeobf = MappingFormat.PROGUARD.read(Paths.get("build/visibility-mapping.txt"), ProgressListener.none(), null);
-
-                //Load them into enigma, none should conflict
-                EntryRemapper mapper = project.getMapper();
-                for (int round=0; round<2; round++) {
-                        for (EntryTreeNode<EntryMapping> node : obfToDeobf) {
-                                Assert.assertNotEquals(null, node.getValue());
-                                if (node.getEntry() instanceof MethodEntry && (node.getEntry()
-                                                .getName()
-                                                .equals("<init>") || node.getEntry().getName().equals("<clinit>"))) {
-                                        //skip proguard's constructor entries
-                                        continue;
-                                }
-                                System.out.println(node.getEntry().toString() + " -> " + node.getValue().getTargetName());
-                                ValidationContext vc = new ValidationContext();
-                                mapper.mapFromObf(vc, node.getEntry(), node.getValue());
-                                MatcherAssert.assertThat(vc, ValidationContextMatcher.INSTANCE);
-                        }
-                }
-        }
-
-}
diff --git a/enigma/src/test/java/cuchaz/enigma/ValidationContextMatcher.java b/enigma/src/test/java/cuchaz/enigma/ValidationContextMatcher.java
deleted file mode 100644
index 5404077..0000000
--- a/enigma/src/test/java/cuchaz/enigma/ValidationContextMatcher.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cuchaz.enigma;
-
-import cuchaz.enigma.utils.validation.ParameterizedMessage;
-import cuchaz.enigma.utils.validation.ValidationContext;
-import org.hamcrest.CustomMatcher;
-import org.hamcrest.Description;
-
-class ValidationContextMatcher extends CustomMatcher<ValidationContext> {
-        public static final ValidationContextMatcher INSTANCE = new ValidationContextMatcher();
-
-        private ValidationContextMatcher() {
-                super("ValidationContext can proceed");
-        }
-
-        @Override
-        public boolean matches(Object item) {
-                return item instanceof ValidationContext && ((ValidationContext) item).canProceed();
-        }
-
-        @Override
-        public void describeMismatch(Object item, Description description) {
-                if (!(item instanceof ValidationContext)) {
-                        description.appendText("expected ValidationContext, was").appendValue(item);
-                        return;
-                }
-                ValidationContext vc = (ValidationContext) item;
-                for (ParameterizedMessage message : vc.getMessages()) {
-                        description.appendText(message.getText());
-                        String longMessage = message.getLongText();
-                        if (longMessage != null && !longMessage.trim().isEmpty()){
-                                description.appendText(longMessage);
-                        }
-                }
-        }
-}
diff --git a/enigma/src/test/java/cuchaz/enigma/inputs/visibility/ClassA.java b/enigma/src/test/java/cuchaz/enigma/inputs/visibility/ClassA.java
deleted file mode 100644
index 458f7c0..0000000
--- a/enigma/src/test/java/cuchaz/enigma/inputs/visibility/ClassA.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cuchaz.enigma.inputs.visibility;
-
-class ClassA {
-
-        protected Object protectedParentPrivateChild;
-        public Object publicParentPrivateChild;
-
-        public static Object LOGGER = null;
-
-        protected static Object LOGGER2 = null;
-
-        public Object publicPublic;
-
-        public static void equalAccessStatic() {}
-
-        protected static void protectedPublicStatic(){}
-
-        private static void privateStaticParentPublicStaticChild(){}
-
-        private void privateParentPublicStaticChild() {}
-
-        static void packagePrivateParentProtectedChild(){}
-
-        private static void packagePrivateChild(){}
-
-        public ClassA returningSubclass(){return null;}
-
-}
\ No newline at end of file
diff --git a/enigma/src/test/java/cuchaz/enigma/inputs/visibility/ClassB.java b/enigma/src/test/java/cuchaz/enigma/inputs/visibility/ClassB.java
deleted file mode 100644
index 2a1b68a..0000000
--- a/enigma/src/test/java/cuchaz/enigma/inputs/visibility/ClassB.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cuchaz.enigma.inputs.visibility;
-
-public class ClassB extends ClassA {
-        private Object protectedParentPrivateChild;
-
-        private Object publicParentPrivateChild;
-
-        public Object publicPublic;
-
-        public static Object LOGGER;
-
-        public static Object LOGGER2 = null;
-
-        public static void equalAccessStatic() {
-        }
-
-        public static void protectedPublicStatic() {
-        }
-
-        public static void privateStaticParentPublicStaticChild() {
-        }
-
-        public static void privateParentPublicStaticChild() {
-        }
-
-        protected static void packagePrivateParentProtectedChild(){}
-
-        static void packagePrivateChild(){}
-
-        public ClassB returningSubclass(){return null;}
-}