renamed new as3 test swfs to have as3 prefix and unique SWF name

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3AssembledDecompileTest.java

@@ -12,7 +12,7 @@ public class ActionScript3AssembledDecompileTest extends ActionScript3DecompileT
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("assembled", "testdata/custom/bin/custom.swf");
+        addSwf("assembled", "testdata/as3_assembled/bin/as3_assembled.swf");
     }
 
     @Test

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassTest.java

@@ -24,7 +24,7 @@ public class ActionScript3ClassTest extends ActionScript3DecompileTestBase {
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("standard", "testdata/flashdevelop/bin/Main.flex.swf");
+        addSwf("standard", "testdata/as3_new/bin/as3_new.flex.swf");
     }
 
     private void decompileScriptPack(String path, String expectedResult) {
@@ -55,6 +55,7 @@ public class ActionScript3ClassTest extends ActionScript3DecompileTestBase {
         expectedResult = cleanPCode(expectedResult);
         assertEquals(actualResult, expectedResult);
     }
+
     @Test
     public void testMyPackage1TestClass() {
         decompileScriptPack("tests_classes.mypackage1.TestClass", "package tests_classes.mypackage1\n"

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassicDecompileTest.java

@@ -12,7 +12,7 @@ public class ActionScript3ClassicDecompileTest extends ActionScript3DecompileTes
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("classic", "testdata/flashdevelop/bin/Main.flex.swf");
+        addSwf("classic", "testdata/as3_new/bin/as3_new.flex.swf");
     }
 
     @Test

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileDecompileTest.java

@@ -13,8 +13,8 @@ public class ActionScript3CrossCompileDecompileTest extends ActionScript3Decompi
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("flex", "testdata/cross_compile/bin/Main.flex.swf");
-        addSwf("air", "testdata/cross_compile/bin/Main.air.swf");
+        addSwf("flex", "testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf");
+        addSwf("air", "testdata/as3_cross_compile/bin/as3_cross_compile.air.swf");
     }
 
     @DataProvider

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileSwfToolsDecompileTest.java

@@ -12,7 +12,7 @@ public class ActionScript3CrossCompileSwfToolsDecompileTest extends ActionScript
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("swftools", "testdata/cross_compile/bin/Main.swftools.swf");
+        addSwf("swftools", "testdata/as3_cross_compile/bin/as3_cross_compile.swftools.swf");
     }
 
     @Test

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3OptinalParametersTest.java

@@ -21,7 +21,7 @@ public class ActionScript3OptinalParametersTest extends ActionScript3DecompileTe
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("standard", "testdata/flashdevelop/bin/Main.flex.swf");
+        addSwf("standard", "testdata/as3_new/bin/as3_new.flex.swf");
     }
     @Test
     public void testOptionalParameters() {

libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/generators/AS3Generator.java

@@ -170,14 +170,14 @@ public class AS3Generator {
         Configuration.autoDeobfuscate.set(false);
 
 
-        useFile("ActionScript3ClassicDecompileTest", new String[][]{{"testdata/flashdevelop/bin/Main.flex.swf", "classic"}}, false);
+        useFile("ActionScript3ClassicDecompileTest", new String[][]{{"testdata/as3_new/bin/as3_new.flex.swf", "classic"}}, false);
         useFile("ActionScript3CrossCompileDecompileTest", new String[][]{
-            {"testdata/cross_compile/bin/Main.flex.swf", "flex"},
-            {"testdata/cross_compile/bin/Main.air.swf", "air"}
+            {"testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf", "flex"},
+            {"testdata/as3_cross_compile/bin/as3_cross_compile.air.swf", "air"}
         }, true);
         useFile("ActionScript3CrossCompileSwfToolsDecompileTest", new String[][]{
-            {"testdata/cross_compile/bin/Main.swftools.swf", "swftools"},}, false);
-        useFile("ActionScript3AssembledDecompileTest", new String[][]{{"testdata/custom/bin/custom.swf", "assembled"}}, false);
+            {"testdata/as3_cross_compile/bin/as3_cross_compile.swftools.swf", "swftools"},}, false);
+        useFile("ActionScript3AssembledDecompileTest", new String[][]{{"testdata/as3_assembled/bin/as3_assembled.swf", "assembled"}}, false);
 
         System.exit(0);
     }

