ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

I dont know if this is right but test all passes again

Browse Source
This commit is contained in:
Adam
2016-01-25 16:27:53 -05:00
parent 6da0b66b2f
commit 91ff039691
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java
View File

@@ -21,7 +21,8 @@ public class ParallellMappingExecutor
boolean step1 = true, step2 = true; boolean step1 = true, step2 = true;
public boolean step() public boolean step()
{ {
assert e.frames.size() == e2.frames.size(); // this no longer holds with recursive stepinfo
//assert e.frames.size() == e2.frames.size();
p1 = p2 = null; p1 = p2 = null;

8
src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java
View File

@@ -34,7 +34,7 @@ public class MapStaticTest
{ "client.init", "client.init" }, { "client.init", "client.init" },
{ "class162.method3270", "class86.method2020" }, { "class162.method3270", "class86.method2020" },
{ "class29.method711", "class36.method742" }, { "class29.method711", "class36.method742" },
//{ "class72.run", "class72.run" }, { "class72.run", "class72.run" },
}; };
// @Test // @Test
@@ -56,7 +56,7 @@ public class MapStaticTest
// } // }
// } // }
//@Test @Test
public void testAll() throws IOException public void testAll() throws IOException
{ {
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar")); ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
@@ -79,8 +79,8 @@ public class MapStaticTest
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar")); ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar")); ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar"));
Method m1 = group1.findClass("client").findMethod("vmethod3054"); Method m1 = group1.findClass("client").findMethod("init");
Method m2 = group2.findClass("client").findMethod("vmethod2973"); Method m2 = group2.findClass("client").findMethod("init");
ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2); ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);