LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-06 15:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

test fix

Browse Source
This commit is contained in:
honfika@gmail.com
2015-07-02 09:17:23 +02:00
parent f96fb33c4d
commit b932a86de3
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
View File

@@ -21,7 +21,7 @@ import com.jpexs.decompiler.flash.action.ActionList;
import com.jpexs.decompiler.flash.action.ActionListReader;
import com.jpexs.decompiler.flash.action.parser.ActionParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
import com.jpexs.decompiler.flash.action.parser.script.ActionScript2Parser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
@@ -54,7 +54,7 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase {
}
private String recompile(String str) throws ActionParseException, IOException, CompilationException, InterruptedException, TimeoutException {
ActionScriptParser par = new ActionScriptParser(SWF.DEFAULT_VERSION);
ActionScript2Parser par = new ActionScript2Parser(SWF.DEFAULT_VERSION);
HighlightedTextWriter writer = new HighlightedTextWriter(new CodeFormatting(), false);
List<Action> actions = par.actionsFromString(str);
byte[] hex = Action.actionsToBytes(actions, true, SWF.DEFAULT_VERSION);

4
libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ParserTest.java
View File

@@ -16,7 +16,7 @@
*/
package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
import com.jpexs.decompiler.flash.action.parser.script.ActionScript2Parser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.graph.CompilationException;
import java.io.IOException;
@@ -38,7 +38,7 @@ public class ActionScript2ParserTest extends ActionStript2TestBase {
private void parseAS2(String script) {
try {
ActionScriptParser par = new ActionScriptParser(SWF.DEFAULT_VERSION);
ActionScript2Parser par = new ActionScript2Parser(SWF.DEFAULT_VERSION);
par.actionsFromString(script);
} catch (IOException | CompilationException | ParseException ex) {
fail("Unable to parse: " + script, ex);

7
libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
View File

@@ -19,9 +19,10 @@ package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.ScriptPack;
import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
import com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScript3Parser;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.parser.ActionParseException;
import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
import com.jpexs.decompiler.flash.action.parser.script.ActionScript2Parser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
@@ -86,7 +87,7 @@ public class DirectEditingTest extends FileTestBase {
System.out.println("Recompiling:" + classPathString + "...");
en.toSource(htw, abc.script_info.get(s).traits.traits, ScriptExportMode.AS, false);
String original = htw.toString();
com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScriptParser.compile(original, abc, allAbcs, false, en.getClassPath().className + ".as", abc.instance_info.size());
ActionScript3Parser.compile(original, abc, allAbcs, false, en.getClassPath().className + ".as", abc.instance_info.size());
//remove last compiled script:
abc.script_info.remove(abc.script_info.size() - 1);
@@ -101,7 +102,7 @@ public class DirectEditingTest extends FileTestBase {
Action.actionsToSource(asm, asm.getActions(), asm.toString()/*FIXME?*/, writer);
String as = writer.toString();
as = asm.removePrefixAndSuffix(as);
ActionScriptParser par = new ActionScriptParser(swf.version);
ActionScript2Parser par = new ActionScript2Parser(swf.version);
try {
asm.setActions(par.actionsFromString(as));
} catch (ActionParseException | CompilationException ex) {