libsrc/ffdec_lib/testdata/as3_assembled/run_abcexport.bat

@@ -1,7 +1,8 @@
 @echo off
 set RABCDASM_PATH=c:\RABCDasm
+set SWFNAME=as3_assembled
 rd /s /q .\abc
-%RABCDASM_PATH%\abcexport.exe .\bin\custom.swf
+%RABCDASM_PATH%\abcexport.exe .\bin\%SWFNAME%.swf
 mkdir .\abc
 move .\bin\*.abc abc\>NUL
 set ABC_DIR=.\abc

libsrc/ffdec_lib/testdata/as3_assembled/run_rabcasm.bat

@@ -0,0 +1,6 @@
+@echo off
+set RABCDASM_PATH=c:\RABCDasm
+set SWFNAME=as3_assembled
+%RABCDASM_PATH%\rabcasm.exe abc\%SWFNAME%-0\%SWFNAME%-0.main.asasm
+%RABCDASM_PATH%\abcreplace.exe bin\%SWFNAME%.swf 0 abc\%SWFNAME%-0\%SWFNAME%-0.main.abc
+pause

libsrc/ffdec_lib/testdata/as3_cross_compile/as3_cross_compile.as3proj

@@ -4,7 +4,7 @@
   <output>
     <movie outputType="Application" />
     <movie input="" />
-    <movie path="bin\Main.flex.swf" />
+    <movie path="bin\as3_cross_compile.flex.swf" />
     <movie fps="30" />
     <movie width="800" />
     <movie height="600" />

libsrc/ffdec_lib/testdata/as3_cross_compile/build_air_debug.bat

@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=air
+set SWFNAME=as3_cross_compile
+call c:\air\bin\mxmlc.bat -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1

libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_apache_debug.bat

@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=flex_apache
+set SWFNAME=as3_cross_compile
+call c:\flex_apache\bin\mxmlc.bat -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1

libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_debug.bat

@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=flex
+set SWFNAME=as3_cross_compile
+c:\flex\bin\mxmlc.exe -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1

libsrc/ffdec_lib/testdata/as3_cross_compile/build_swftools_debug.bat

@@ -0,0 +1,5 @@
+@echo off
+set COMPILERKIND=swftools
+set SWFNAME=as3_cross_compile
+cd src
+c:\swftools\as3compile.exe Main.as -o ..\bin\%SWFNAME%.%COMPILERKIND%.swf 1> ../buildlog.%COMPILERKIND%.txt 2>&1

libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.old

@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>

libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.xml

@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'02.02.2021'</value>
+      <value>'03.02.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>
@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>

libsrc/ffdec_lib/testdata/as3_new/as3_new.as3proj

@@ -4,7 +4,7 @@
   <output>
     <movie outputType="Application" />
     <movie input="" />
-    <movie path="bin\Main.flex.swf" />
+    <movie path="bin\as3_new.flex.swf" />
     <movie fps="30" />
     <movie width="800" />
     <movie height="600" />

libsrc/ffdec_lib/testdata/as3_new/build_air_debug.bat

@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=air
+set SWFNAME=as3_new
+call c:\air\bin\mxmlc.bat -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1

libsrc/ffdec_lib/testdata/as3_new/build_flex_debug.bat

@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=flex
+set SWFNAME=as3_new
+c:\flex\bin\mxmlc.exe -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1

libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.old

@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>

libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.xml

@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'02.02.2021'</value>
+      <value>'03.02.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>
@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>