Feature/weave (#138)

* Add weave/stitch style command system to enigma

Also fixed divide by zero stupidity

Signed-off-by: liach <liach@users.noreply.github.com>

* Add tests for package access index and command

Signed-off-by: liach <liach@users.noreply.github.com>

* Minor tweaks

Signed-off-by: liach <liach@users.noreply.github.com>

11 files changed, 114 insertions, 0 deletions

diff --git a/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java b/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java
new file mode 100644
index 00000000..ae5d6d2c
--- /dev/null
+++ b/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Jeff Martin.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public
+ * License v3.0 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Contributors:
+ *     Jeff Martin - initial API and implementation
+ ******************************************************************************/
+
+package cuchaz.enigma;
+
+import cuchaz.enigma.analysis.ParsedJar;
+import cuchaz.enigma.analysis.index.JarIndex;
+import cuchaz.enigma.analysis.index.PackageVisibilityIndex;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
+import org.junit.Test;
+
+import java.util.jar.JarFile;
+
+import static cuchaz.enigma.TestEntryFactory.newClass;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+
+public class PackageVisibilityIndexTest {
+
+        private static final ClassEntry KEEP = newClass("cuchaz/enigma/inputs/Keep");
+        private static final ClassEntry BASE = newClass("a");
+        private static final ClassEntry SAME_PACKAGE_CHILD = newClass("b");
+        private static final ClassEntry SAME_PACKAGE_CHILD_INNER = newClass("b$a");
+        private static final ClassEntry OTHER_PACKAGE_CHILD = newClass("c");
+        private static final ClassEntry OTHER_PACKAGE_CHILD_INNER = newClass("c$a");
+        private final JarIndex jarIndex;
+
+        public PackageVisibilityIndexTest() throws Exception {
+                jarIndex = JarIndex.empty();
+                ParsedJar jar = new ParsedJar(new JarFile("build/test-obf/packageAccess.jar"));
+                jarIndex.indexJar(jar, s -> {
+                });
+        }
+
+        @Test
+        public void test() {
+                PackageVisibilityIndex visibilityIndex = jarIndex.getPackageVisibilityIndex();
+                assertThat(visibilityIndex.getPartition(BASE), containsInAnyOrder(BASE, SAME_PACKAGE_CHILD, SAME_PACKAGE_CHILD_INNER));
+                System.out.println(visibilityIndex.getPartitions());
+                assertThat(visibilityIndex.getPartitions(), containsInAnyOrder(
+                                containsInAnyOrder(BASE, SAME_PACKAGE_CHILD, SAME_PACKAGE_CHILD_INNER),
+                                containsInAnyOrder(OTHER_PACKAGE_CHILD, OTHER_PACKAGE_CHILD_INNER),
+                                contains(KEEP)
+                ));
+        }
+}
diff --git a/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java b/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
new file mode 100644
index 00000000..f3b9f85e
--- /dev/null
+++ b/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
@@ -0,0 +1,20 @@
+package cuchaz.enigma.command;
+
+import org.junit.Test;
+
+import java.io.File;
+
+public class CheckMappingsCommandTest {
+
+        @Test(expected = IllegalStateException.class)
+        public void testWrong() throws Exception {
+                new CheckMappingsCommand().run(new File("build/test-obf/packageAccess.jar").getAbsolutePath(), new File("src/test/resources" +
+                                "/packageAccess/wrongMappings").getAbsolutePath());
+        }
+
+        @Test
+        public void testRight() throws Exception {
+                new CheckMappingsCommand().run(new File("build/test-obf/packageAccess.jar").getAbsolutePath(), new File("src/test/resources" +
+                                "/packageAccess/correctMappings").getAbsolutePath());
+        }
+}
diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java b/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java
new file mode 100644
index 00000000..6f5fe304
--- /dev/null
+++ b/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java
@@ -0,0 +1,7 @@
+package cuchaz.enigma.inputs.packageAccess;
+
+public class Base {
+        protected int make() {
+                return 42;
+        }
+}
diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java b/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java
new file mode 100644
index 00000000..cf0f6574
--- /dev/null
+++ b/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java
@@ -0,0 +1,12 @@
+package cuchaz.enigma.inputs.packageAccess;
+
+public class SamePackageChild extends Base {
+
+        class Inner {
+                final int value;
+
+                Inner() {
+                        value = SamePackageChild.this.make(); // no synthetic method
+                }
+        }
+}
diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java b/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java
new file mode 100644
index 00000000..19fb19c2
--- /dev/null
+++ b/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java
@@ -0,0 +1,14 @@
+package cuchaz.enigma.inputs.packageAccess.sub;
+
+import cuchaz.enigma.inputs.packageAccess.Base;
+
+public class OtherPackageChild extends Base {
+
+        class Inner {
+                final int value;
+
+                Inner() {
+                        value = OtherPackageChild.this.make(); // synthetic method call
+                }
+        }
+}
diff --git a/src/test/resources/packageAccess/correctMappings/base/Base.mapping b/src/test/resources/packageAccess/correctMappings/base/Base.mapping
new file mode 100644
index 00000000..0a86def0
--- /dev/null
+++ b/src/test/resources/packageAccess/correctMappings/base/Base.mapping
@@ -0,0 +1 @@
+CLASS a base/Base
diff --git a/src/test/resources/packageAccess/correctMappings/base/One.mapping b/src/test/resources/packageAccess/correctMappings/base/One.mapping
new file mode 100644
index 00000000..dd4c2083
--- /dev/null
+++ b/src/test/resources/packageAccess/correctMappings/base/One.mapping
@@ -0,0 +1 @@
+CLASS b base/One
diff --git a/src/test/resources/packageAccess/correctMappings/two/Two.mapping b/src/test/resources/packageAccess/correctMappings/two/Two.mapping
new file mode 100644
index 00000000..a179349c
--- /dev/null
+++ b/src/test/resources/packageAccess/correctMappings/two/Two.mapping
@@ -0,0 +1 @@
+CLASS c two/Two
diff --git a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping b/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
new file mode 100644
index 00000000..0a86def0
--- /dev/null
+++ b/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
@@ -0,0 +1 @@
+CLASS a base/Base
diff --git a/src/test/resources/packageAccess/wrongMappings/one/One.mapping b/src/test/resources/packageAccess/wrongMappings/one/One.mapping
new file mode 100644
index 00000000..15b42cf5
--- /dev/null
+++ b/src/test/resources/packageAccess/wrongMappings/one/One.mapping
@@ -0,0 +1 @@
+CLASS b one/One
diff --git a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping b/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
new file mode 100644
index 00000000..a179349c
--- /dev/null
+++ b/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
@@ -0,0 +1 @@
+CLASS c two/Two