From fed7439d18989dc01f08a55de3f14bb66ee47a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Fri, 19 Feb 2016 16:54:12 +0100 Subject: [PATCH] Move items from Debug tab in advanced settings to other tabs to avoid acidentally setting it, reseting most of them by renaming. --- .../test/com/jpexs/decompiler/flash/DirectEditingTest.java | 3 ++- .../test/com/jpexs/decompiler/flash/ExportTest.java | 3 ++- .../test/com/jpexs/decompiler/flash/RecompileTest.java | 7 ++++--- .../com/jpexs/decompiler/flash/SwfXmlExportImportTest.java | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java index b6b6040e4..becd84602 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java @@ -52,7 +52,8 @@ public class DirectEditingTest extends FileTestBase { @BeforeClass public void init() { Configuration.autoDeobfuscate.set(false); - Configuration.debugCopy.set(false); + Configuration.simplifyExpressions.set(false); + Configuration._debugCopy.set(false); } public static final String TESTDATADIR = "testdata/directediting"; diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ExportTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ExportTest.java index a4171eb14..fc5f8e37f 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ExportTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ExportTest.java @@ -40,7 +40,8 @@ public class ExportTest extends FileTestBase { @BeforeClass public void init() { Configuration.autoDeobfuscate.set(false); - Configuration.debugCopy.set(false); + Configuration.simplifyExpressions.set(false); + Configuration._debugCopy.set(false); } public static final String TESTDATADIR = "testdata/decompile"; diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java index e2855e856..69bb20820 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java @@ -41,6 +41,7 @@ public class RecompileTest extends FileTestBase { @BeforeClass public void init() { Configuration.autoDeobfuscate.set(false); + Configuration.simplifyExpressions.set(false); } public static final String TESTDATADIR = "testdata/recompile"; @@ -48,7 +49,7 @@ public class RecompileTest extends FileTestBase { @Test(dataProvider = "provideFiles") public void testAS3InstructionParsing(String filePath) { try { - Configuration.debugCopy.set(false); + Configuration._debugCopy.set(false); try (FileInputStream fis = new FileInputStream(filePath)) { SWF swf = new SWF(new BufferedInputStream(fis), false); for (ABCContainerTag abcTag : swf.getAbcList()) { @@ -69,7 +70,7 @@ public class RecompileTest extends FileTestBase { public void testRecompile(String filePath) { try { try (FileInputStream fis = new FileInputStream(filePath)) { - Configuration.debugCopy.set(true); + Configuration._debugCopy.set(true); SWF swf = new SWF(new BufferedInputStream(fis), false); swf.saveTo(new ByteArrayOutputStream()); } @@ -83,7 +84,7 @@ public class RecompileTest extends FileTestBase { @Test(dataProvider = "provideFiles") public void testTagEditing(String filePath) throws IOException, InterruptedException { try { - Configuration.debugCopy.set(false); + Configuration._debugCopy.set(false); SWF swf = new SWF(new BufferedInputStream(new FileInputStream(filePath)), false, false); for (Tag tag : swf.getTags()) { if (!(tag instanceof TagStub)) { diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/SwfXmlExportImportTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/SwfXmlExportImportTest.java index a1a2a8f65..dc54ee3fb 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/SwfXmlExportImportTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/SwfXmlExportImportTest.java @@ -45,7 +45,8 @@ public class SwfXmlExportImportTest extends FileTestBase { @BeforeClass public void init() { Configuration.autoDeobfuscate.set(false); - Configuration.debugCopy.set(false); + Configuration.simplifyExpressions.set(false); + Configuration._debugCopy.set(false); } public static final String TESTDATADIR = "testdata/decompile";