diff --git a/src/test/java/bytecode/BinaryTest.java b/src/test/java/bytecode/BinaryTest.java index b47841edd..aad81defe 100644 --- a/src/test/java/bytecode/BinaryTest.java +++ b/src/test/java/bytecode/BinaryTest.java @@ -23,7 +23,7 @@ public class BinaryTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/BinaryInMeth.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/BinaryInMeth.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/FacTest.java b/src/test/java/bytecode/FacTest.java index 8152452d3..fcc45ee21 100644 --- a/src/test/java/bytecode/FacTest.java +++ b/src/test/java/bytecode/FacTest.java @@ -24,7 +24,7 @@ public class FacTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Fac.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Fac.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/FacultyTest.java b/src/test/java/bytecode/FacultyTest.java index 07b099e5a..44a0e1c55 100644 --- a/src/test/java/bytecode/FacultyTest.java +++ b/src/test/java/bytecode/FacultyTest.java @@ -24,7 +24,7 @@ public class FacultyTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Faculty.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Faculty.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/FieldTest.java b/src/test/java/bytecode/FieldTest.java index 2d710facc..ed1a562f8 100644 --- a/src/test/java/bytecode/FieldTest.java +++ b/src/test/java/bytecode/FieldTest.java @@ -24,7 +24,7 @@ public class FieldTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Field.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Field.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/FieldTph.java b/src/test/java/bytecode/FieldTph.java index abc1a3fc3..65c7f2917 100644 --- a/src/test/java/bytecode/FieldTph.java +++ b/src/test/java/bytecode/FieldTph.java @@ -24,7 +24,7 @@ public class FieldTph { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FieldTph.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FieldTph.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/FieldTph2Test.java b/src/test/java/bytecode/FieldTph2Test.java index 6da35b7ba..f2b4d4134 100644 --- a/src/test/java/bytecode/FieldTph2Test.java +++ b/src/test/java/bytecode/FieldTph2Test.java @@ -25,7 +25,7 @@ public class FieldTph2Test { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FieldTph2.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FieldTph2.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/FieldTphConsMethTest.java b/src/test/java/bytecode/FieldTphConsMethTest.java index 8748d5352..ecf992d01 100644 --- a/src/test/java/bytecode/FieldTphConsMethTest.java +++ b/src/test/java/bytecode/FieldTphConsMethTest.java @@ -25,7 +25,7 @@ public class FieldTphConsMethTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FieldTphConsMeth.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/FunOLTest.java b/src/test/java/bytecode/FunOLTest.java index 863b3118a..e46f074a9 100644 --- a/src/test/java/bytecode/FunOLTest.java +++ b/src/test/java/bytecode/FunOLTest.java @@ -23,7 +23,7 @@ public class FunOLTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FunOL.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FunOL.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/GenTest.java b/src/test/java/bytecode/GenTest.java index 0dfcba7f1..09d283a39 100644 --- a/src/test/java/bytecode/GenTest.java +++ b/src/test/java/bytecode/GenTest.java @@ -20,7 +20,7 @@ public class GenTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Gen.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Gen.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/GreaterEqualTest.java b/src/test/java/bytecode/GreaterEqualTest.java index 33f716c43..890dea9ee 100644 --- a/src/test/java/bytecode/GreaterEqualTest.java +++ b/src/test/java/bytecode/GreaterEqualTest.java @@ -25,7 +25,7 @@ public class GreaterEqualTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/GreaterEqual.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/GreaterEqual.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/GreaterThanTest.java b/src/test/java/bytecode/GreaterThanTest.java index 595c67ae6..472daa493 100644 --- a/src/test/java/bytecode/GreaterThanTest.java +++ b/src/test/java/bytecode/GreaterThanTest.java @@ -25,7 +25,7 @@ public class GreaterThanTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/GreaterThan.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/GreaterThan.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/IdTest.java b/src/test/java/bytecode/IdTest.java index e60e6990e..d8392e55b 100644 --- a/src/test/java/bytecode/IdTest.java +++ b/src/test/java/bytecode/IdTest.java @@ -25,7 +25,7 @@ public class IdTest { @Test public void test() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Id.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Id.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/LambdaCapturetest.java b/src/test/java/bytecode/LambdaCapturetest.java index c957e64e3..24baaf7a9 100644 --- a/src/test/java/bytecode/LambdaCapturetest.java +++ b/src/test/java/bytecode/LambdaCapturetest.java @@ -30,7 +30,7 @@ public class LambdaCapturetest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/LambdaCapture.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/LambdaCapture.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/LambdaTest.java b/src/test/java/bytecode/LambdaTest.java index c7553c2d9..5428b3338 100644 --- a/src/test/java/bytecode/LambdaTest.java +++ b/src/test/java/bytecode/LambdaTest.java @@ -23,7 +23,7 @@ public class LambdaTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Lambda.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Lambda.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/LambdaVoidTest.java b/src/test/java/bytecode/LambdaVoidTest.java index 6d0a9024e..1a737bd32 100644 --- a/src/test/java/bytecode/LambdaVoidTest.java +++ b/src/test/java/bytecode/LambdaVoidTest.java @@ -23,7 +23,7 @@ public class LambdaVoidTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Lambda.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Lambda.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/LessEqualTest.java b/src/test/java/bytecode/LessEqualTest.java index 217ec4b16..2e39e072c 100644 --- a/src/test/java/bytecode/LessEqualTest.java +++ b/src/test/java/bytecode/LessEqualTest.java @@ -25,7 +25,7 @@ public class LessEqualTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/LessEqual.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/LessEqual.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/LessThanTest.java b/src/test/java/bytecode/LessThanTest.java index 192291a1b..98830542e 100644 --- a/src/test/java/bytecode/LessThanTest.java +++ b/src/test/java/bytecode/LessThanTest.java @@ -25,7 +25,7 @@ public class LessThanTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/LessThan.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/LessThan.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/MatrixOpTest.java b/src/test/java/bytecode/MatrixOpTest.java index 8e876467e..110187018 100644 --- a/src/test/java/bytecode/MatrixOpTest.java +++ b/src/test/java/bytecode/MatrixOpTest.java @@ -28,7 +28,7 @@ public class MatrixOpTest { @Test public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, ClassNotFoundException, IOException, InstantiationException { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/MatrixOP.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/MatrixOP.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/MatrixTest.java b/src/test/java/bytecode/MatrixTest.java index 146e771a3..c5dae3dfc 100644 --- a/src/test/java/bytecode/MatrixTest.java +++ b/src/test/java/bytecode/MatrixTest.java @@ -28,7 +28,7 @@ public class MatrixTest { @Test public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, ClassNotFoundException, IOException, InstantiationException { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Matrix.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Matrix.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/MergeTest.java b/src/test/java/bytecode/MergeTest.java index 1edac3e4f..d259ee2cb 100644 --- a/src/test/java/bytecode/MergeTest.java +++ b/src/test/java/bytecode/MergeTest.java @@ -24,7 +24,7 @@ public class MergeTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Merge.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Merge.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/OLTest.java b/src/test/java/bytecode/OLTest.java index 0eac154cc..e438e7f9b 100644 --- a/src/test/java/bytecode/OLTest.java +++ b/src/test/java/bytecode/OLTest.java @@ -26,7 +26,7 @@ public class OLTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/OL.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/OL.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/OpTest.java b/src/test/java/bytecode/OpTest.java index 138701d18..eeef179b1 100644 --- a/src/test/java/bytecode/OpTest.java +++ b/src/test/java/bytecode/OpTest.java @@ -25,7 +25,7 @@ public class OpTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Op.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Op.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/OverloadingSortingTest.java b/src/test/java/bytecode/OverloadingSortingTest.java index e9751062e..bb174d7d7 100644 --- a/src/test/java/bytecode/OverloadingSortingTest.java +++ b/src/test/java/bytecode/OverloadingSortingTest.java @@ -26,7 +26,7 @@ public class OverloadingSortingTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Sorting.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Sorting.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/OverloadingTest.java b/src/test/java/bytecode/OverloadingTest.java index d1f0187dc..4645110e3 100644 --- a/src/test/java/bytecode/OverloadingTest.java +++ b/src/test/java/bytecode/OverloadingTest.java @@ -27,7 +27,7 @@ public class OverloadingTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Overloading.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Overloading.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/PlusTest.java b/src/test/java/bytecode/PlusTest.java index b7c1298a3..ac20360f9 100644 --- a/src/test/java/bytecode/PlusTest.java +++ b/src/test/java/bytecode/PlusTest.java @@ -24,7 +24,7 @@ public class PlusTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Plus.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Plus.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/PostIncTest.java b/src/test/java/bytecode/PostIncTest.java index 96af21777..902fe2210 100644 --- a/src/test/java/bytecode/PostIncTest.java +++ b/src/test/java/bytecode/PostIncTest.java @@ -24,7 +24,7 @@ public class PostIncTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/PostIncDec.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/PostIncDec.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/PreIncTest.java b/src/test/java/bytecode/PreIncTest.java index 9eb9acc25..ac4e2b55c 100644 --- a/src/test/java/bytecode/PreIncTest.java +++ b/src/test/java/bytecode/PreIncTest.java @@ -24,7 +24,7 @@ public class PreIncTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/PreInc.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/PreInc.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/RelOpsTest.java b/src/test/java/bytecode/RelOpsTest.java index ef5b75792..9ffeeca20 100644 --- a/src/test/java/bytecode/RelOpsTest.java +++ b/src/test/java/bytecode/RelOpsTest.java @@ -24,7 +24,7 @@ public class RelOpsTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/RelOps.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/RelOps.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/SortingTest.java b/src/test/java/bytecode/SortingTest.java index 47c7c949b..4b8abb613 100644 --- a/src/test/java/bytecode/SortingTest.java +++ b/src/test/java/bytecode/SortingTest.java @@ -23,7 +23,7 @@ public class SortingTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Sorting.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Sorting.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/SubMatTest.java b/src/test/java/bytecode/SubMatTest.java index 876c3f7c2..000f7569f 100644 --- a/src/test/java/bytecode/SubMatTest.java +++ b/src/test/java/bytecode/SubMatTest.java @@ -17,7 +17,7 @@ public class SubMatTest { @Test public void test() throws ClassNotFoundException, IOException { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/SubMatrix.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/SubMatrix.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/Tph2Test.java b/src/test/java/bytecode/Tph2Test.java index ca587e0d6..ad9c06f0b 100644 --- a/src/test/java/bytecode/Tph2Test.java +++ b/src/test/java/bytecode/Tph2Test.java @@ -24,7 +24,7 @@ public class Tph2Test { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph2.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph2.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/Tph3Test.java b/src/test/java/bytecode/Tph3Test.java index 8aba473d3..bc680e7ea 100644 --- a/src/test/java/bytecode/Tph3Test.java +++ b/src/test/java/bytecode/Tph3Test.java @@ -21,7 +21,7 @@ public class Tph3Test { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph3.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph3.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/Tph5Test.java b/src/test/java/bytecode/Tph5Test.java index 9a07a7a5c..78b2c4009 100644 --- a/src/test/java/bytecode/Tph5Test.java +++ b/src/test/java/bytecode/Tph5Test.java @@ -24,7 +24,7 @@ public class Tph5Test { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph5.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph5.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/TphTest.java b/src/test/java/bytecode/TphTest.java index 2a7e395e2..45bb698a7 100644 --- a/src/test/java/bytecode/TphTest.java +++ b/src/test/java/bytecode/TphTest.java @@ -24,7 +24,7 @@ public class TphTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/WhileTest.java b/src/test/java/bytecode/WhileTest.java index 5cebf8a33..f18577d74 100644 --- a/src/test/java/bytecode/WhileTest.java +++ b/src/test/java/bytecode/WhileTest.java @@ -24,7 +24,7 @@ public class WhileTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/While.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/While.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"; diff --git a/src/test/java/bytecode/YTest.java b/src/test/java/bytecode/YTest.java index 396b1584e..2a63a3ed5 100644 --- a/src/test/java/bytecode/YTest.java +++ b/src/test/java/bytecode/YTest.java @@ -23,7 +23,7 @@ public class YTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Y.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Y.jav"; fileToTest = new File(path); // compiler = new JavaTXCompiler(fileToTest); // compiler.generateBytecode(System.getProperty("user.dir")+"/testBytecode/generatedBC/"); diff --git a/src/test/java/bytecode/applyLambdaTest.java b/src/test/java/bytecode/applyLambdaTest.java index 26b004f5a..3c7ea4526 100644 --- a/src/test/java/bytecode/applyLambdaTest.java +++ b/src/test/java/bytecode/applyLambdaTest.java @@ -22,7 +22,7 @@ public class applyLambdaTest { @Test public void generateBC() throws Exception { - path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/applyLambda.jav"; + path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/applyLambda.jav"; fileToTest = new File(path); compiler = new JavaTXCompiler(fileToTest); compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/"); diff --git a/src/test/resources/bytecodeJavFiles/AssignToLit.jav b/src/test/resources/bytecode/javFiles/AssignToLit.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/AssignToLit.jav rename to src/test/resources/bytecode/javFiles/AssignToLit.jav diff --git a/src/test/resources/bytecodeJavFiles/BinaryInMeth.jav b/src/test/resources/bytecode/javFiles/BinaryInMeth.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/BinaryInMeth.jav rename to src/test/resources/bytecode/javFiles/BinaryInMeth.jav diff --git a/src/test/resources/bytecodeJavFiles/DuMethod.jav b/src/test/resources/bytecode/javFiles/DuMethod.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/DuMethod.jav rename to src/test/resources/bytecode/javFiles/DuMethod.jav diff --git a/src/test/resources/bytecodeJavFiles/EmptyMethod.jav b/src/test/resources/bytecode/javFiles/EmptyMethod.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/EmptyMethod.jav rename to src/test/resources/bytecode/javFiles/EmptyMethod.jav diff --git a/src/test/resources/bytecodeJavFiles/Example.jav b/src/test/resources/bytecode/javFiles/Example.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Example.jav rename to src/test/resources/bytecode/javFiles/Example.jav diff --git a/src/test/resources/bytecodeJavFiles/Exceptions.jav b/src/test/resources/bytecode/javFiles/Exceptions.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Exceptions.jav rename to src/test/resources/bytecode/javFiles/Exceptions.jav diff --git a/src/test/resources/bytecodeJavFiles/Fac.jav b/src/test/resources/bytecode/javFiles/Fac.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Fac.jav rename to src/test/resources/bytecode/javFiles/Fac.jav diff --git a/src/test/resources/bytecodeJavFiles/Faculty.jav b/src/test/resources/bytecode/javFiles/Faculty.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Faculty.jav rename to src/test/resources/bytecode/javFiles/Faculty.jav diff --git a/src/test/resources/bytecodeJavFiles/Faculty2.jav b/src/test/resources/bytecode/javFiles/Faculty2.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Faculty2.jav rename to src/test/resources/bytecode/javFiles/Faculty2.jav diff --git a/src/test/resources/bytecodeJavFiles/Field.jav b/src/test/resources/bytecode/javFiles/Field.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Field.jav rename to src/test/resources/bytecode/javFiles/Field.jav diff --git a/src/test/resources/bytecodeJavFiles/FieldTph.jav b/src/test/resources/bytecode/javFiles/FieldTph.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/FieldTph.jav rename to src/test/resources/bytecode/javFiles/FieldTph.jav diff --git a/src/test/resources/bytecodeJavFiles/FieldTph2.jav b/src/test/resources/bytecode/javFiles/FieldTph2.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/FieldTph2.jav rename to src/test/resources/bytecode/javFiles/FieldTph2.jav diff --git a/src/test/resources/bytecodeJavFiles/FieldTphConsMeth.jav b/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/FieldTphConsMeth.jav rename to src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav diff --git a/src/test/resources/bytecodeJavFiles/For.jav b/src/test/resources/bytecode/javFiles/For.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/For.jav rename to src/test/resources/bytecode/javFiles/For.jav diff --git a/src/test/resources/bytecodeJavFiles/FunOL.jav b/src/test/resources/bytecode/javFiles/FunOL.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/FunOL.jav rename to src/test/resources/bytecode/javFiles/FunOL.jav diff --git a/src/test/resources/bytecodeJavFiles/Gen.jav b/src/test/resources/bytecode/javFiles/Gen.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Gen.jav rename to src/test/resources/bytecode/javFiles/Gen.jav diff --git a/src/test/resources/bytecodeJavFiles/Generics.jav b/src/test/resources/bytecode/javFiles/Generics.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Generics.jav rename to src/test/resources/bytecode/javFiles/Generics.jav diff --git a/src/test/resources/bytecodeJavFiles/Generics2.jav b/src/test/resources/bytecode/javFiles/Generics2.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Generics2.jav rename to src/test/resources/bytecode/javFiles/Generics2.jav diff --git a/src/test/resources/bytecodeJavFiles/GreaterEqual.jav b/src/test/resources/bytecode/javFiles/GreaterEqual.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/GreaterEqual.jav rename to src/test/resources/bytecode/javFiles/GreaterEqual.jav diff --git a/src/test/resources/bytecodeJavFiles/GreaterThan.jav b/src/test/resources/bytecode/javFiles/GreaterThan.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/GreaterThan.jav rename to src/test/resources/bytecode/javFiles/GreaterThan.jav diff --git a/src/test/resources/bytecodeJavFiles/Id.jav b/src/test/resources/bytecode/javFiles/Id.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Id.jav rename to src/test/resources/bytecode/javFiles/Id.jav diff --git a/src/test/resources/bytecodeJavFiles/IfTest.jav b/src/test/resources/bytecode/javFiles/IfTest.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/IfTest.jav rename to src/test/resources/bytecode/javFiles/IfTest.jav diff --git a/src/test/resources/bytecodeJavFiles/Import.jav b/src/test/resources/bytecode/javFiles/Import.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Import.jav rename to src/test/resources/bytecode/javFiles/Import.jav diff --git a/src/test/resources/bytecodeJavFiles/Interface1.jav b/src/test/resources/bytecode/javFiles/Interface1.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Interface1.jav rename to src/test/resources/bytecode/javFiles/Interface1.jav diff --git a/src/test/resources/bytecodeJavFiles/LamRunnable.jav b/src/test/resources/bytecode/javFiles/LamRunnable.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/LamRunnable.jav rename to src/test/resources/bytecode/javFiles/LamRunnable.jav diff --git a/src/test/resources/bytecodeJavFiles/Lambda.jav b/src/test/resources/bytecode/javFiles/Lambda.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Lambda.jav rename to src/test/resources/bytecode/javFiles/Lambda.jav diff --git a/src/test/resources/bytecodeJavFiles/Lambda2.jav b/src/test/resources/bytecode/javFiles/Lambda2.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Lambda2.jav rename to src/test/resources/bytecode/javFiles/Lambda2.jav diff --git a/src/test/resources/bytecodeJavFiles/Lambda3.jav b/src/test/resources/bytecode/javFiles/Lambda3.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Lambda3.jav rename to src/test/resources/bytecode/javFiles/Lambda3.jav diff --git a/src/test/resources/bytecodeJavFiles/Lambda4.jav b/src/test/resources/bytecode/javFiles/Lambda4.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Lambda4.jav rename to src/test/resources/bytecode/javFiles/Lambda4.jav diff --git a/src/test/resources/bytecodeJavFiles/LambdaCapture.jav b/src/test/resources/bytecode/javFiles/LambdaCapture.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/LambdaCapture.jav rename to src/test/resources/bytecode/javFiles/LambdaCapture.jav diff --git a/src/test/resources/bytecodeJavFiles/LambdaVoid.jav b/src/test/resources/bytecode/javFiles/LambdaVoid.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/LambdaVoid.jav rename to src/test/resources/bytecode/javFiles/LambdaVoid.jav diff --git a/src/test/resources/bytecodeJavFiles/LessEqual.jav b/src/test/resources/bytecode/javFiles/LessEqual.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/LessEqual.jav rename to src/test/resources/bytecode/javFiles/LessEqual.jav diff --git a/src/test/resources/bytecodeJavFiles/LessThan.jav b/src/test/resources/bytecode/javFiles/LessThan.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/LessThan.jav rename to src/test/resources/bytecode/javFiles/LessThan.jav diff --git a/src/test/resources/bytecodeJavFiles/Matrix.jav b/src/test/resources/bytecode/javFiles/Matrix.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Matrix.jav rename to src/test/resources/bytecode/javFiles/Matrix.jav diff --git a/src/test/resources/bytecodeJavFiles/MatrixOP.jav b/src/test/resources/bytecode/javFiles/MatrixOP.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/MatrixOP.jav rename to src/test/resources/bytecode/javFiles/MatrixOP.jav diff --git a/src/test/resources/bytecodeJavFiles/Merge.jav b/src/test/resources/bytecode/javFiles/Merge.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Merge.jav rename to src/test/resources/bytecode/javFiles/Merge.jav diff --git a/src/test/resources/bytecodeJavFiles/Methods.jav b/src/test/resources/bytecode/javFiles/Methods.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Methods.jav rename to src/test/resources/bytecode/javFiles/Methods.jav diff --git a/src/test/resources/bytecodeJavFiles/OL.jav b/src/test/resources/bytecode/javFiles/OL.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/OL.jav rename to src/test/resources/bytecode/javFiles/OL.jav diff --git a/src/test/resources/bytecodeJavFiles/Op.jav b/src/test/resources/bytecode/javFiles/Op.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Op.jav rename to src/test/resources/bytecode/javFiles/Op.jav diff --git a/src/test/resources/bytecodeJavFiles/Op2.jav b/src/test/resources/bytecode/javFiles/Op2.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Op2.jav rename to src/test/resources/bytecode/javFiles/Op2.jav diff --git a/src/test/resources/bytecodeJavFiles/OverlaodGen.jav b/src/test/resources/bytecode/javFiles/OverlaodGen.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/OverlaodGen.jav rename to src/test/resources/bytecode/javFiles/OverlaodGen.jav diff --git a/src/test/resources/bytecodeJavFiles/Overloading.jav b/src/test/resources/bytecode/javFiles/Overloading.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Overloading.jav rename to src/test/resources/bytecode/javFiles/Overloading.jav diff --git a/src/test/resources/bytecodeJavFiles/Plus.jav b/src/test/resources/bytecode/javFiles/Plus.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Plus.jav rename to src/test/resources/bytecode/javFiles/Plus.jav diff --git a/src/test/resources/bytecodeJavFiles/PostIncDec.jav b/src/test/resources/bytecode/javFiles/PostIncDec.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/PostIncDec.jav rename to src/test/resources/bytecode/javFiles/PostIncDec.jav diff --git a/src/test/resources/bytecodeJavFiles/PreInc.jav b/src/test/resources/bytecode/javFiles/PreInc.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/PreInc.jav rename to src/test/resources/bytecode/javFiles/PreInc.jav diff --git a/src/test/resources/bytecodeJavFiles/RecursiveMeth.jav b/src/test/resources/bytecode/javFiles/RecursiveMeth.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/RecursiveMeth.jav rename to src/test/resources/bytecode/javFiles/RecursiveMeth.jav diff --git a/src/test/resources/bytecodeJavFiles/RelOps.jav b/src/test/resources/bytecode/javFiles/RelOps.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/RelOps.jav rename to src/test/resources/bytecode/javFiles/RelOps.jav diff --git a/src/test/resources/bytecodeJavFiles/ReturnMethod.jav b/src/test/resources/bytecode/javFiles/ReturnMethod.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/ReturnMethod.jav rename to src/test/resources/bytecode/javFiles/ReturnMethod.jav diff --git a/src/test/resources/bytecodeJavFiles/Sorting.jav b/src/test/resources/bytecode/javFiles/Sorting.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Sorting.jav rename to src/test/resources/bytecode/javFiles/Sorting.jav diff --git a/src/test/resources/bytecodeJavFiles/StaticM.jav b/src/test/resources/bytecode/javFiles/StaticM.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/StaticM.jav rename to src/test/resources/bytecode/javFiles/StaticM.jav diff --git a/src/test/resources/bytecodeJavFiles/SubMatrix.jav b/src/test/resources/bytecode/javFiles/SubMatrix.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/SubMatrix.jav rename to src/test/resources/bytecode/javFiles/SubMatrix.jav diff --git a/src/test/resources/bytecodeJavFiles/Tph.jav b/src/test/resources/bytecode/javFiles/Tph.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Tph.jav rename to src/test/resources/bytecode/javFiles/Tph.jav diff --git a/src/test/resources/bytecodeJavFiles/Tph2.jav b/src/test/resources/bytecode/javFiles/Tph2.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Tph2.jav rename to src/test/resources/bytecode/javFiles/Tph2.jav diff --git a/src/test/resources/bytecodeJavFiles/Tph3.jav b/src/test/resources/bytecode/javFiles/Tph3.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Tph3.jav rename to src/test/resources/bytecode/javFiles/Tph3.jav diff --git a/src/test/resources/bytecodeJavFiles/Tph4.jav b/src/test/resources/bytecode/javFiles/Tph4.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Tph4.jav rename to src/test/resources/bytecode/javFiles/Tph4.jav diff --git a/src/test/resources/bytecodeJavFiles/Tph5.jav b/src/test/resources/bytecode/javFiles/Tph5.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Tph5.jav rename to src/test/resources/bytecode/javFiles/Tph5.jav diff --git a/src/test/resources/bytecode/javFiles/Tph6.jav b/src/test/resources/bytecode/javFiles/Tph6.jav new file mode 100644 index 000000000..2f9e42946 --- /dev/null +++ b/src/test/resources/bytecode/javFiles/Tph6.jav @@ -0,0 +1,14 @@ +public class Tph6 { +// m(a,b,c){ +// a = c; +// b = c; +// return a; +// } + + m(x,y){ + var c = m2(y); + c = m2(x); + } + + m2(y) { return y; } +} diff --git a/src/test/resources/bytecodeJavFiles/VectorAdd.jav b/src/test/resources/bytecode/javFiles/VectorAdd.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/VectorAdd.jav rename to src/test/resources/bytecode/javFiles/VectorAdd.jav diff --git a/src/test/resources/bytecodeJavFiles/VoidMeth.jav b/src/test/resources/bytecode/javFiles/VoidMeth.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/VoidMeth.jav rename to src/test/resources/bytecode/javFiles/VoidMeth.jav diff --git a/src/test/resources/bytecodeJavFiles/WC.jav b/src/test/resources/bytecode/javFiles/WC.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/WC.jav rename to src/test/resources/bytecode/javFiles/WC.jav diff --git a/src/test/resources/bytecodeJavFiles/While.jav b/src/test/resources/bytecode/javFiles/While.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/While.jav rename to src/test/resources/bytecode/javFiles/While.jav diff --git a/src/test/resources/bytecodeJavFiles/Y.jav b/src/test/resources/bytecode/javFiles/Y.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/Y.jav rename to src/test/resources/bytecode/javFiles/Y.jav diff --git a/src/test/resources/bytecodeJavFiles/applyLambda.jav b/src/test/resources/bytecode/javFiles/applyLambda.jav similarity index 100% rename from src/test/resources/bytecodeJavFiles/applyLambda.jav rename to src/test/resources/bytecode/javFiles/applyLambda.jav