From a3fa33b922b81d4f6a7491fcd851130cdcb2a94c Mon Sep 17 00:00:00 2001 From: JonathanFleischmann Date: Fri, 5 Jul 2024 08:58:10 +0200 Subject: [PATCH 1/3] shortened Leistungs-Description in Readme for Jonathan --- README.md | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7f1cbab..62299e6 100644 --- a/README.md +++ b/README.md @@ -12,19 +12,9 @@ - Julian Kraus: Grammatik entwickeln, Generator, Syntactic Sugar auflösen, Parser Exceptions sammeln - Ahmad Juha: Typcheck - Simon Wittmann: Codegen, Logging, CommandLine Nutzung -- Jonathan Fleischmann: - - Schreiben von Tests, die die einzelnen Features abdecken - - Umwandlung der Testfiles in AST und TypedAST - - Implementierung der Tests, die mithilfe der umgewandelten Testfiles die korrekte Umwandlung - von java-File zu AST und AST zu TypedAST prüfen - - Schreiben von Testfiles, die die einzelnen Features abdecken und gut über Reflections testbar sind - - Implementierung eines Tools, durch das die Testfiles mithilfe von Reflections - einfacher nach gewissen Kriterien überprüfbar sind - - Implementierung von Tests, die die korrekte Umwandlung der Testfiles von java-File in class-File - durch den Compiler mithilfe des Tools prüfen - - Hinzufügen von Testfiles, die bei der Umwandlung fehlschlagen sollen - - Implementierung von Tests, die prüfen, ob der Compiler bei den fehlerhaften Testfiles tatsächlich fehlschlägt - - Dokumentation der Tests +- Jonathan Fleischmann: Testfiles, manuelle übersetzung in AST und TypedAST, JUnit-Tests für Scanner, Parser und + Typecheck und Compiler, Testfiles für E2E-Tests, JUnit-Tests für E2E-Tests mit Reflections, Negative Testfiles und + Überprüfung, ob sie bei Kompilierung Fehler werfen, Dokumentation ## Besonderheiten unserer Implementierung @@ -40,7 +30,7 @@ ## Aufbau der Tests -### Tests für den Scanner, Parser und Typechecker: +### Tests für den Scanner, Parser und Typecheck: - Die Testfiles (.java), die alle Features abdecken, sind im Ordner `src/test/testFiles/ASTandTypedASTFeatures` zu finden. Ihr Name gibt circa an, welches Feature / welche Features sie abdecken - Ihre manuell übersetzten ASTs und TypedASTs befinden sich im Ordner `src/test/testFiles/ASTandTypedASTFeatures` @@ -55,7 +45,7 @@ und `src/test/java/TypingTests.java` geprüft, jedoch sind die Unit-Tests hier nicht vollständig. ### Tests für den gesamten Compiler: -- Da die Kompilierung der Testfiles für den Scanner, Parser und Typechecker teilweise nicht gut mit Reflections testbar ist, +- Da die Kompilierung der Testfiles für den Scanner, Parser und Typecheck teilweise nicht gut mit Reflections testbar ist, gibt es extra Testfiles für das Testen des Compilers im Ordner `src/test/testFiles/E2EFeatures` - Jedes der Testfiles hat eine eigene Testklasse, welche sich im Ordner `src/test/java/E2ETests/Features` befindet. Diese Testklassen haben jeweils einen Namen, der sich aus `E2E_` und dem Namen des Testfiles zusammensetzt. Sie prüfen From ade2c3f10eae7ccc5dfcf7a2c4e5ab4b9deef6a8 Mon Sep 17 00:00:00 2001 From: JonathanFleischmann Date: Fri, 5 Jul 2024 10:43:34 +0200 Subject: [PATCH 2/3] cleaned up tests --- README.md | 39 +++--- src/test/java/AllE2ETests.java | 125 ------------------ src/test/java/HelpClasses/TestFileTester.java | 77 ----------- .../RestOfNegativeTests.java} | 34 +---- .../FeaturesASTs}/AST_Break.java | 2 +- .../FeaturesASTs}/AST_Class.java | 2 +- .../FeaturesASTs}/AST_ClassObjects.java | 2 +- .../FeaturesASTs}/AST_Comment.java | 2 +- .../FeaturesASTs}/AST_CompAssign.java | 2 +- .../FeaturesASTs}/AST_ComplexCalls.java | 2 +- .../FeaturesASTs}/AST_Constructor.java | 2 +- .../FeaturesASTs}/AST_Continue.java | 2 +- .../FeaturesASTs}/AST_DataTypes.java | 2 +- .../FeaturesASTs}/AST_Field.java | 2 +- .../FeaturesASTs}/AST_For.java | 2 +- .../FeaturesASTs}/AST_If.java | 2 +- .../FeaturesASTs}/AST_InDeCrement.java | 2 +- .../FeaturesASTs}/AST_LogicExpr.java | 2 +- .../FeaturesASTs}/AST_Main.java | 2 +- .../FeaturesASTs}/AST_Method.java | 2 +- .../FeaturesASTs}/AST_MethodCall.java | 2 +- .../FeaturesASTs}/AST_MultipleClasses.java | 2 +- .../FeaturesASTs}/AST_Operators.java | 2 +- .../FeaturesASTs}/AST_Overloaded.java | 2 +- .../FeaturesASTs}/AST_Print.java | 2 +- .../FeaturesASTs}/AST_Return.java | 2 +- .../FeaturesASTs}/AST_Unary.java | 2 +- .../AST_VariableDefWithDecl.java | 2 +- .../FeaturesASTs}/AST_While.java | 2 +- .../AbstractSyntax_ClassCanBeBytecoded.java | 2 +- .../AbstractSyntax_ClassWithConstructor.java | 2 +- ...tax_ClassWithConstructorAndMethodCall.java | 2 +- ...lassWithConstructorWithCodeInComments.java | 2 +- ...ax_ClassWithConstructorWithParameters.java | 2 +- .../AbstractSyntax_ClassWithField.java | 2 +- .../AbstractSyntax_ClassWithMethod.java | 2 +- ...bstractSyntax_ClassWithMethodAndField.java | 2 +- ...stractSyntax_ClassWithMultipleMethods.java | 2 +- .../AbstractSyntax_ComplexClass.java | 2 +- .../AbstractSyntax_PublicClass.java | 2 +- .../ScannerParserTests.java | 9 +- .../FeaturesTypedASTs}/TypedAST_Break.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Class.java | 2 +- .../TypedAST_ClassObjects.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Comment.java | 2 +- .../TypedAST_CompAssign.java | 2 +- .../TypedAST_ComplexCalls.java | 2 +- .../TypedAST_Constructor.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Continue.java | 2 +- .../TypedAST_DataTypes.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Field.java | 2 +- .../FeaturesTypedASTs}/TypedAST_For.java | 2 +- .../FeaturesTypedASTs}/TypedAST_If.java | 2 +- .../TypedAST_InDeCrement.java | 2 +- .../TypedAST_LogicExpr.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Main.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Method.java | 2 +- .../TypedAST_MethodCall.java | 2 +- .../TypedAST_MultipleClasses.java | 2 +- .../TypedAST_Operators.java | 2 +- .../TypedAST_Overloaded.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Print.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Return.java | 2 +- .../FeaturesTypedASTs}/TypedAST_Unary.java | 2 +- .../TypedAST_VariableDefWithDecl.java | 2 +- .../FeaturesTypedASTs}/TypedAST_While.java | 2 +- ...edAbstractSyntax_ClassWithConstructor.java | 2 +- ...tax_ClassWithConstructorAndMethodCall.java | 2 +- ...lassWithConstructorWithCodeInComments.java | 2 +- ...ax_ClassWithConstructorWithParameters.java | 2 +- .../TypedAbstractSyntax_ClassWithField.java | 2 +- .../TypedAbstractSyntax_ClassWithMethod.java | 2 +- ...bstractSyntax_ClassWithMethodAndField.java | 2 +- ...tax_ClassWithMoreComplexMethodAndMain.java | 2 +- .../TypedAbstractSyntax_ComplexClass.java | 2 +- .../TypedAbstractSyntax_PublicClass.java | 2 +- .../{ => TypeCheckTests}/TypingTests.java | 18 ++- 77 files changed, 112 insertions(+), 332 deletions(-) delete mode 100644 src/test/java/AllE2ETests.java delete mode 100644 src/test/java/HelpClasses/TestFileTester.java rename src/test/java/{AllNegativeTests.java => NegativeTests/RestOfNegativeTests.java} (52%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Break.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Class.java (96%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_ClassObjects.java (98%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Comment.java (96%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_CompAssign.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_ComplexCalls.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Constructor.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Continue.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_DataTypes.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Field.java (98%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_For.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_If.java (98%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_InDeCrement.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_LogicExpr.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Main.java (97%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Method.java (97%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_MethodCall.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_MultipleClasses.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Operators.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Overloaded.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Print.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Return.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_Unary.java (99%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_VariableDefWithDecl.java (98%) rename src/test/java/{FeatureTestResources/AST => ScannerParserTests/FeaturesASTs}/AST_While.java (99%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassCanBeBytecoded.java (98%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithConstructor.java (99%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithConstructorAndMethodCall.java (98%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithConstructorWithCodeInComments.java (97%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithConstructorWithParameters.java (98%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithField.java (93%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithMethod.java (95%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithMethodAndField.java (96%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ClassWithMultipleMethods.java (98%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_ComplexClass.java (99%) rename src/test/java/{MoreTestResources/AST => ScannerParserTests/MoreTestsASTs}/AbstractSyntax_PublicClass.java (93%) rename src/test/java/{ => ScannerParserTests}/ScannerParserTests.java (97%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Break.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Class.java (97%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_ClassObjects.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Comment.java (97%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_CompAssign.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_ComplexCalls.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Constructor.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Continue.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_DataTypes.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Field.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_For.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_If.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_InDeCrement.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_LogicExpr.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Main.java (98%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Method.java (97%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_MethodCall.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_MultipleClasses.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Operators.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Overloaded.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Print.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Return.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_Unary.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_VariableDefWithDecl.java (99%) rename src/test/java/{FeatureTestResources/TypedAST => TypeCheckTests/FeaturesTypedASTs}/TypedAST_While.java (99%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithConstructor.java (99%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java (98%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java (97%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithConstructorWithParameters.java (98%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithField.java (95%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithMethod.java (94%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithMethodAndField.java (96%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java (98%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_ComplexClass.java (99%) rename src/test/java/{MoreTestResources/TypedAST => TypeCheckTests/MoreTestsTypedASTs}/TypedAbstractSyntax_PublicClass.java (95%) rename src/test/java/{ => TypeCheckTests}/TypingTests.java (90%) diff --git a/README.md b/README.md index 62299e6..6509fe3 100644 --- a/README.md +++ b/README.md @@ -32,17 +32,17 @@ ### Tests für den Scanner, Parser und Typecheck: - Die Testfiles (.java), die alle Features abdecken, sind im Ordner `src/test/testFiles/ASTandTypedASTFeatures` zu finden. - Ihr Name gibt circa an, welches Feature / welche Features sie abdecken -- Ihre manuell übersetzten ASTs und TypedASTs befinden sich im Ordner `src/test/testFiles/ASTandTypedASTFeatures` -- Die Klasse `src/test/java/ScannerParserTests.java` enthält die JUnit-Tests, die die korrekte Umwandlung der Testfiles in AST - durch den Compiler prüfen, indem sie den durch den Compiler generierten AST mit dem manuell erstellten AST vergleichen -- Die Klasse `src/test/java/TypingTests.java` enthält die JUnit-Tests, die die korrekte Umwandlung der manuell erstellten ASTs - in TypedASTs durch den Compiler prüfen, indem sie den durch den Compiler generierten TypedAST mit dem manuell erstellten - TypedAST vergleichen + Der Name des jeweiligen Files gibt circa an, welches Feature / welche Features es abdeckt. +- Ihre manuell übersetzten ASTs befinden sich im Ordner `src/test/java/ScannerParserTests/FeaturesASTs` +- Die Übereinstimmung der manuell übersetzten ASTs mit den vom Compiler generierten ASTs wird mit JUnit-Tests im File + `src/test/java/ScannerParserTests/ScannerParserTests.java` überprüft +- Die manuell übersetzten TypedASTs befinden sich im Ordner `src/test/java/TypeCheckTests/FeaturesTypedASTs` +- Die Übereinstimmung der manuell übersetzten TypedASTs mit den vom Compiler generierten TypedASTs wird mit JUnit-Tests im File + `src/test/java/TypeCheckTests/TypingTests.java` überprüft - Weitere Testfiles, die nicht unbedingt auf ein bestimmtes Feature abzielen, sind im Ordner `src/test/testFiles/MoreTestFiles` - zu finden, die manuell übersetzen ASTs und TypedASTs dazu sind im Ordner `src/test/java/MoreTestResources` zu finden. - Die korrekte Umwandlung dieser Testfiles in AST und TypedAST wird ebenfalls durch die Klassen `src/test/java/ScannerParserTests.java` - und `src/test/java/TypingTests.java` geprüft, jedoch sind die Unit-Tests hier nicht vollständig. + zu finden, die manuell übersetzen ASTs und TypedASTs dazu sind im Ordner `src/test/java/ScannerParserTests/MoreTestsASTs` + und `src/test/java/TypeCheckTests/MoreTestsTypedASTs` zu finden. Die korrekte Umwandlung der Testfiles in AST und + TypedAST wird in den gleichen Testklassen wie die Features getestet. ### Tests für den gesamten Compiler: - Da die Kompilierung der Testfiles für den Scanner, Parser und Typecheck teilweise nicht gut mit Reflections testbar ist, @@ -51,21 +51,16 @@ Testklassen haben jeweils einen Namen, der sich aus `E2E_` und dem Namen des Testfiles zusammensetzt. Sie prüfen mithilfe der Hilfsklasse `src/test/java/E2ETests/BytecodeTestUtil.java`, ob der Compiler die Testfiles korrekt in class-Files umwandelt. Die Hilfsklasse erstellt ein Class-Objekt der Klasse und implementiert Methoden, welche mit - Reflections Werte aus dem Objekt auslesen und zurückgeben. Diese Werte werden dann mit den erwarteten Werten in der - jeweiligen Testklasse verglichen. -- Die Klasse `src/test/java/AllE2ETests.java` führt mithilfe der Klasse `src/test/java/HelpClasses/TestFileTester.java` - alle Testklassen für die E2E-Tests der einzelnen Features aus und gibt deren Ergebnis aus. Somit muss für das E2E-Testen - der gesamten Features nur diese Klasse ausgeführt werden. + Reflections Werte aus einem Objekt der Klasse auslesen und zurückgeben. Diese Werte werden dann mit den erwarteten + Werten in der jeweiligen Testklasse verglichen. ### Negative Tests: - Um zu überprüfen, dass der Compiler auch bei fehlerhaften Testfiles fehlschlägt, gibt es Testfiles im Ordner - `src/test/testFiles/Negative`, welche nicht korrekt kompiliert werden können. Die Testfiles sin in mehrere Kategorien + `src/test/testFiles/Negative`, welche nicht korrekt kompiliert werden können. Die Testfiles sind in mehrere Kategorien unterteilt, die durch die Ordnerstruktur in `src/test/testFiles/Negative` dargestellt werden. Für jede Kategorie gibt es eine eigene Testklasse, die sich im Ordner `src/test/java/NegativeTests` befindet und den gleichen Namen wie der Ordner ihrer Kategorie hat. Diese Testklassen versuchen die Testfiles ihrer Kategorie zu kompilieren und erwarten, dass der - Compiler fehlschlägt. -- Wie bei den E2E-Tests gibt es auch hier eine Klasse `src/test/java/AllNegativeTests.java`, die neben eigenen Tests auch - alle Testklassen für die negativen Tests ausführt und deren Ergebnis ausgibt. Somit muss für das Testen der negativen - Tests nur diese Klasse ausgeführt werden. -- Bitte die Ausgabe in der Konsole ignorieren, diese Fehlermeldungen sind die erwarteten Fehlermeldungen, die der Compiler - ausgeben sollte, werden in diesem Test-Fall jedoch nicht unterdrückt. \ No newline at end of file + Compiler fehlschlägt. Die Testfiles, die in keine Kategorie passen werden in der Testklasse + `src/test/java/NegativeTests/RestOfNegativeTests.java` getestet +- Hinweis: Bitte die Ausgabe in der Konsole ignorieren, diese Fehlermeldungen sind die erwarteten Fehlermeldungen, + die der Compiler ausgeben soll, werden in diesem Test-Fall jedoch nicht unterdrückt. \ No newline at end of file diff --git a/src/test/java/AllE2ETests.java b/src/test/java/AllE2ETests.java deleted file mode 100644 index 747f1bd..0000000 --- a/src/test/java/AllE2ETests.java +++ /dev/null @@ -1,125 +0,0 @@ -import E2ETests.Features.*; -import org.junit.jupiter.api.Test; - -import static HelpClasses.TestFileTester.run; - -/** - * This class runs all the E2E test classes. - */ -class AllE2ETests { - - @Test - void runE2EBreakTests() { - run(E2E_Break.class); - } - - @Test - void runE2EClassTests() { - run(E2E_Class.class); - } - - @Test - void runE2EClassObjectsTests() { - run(E2E_ClassObjects.class); - } - - @Test - void runE2ECommentTests() { - run(E2E_Comment.class); - } - - @Test - void runE2ECompAssignTests() { - run(E2E_CompAssign.class); - } - - @Test - void runE2EComplexCallsTests() { - run(E2E_ComplexCalls.class); - } - - @Test - void runE2EConstructorTests() { - run(E2E_Constructor.class); - } - - @Test - void runE2EContinueTests() { - run(E2E_Continue.class); - } - - @Test - void runE2EDataTypesTests() { - run(E2E_DataTypes.class); - } - - @Test - void runE2EFieldTests() { - run(E2E_Field.class); - } - - @Test - void runE2EForTests() { - run(E2E_For.class); - } - - @Test - void runE2EIfTests() { - run(E2E_If.class); - } - - @Test - void runE2ELogicExprTests() { - run(E2E_LogicExpr.class); - } - - @Test - void runE2EMainTests() { - run(E2E_Main.class); - } - - @Test - void runE2EMethodTests() { - run(E2E_Method.class); - } - - @Test - void runE2EMethodCallTests() { - run(E2E_MethodCall.class); - } - - @Test - void runE2EOperatorsTests() { - run(E2E_Operators.class); - } - - @Test - void runE2EOverloadedTests() { - run(E2E_Overloaded.class); - } - - @Test - void runE2EPrintTests() { - run(E2E_Print.class); - } - - @Test - void runE2EReturnTests() { - run(E2E_Return.class); - } - - @Test - void runE2EUnaryTests() { - run(E2E_Unary.class); - } - - @Test - void runE2EVariableDefWithDeclTests() { - run(E2E_VariableDefWithDecl.class); - } - - @Test - void runE2EWhileTests() { - run(E2E_While.class); - } -} \ No newline at end of file diff --git a/src/test/java/HelpClasses/TestFileTester.java b/src/test/java/HelpClasses/TestFileTester.java deleted file mode 100644 index e426164..0000000 --- a/src/test/java/HelpClasses/TestFileTester.java +++ /dev/null @@ -1,77 +0,0 @@ -package HelpClasses; - -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.platform.commons.support.HierarchyTraversalMode; -import org.junit.platform.commons.support.ReflectionSupport; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -public class TestFileTester { - /** - * Execute all methods annotated with @Test in the given class. - * - * @param testClass The class containing the test methods. - */ - public static void run(Class testClass) { - List failedTests = new ArrayList<>(); - - // Find all methods annotated with @Test in the given class and save them in a list - List testMethods = ReflectionSupport.findMethods( - testClass, - method -> method.isAnnotationPresent(Test.class), - HierarchyTraversalMode.TOP_DOWN - ); - - // Execute for all test methods found - for (Method testMethod : testMethods) { - try { - // Create an instance of the test class - Object testInstance = ReflectionSupport.newInstance(testClass); - - // Execute all methods annotated with @BeforeEach in the given class - ListbeforeEachMethods = ReflectionSupport.findMethods( - testClass, - method -> method.isAnnotationPresent(BeforeEach.class), - HierarchyTraversalMode.TOP_DOWN - ); - for (Method beforeEachMethod : beforeEachMethods) { - beforeEachMethod.invoke(testInstance); - } - - // Execute the test method - testMethod.invoke(testInstance); - - // Execute all methods annotated with @AfterEach in the given class - List afterEachMethods = ReflectionSupport.findMethods( - testClass, - method -> method.isAnnotationPresent(AfterEach.class), - HierarchyTraversalMode.TOP_DOWN - ); - for (Method afterEachMethod : afterEachMethods) { - afterEachMethod.invoke(testInstance); - } - } catch (Exception e) { - // If the test method throws an exception, save the exception message in the failedTests list - if (e.getCause() != null) { - failedTests.add(testMethod.getName() + ": " + e.getCause().getMessage()); - } else { - failedTests.add(testMethod.getName() + ": " + e.getMessage()); - } - } - } - - // If there are failed tests, print them and fail the test class, otherwise print a success message - if (!failedTests.isEmpty()) { - failedTests.forEach(System.err::println); - Assertions.fail("Ein oder mehrere Tests sind fehlgeschlagen."); - } else { - System.out.println("Alle Tests sind erfolgreich."); - } - } -} diff --git a/src/test/java/AllNegativeTests.java b/src/test/java/NegativeTests/RestOfNegativeTests.java similarity index 52% rename from src/test/java/AllNegativeTests.java rename to src/test/java/NegativeTests/RestOfNegativeTests.java index 56b24fc..4f3ccb5 100644 --- a/src/test/java/AllNegativeTests.java +++ b/src/test/java/NegativeTests/RestOfNegativeTests.java @@ -1,41 +1,17 @@ -import NegativeTests.*; +package NegativeTests; + import de.maishai.Compiler; import org.junit.jupiter.api.Test; import java.util.List; -import static HelpClasses.TestFileTester.run; import static org.junit.jupiter.api.Assertions.assertThrows; /** - * This class runs all negative tests plus some additional tests that did not fit into any of the categories. + * Tests for rest of testfiles which did not fit in any Category + * see src/test/testFiles/Negative for the test files. */ -class AllNegativeTests { - - @Test - void runCallVariableOutsideScopeTests() { - run(CallVariableOutsideScope.class); - } - - @Test - void runForbiddenParticularitiesInImplementationTests() { - run(ForbiddenParticularitiesInImplementation.class); - } - - @Test - void runMissingComponentsTests() { - run(MissingComponents.class); - } - - @Test - void runUsingSameNameTests() { - run(UsingSameName.class); - } - - @Test - void runWrongTypeTests() { - run(WrongType.class); - } +public class RestOfNegativeTests { // A value is assigned to a field outside a method @Test diff --git a/src/test/java/FeatureTestResources/AST/AST_Break.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Break.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Break.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Break.java index 6d1b38a..15552f4 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Break.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Break.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_Class.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Class.java similarity index 96% rename from src/test/java/FeatureTestResources/AST/AST_Class.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Class.java index 072ea15..06d43e7 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Class.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Class.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.Block; import de.maishai.ast.records.Constructor; diff --git a/src/test/java/FeatureTestResources/AST/AST_ClassObjects.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_ClassObjects.java similarity index 98% rename from src/test/java/FeatureTestResources/AST/AST_ClassObjects.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_ClassObjects.java index 4f0e51c..1216205 100644 --- a/src/test/java/FeatureTestResources/AST/AST_ClassObjects.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_ClassObjects.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_Comment.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Comment.java similarity index 96% rename from src/test/java/FeatureTestResources/AST/AST_Comment.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Comment.java index 86b6fa1..b8351c1 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Comment.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Comment.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.Block; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_CompAssign.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_CompAssign.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_CompAssign.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_CompAssign.java index aa5999e..3f683ff 100644 --- a/src/test/java/FeatureTestResources/AST/AST_CompAssign.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_CompAssign.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_ComplexCalls.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_ComplexCalls.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_ComplexCalls.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_ComplexCalls.java index de0a84d..0294e7e 100644 --- a/src/test/java/FeatureTestResources/AST/AST_ComplexCalls.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_ComplexCalls.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_Constructor.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Constructor.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Constructor.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Constructor.java index a94c294..21e5721 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Constructor.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Constructor.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_Continue.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Continue.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Continue.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Continue.java index 403cce6..8e7207d 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Continue.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Continue.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_DataTypes.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_DataTypes.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_DataTypes.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_DataTypes.java index 80acb85..1d502ef 100644 --- a/src/test/java/FeatureTestResources/AST/AST_DataTypes.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_DataTypes.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_Field.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Field.java similarity index 98% rename from src/test/java/FeatureTestResources/AST/AST_Field.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Field.java index 77228a2..321399a 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Field.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Field.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_For.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_For.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_For.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_For.java index 41068f3..e6ab508 100644 --- a/src/test/java/FeatureTestResources/AST/AST_For.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_For.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_If.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_If.java similarity index 98% rename from src/test/java/FeatureTestResources/AST/AST_If.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_If.java index b3375e2..c4fadda 100644 --- a/src/test/java/FeatureTestResources/AST/AST_If.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_If.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_InDeCrement.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_InDeCrement.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_InDeCrement.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_InDeCrement.java index 0fd5407..9fec8cd 100644 --- a/src/test/java/FeatureTestResources/AST/AST_InDeCrement.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_InDeCrement.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_LogicExpr.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_LogicExpr.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_LogicExpr.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_LogicExpr.java index 5034d69..cb96f9f 100644 --- a/src/test/java/FeatureTestResources/AST/AST_LogicExpr.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_LogicExpr.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_Main.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Main.java similarity index 97% rename from src/test/java/FeatureTestResources/AST/AST_Main.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Main.java index 3ec0c65..a782505 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Main.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Main.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.Class; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_Method.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Method.java similarity index 97% rename from src/test/java/FeatureTestResources/AST/AST_Method.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Method.java index 2207d16..3a3eced 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Method.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Method.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_MethodCall.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_MethodCall.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_MethodCall.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_MethodCall.java index 19fdd1e..2475022 100644 --- a/src/test/java/FeatureTestResources/AST/AST_MethodCall.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_MethodCall.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_MultipleClasses.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_MultipleClasses.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_MultipleClasses.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_MultipleClasses.java index 1a3d440..3c6fcd8 100644 --- a/src/test/java/FeatureTestResources/AST/AST_MultipleClasses.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_MultipleClasses.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_Operators.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Operators.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Operators.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Operators.java index 658ecc9..0ad9189 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Operators.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Operators.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_Overloaded.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Overloaded.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Overloaded.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Overloaded.java index 8760532..2e39844 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Overloaded.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Overloaded.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_Print.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Print.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Print.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Print.java index c2fcb37..256ea56 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Print.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Print.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_Return.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Return.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Return.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Return.java index 610bc66..7344d41 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Return.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Return.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_Unary.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Unary.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_Unary.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_Unary.java index f71bbfe..5c3a24d 100644 --- a/src/test/java/FeatureTestResources/AST/AST_Unary.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_Unary.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.UnaryOperator; import de.maishai.ast.records.*; diff --git a/src/test/java/FeatureTestResources/AST/AST_VariableDefWithDecl.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_VariableDefWithDecl.java similarity index 98% rename from src/test/java/FeatureTestResources/AST/AST_VariableDefWithDecl.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_VariableDefWithDecl.java index 051967f..0f16335 100644 --- a/src/test/java/FeatureTestResources/AST/AST_VariableDefWithDecl.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_VariableDefWithDecl.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.records.*; import de.maishai.ast.records.Class; diff --git a/src/test/java/FeatureTestResources/AST/AST_While.java b/src/test/java/ScannerParserTests/FeaturesASTs/AST_While.java similarity index 99% rename from src/test/java/FeatureTestResources/AST/AST_While.java rename to src/test/java/ScannerParserTests/FeaturesASTs/AST_While.java index 7c7f572..ab41021 100644 --- a/src/test/java/FeatureTestResources/AST/AST_While.java +++ b/src/test/java/ScannerParserTests/FeaturesASTs/AST_While.java @@ -1,4 +1,4 @@ -package FeatureTestResources.AST; +package ScannerParserTests.FeaturesASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassCanBeBytecoded.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassCanBeBytecoded.java similarity index 98% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassCanBeBytecoded.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassCanBeBytecoded.java index 0c88c68..ff7e15a 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassCanBeBytecoded.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassCanBeBytecoded.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST; +package ScannerParserTests.MoreTestsASTs; import de.maishai.ast.records.Class; import de.maishai.ast.records.*; diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructor.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructor.java similarity index 99% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructor.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructor.java index 43754b3..f9e2b73 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructor.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructor.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST; +package ScannerParserTests.MoreTestsASTs; import de.maishai.ast.*; import de.maishai.ast.records.*; diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorAndMethodCall.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorAndMethodCall.java similarity index 98% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorAndMethodCall.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorAndMethodCall.java index f5ae0f7..4ab6741 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorAndMethodCall.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorAndMethodCall.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithConstructorAndMethodCall { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithConstructorAndMethodCall { // int x; // // public ClassWithConstructorAndMethodCall() { diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorWithCodeInComments.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorWithCodeInComments.java similarity index 97% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorWithCodeInComments.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorWithCodeInComments.java index e986a3e..4d0ed05 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorWithCodeInComments.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorWithCodeInComments.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithConstructorWithCodeInComments { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithConstructorWithCodeInComments { // int x; // public ClassWithConstructorWithCodeInComments() { // this.x = 10; diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorWithParameters.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorWithParameters.java similarity index 98% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorWithParameters.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorWithParameters.java index 20468ae..59cc116 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithConstructorWithParameters.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithConstructorWithParameters.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithConstructorWithParameters { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithConstructorWithParameters { // int x; // public ClassWithConstructorWithParameters(int startValue, int repetitions) { // this.x = startValue; diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithField.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithField.java similarity index 93% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithField.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithField.java index c7bc456..f289514 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithField.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithField.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithField { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithField { // int x; //} diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMethod.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMethod.java similarity index 95% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMethod.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMethod.java index 0f0cd99..e623106 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMethod.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMethod.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithMethod { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithMethod { // public boolean method() { // return false; // } diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMethodAndField.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMethodAndField.java similarity index 96% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMethodAndField.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMethodAndField.java index bb5c393..2e0e8d5 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMethodAndField.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMethodAndField.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithMethodAndField { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithMethodAndField { // char c; // // public ClassWithMethodAndField(char character) { diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMultipleMethods.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMultipleMethods.java similarity index 98% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMultipleMethods.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMultipleMethods.java index 58aabd1..273a6cd 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ClassWithMultipleMethods.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ClassWithMultipleMethods.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class ClassWithMoreComplexMethodAndMain { +package ScannerParserTests.MoreTestsASTs;//public class ClassWithMoreComplexMethodAndMain { // ClassWithMoreComplexMethodAndMain instance; // // public boolean moreComplexMethod() { diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_ComplexClass.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ComplexClass.java similarity index 99% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_ComplexClass.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ComplexClass.java index 0685edf..c38d934 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_ComplexClass.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_ComplexClass.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST; +package ScannerParserTests.MoreTestsASTs; import de.maishai.ast.Operator; import de.maishai.ast.records.*; diff --git a/src/test/java/MoreTestResources/AST/AbstractSyntax_PublicClass.java b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_PublicClass.java similarity index 93% rename from src/test/java/MoreTestResources/AST/AbstractSyntax_PublicClass.java rename to src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_PublicClass.java index 6bce2ef..557e621 100644 --- a/src/test/java/MoreTestResources/AST/AbstractSyntax_PublicClass.java +++ b/src/test/java/ScannerParserTests/MoreTestsASTs/AbstractSyntax_PublicClass.java @@ -1,4 +1,4 @@ -package MoreTestResources.AST;//public class PublicClass { +package ScannerParserTests.MoreTestsASTs;//public class PublicClass { //} import de.maishai.ast.records.Block; diff --git a/src/test/java/ScannerParserTests.java b/src/test/java/ScannerParserTests/ScannerParserTests.java similarity index 97% rename from src/test/java/ScannerParserTests.java rename to src/test/java/ScannerParserTests/ScannerParserTests.java index baf9676..6f35894 100644 --- a/src/test/java/ScannerParserTests.java +++ b/src/test/java/ScannerParserTests/ScannerParserTests.java @@ -1,10 +1,13 @@ +package ScannerParserTests; + +import TypeCheckTests.MoreTestResources.MoreTestsASTs.*; +import ScannerParserTests.FeaturesASTs.*; +import ScannerParserTests.MoreTestsASTs.*; import de.maishai.Compiler; import de.maishai.ast.records.Program; import org.junit.jupiter.api.Test; -import FeatureTestResources.AST.*; - -import MoreTestResources.AST.*; +import TypeCheckTests.AST.*; import java.util.List; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Break.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Break.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Break.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Break.java index ff40c59..0e47aee 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Break.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Break.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Class.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Class.java similarity index 97% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Class.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Class.java index a09c96e..14be483 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Class.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Class.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.TypedBlock; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_ClassObjects.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_ClassObjects.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_ClassObjects.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_ClassObjects.java index 794fd17..b87e00b 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_ClassObjects.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_ClassObjects.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Comment.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Comment.java similarity index 97% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Comment.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Comment.java index a1c7742..092da44 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Comment.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Comment.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.TypedBlock; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_CompAssign.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_CompAssign.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_CompAssign.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_CompAssign.java index 21d0a78..df01328 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_CompAssign.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_CompAssign.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_ComplexCalls.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_ComplexCalls.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_ComplexCalls.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_ComplexCalls.java index 2e23af3..b9afd43 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_ComplexCalls.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_ComplexCalls.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Constructor.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Constructor.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Constructor.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Constructor.java index d1e6254..1a8658a 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Constructor.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Constructor.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Continue.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Continue.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Continue.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Continue.java index 3817709..062c522 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Continue.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Continue.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_DataTypes.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_DataTypes.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_DataTypes.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_DataTypes.java index 9ae5c6f..9799ad1 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_DataTypes.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_DataTypes.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Field.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Field.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Field.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Field.java index ef351b4..f9ba1a4 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Field.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Field.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_For.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_For.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_For.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_For.java index 412369e..8a5c27a 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_For.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_For.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_If.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_If.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_If.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_If.java index d48bd34..9a8ddc2 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_If.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_If.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_InDeCrement.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_InDeCrement.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_InDeCrement.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_InDeCrement.java index e09c0cd..0d42c40 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_InDeCrement.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_InDeCrement.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_LogicExpr.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_LogicExpr.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_LogicExpr.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_LogicExpr.java index ef2df96..cbc1df5 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_LogicExpr.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_LogicExpr.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Main.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Main.java similarity index 98% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Main.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Main.java index e945d82..e8da6f7 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Main.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Main.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Method.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Method.java similarity index 97% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Method.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Method.java index 6fcff3e..3bd37b3 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Method.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Method.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_MethodCall.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_MethodCall.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_MethodCall.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_MethodCall.java index 11a9aaf..fe737fd 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_MethodCall.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_MethodCall.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_MultipleClasses.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_MultipleClasses.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_MultipleClasses.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_MultipleClasses.java index 275b35c..105ba43 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_MultipleClasses.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_MultipleClasses.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Operators.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Operators.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Operators.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Operators.java index 8d9ecce..c8d09ce 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Operators.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Operators.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Overloaded.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Overloaded.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Overloaded.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Overloaded.java index 619be2e..25666c4 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Overloaded.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Overloaded.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Print.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Print.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Print.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Print.java index 43f8404..1506feb 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Print.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Print.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Return.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Return.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Return.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Return.java index a396b6a..c385fa2 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Return.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Return.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Unary.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Unary.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_Unary.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Unary.java index 2103fdb..4a63c20 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_Unary.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_Unary.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.UnaryOperator; import de.maishai.typedast.Type; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_VariableDefWithDecl.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_VariableDefWithDecl.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_VariableDefWithDecl.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_VariableDefWithDecl.java index 996051f..53ec805 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_VariableDefWithDecl.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_VariableDefWithDecl.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.typedast.Type; import de.maishai.typedast.typedclass.*; diff --git a/src/test/java/FeatureTestResources/TypedAST/TypedAST_While.java b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_While.java similarity index 99% rename from src/test/java/FeatureTestResources/TypedAST/TypedAST_While.java rename to src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_While.java index efebd7e..1bf33ab 100644 --- a/src/test/java/FeatureTestResources/TypedAST/TypedAST_While.java +++ b/src/test/java/TypeCheckTests/FeaturesTypedASTs/TypedAST_While.java @@ -1,4 +1,4 @@ -package FeatureTestResources.TypedAST; +package TypeCheckTests.FeaturesTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructor.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructor.java similarity index 99% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructor.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructor.java index 53193c5..c7cf0b9 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructor.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructor.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithConstructor { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithConstructor { // int x; // public classWithConstructor() { // this.x = 10; diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java similarity index 98% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java index 991ad6f..559d0cf 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorAndMethodCall.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithConstructorAndMethodCall { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithConstructorAndMethodCall { // int x; // // public ClassWithConstructorAndMethodCall() { diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java similarity index 97% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java index 64ded8e..cc76519 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorWithCodeInComments.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithConstructorWithCodeInComments { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithConstructorWithCodeInComments { // int x; // public ClassWithConstructorWithCodeInComments() { // this.x = 10; diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorWithParameters.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorWithParameters.java similarity index 98% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorWithParameters.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorWithParameters.java index 4fd833e..0e7148b 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithConstructorWithParameters.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithConstructorWithParameters.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithConstructorWithParameters { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithConstructorWithParameters { // int x; // public classWithConstructorWithParameters(int startValue, int repetitions) { // this.x = startValue; diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithField.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithField.java similarity index 95% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithField.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithField.java index 34fb7e1..568fb2a 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithField.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithField.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithField { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithField { // int x; //} diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMethod.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMethod.java similarity index 94% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMethod.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMethod.java index 0e66037..a31712f 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMethod.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMethod.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithMethod { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithMethod { // public boolean method() { // return false; // } diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMethodAndField.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMethodAndField.java similarity index 96% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMethodAndField.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMethodAndField.java index bb00f2e..534a1c0 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMethodAndField.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMethodAndField.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithMethodAndField { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithMethodAndField { // char c; // // public ClassWithMethodAndField(char character) { diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java similarity index 98% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java index 708b9c5..798a550 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ClassWithMoreComplexMethodAndMain.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class ClassWithMoreComplexMethodAndMain { +package TypeCheckTests.MoreTestsTypedASTs;//public class ClassWithMoreComplexMethodAndMain { // ClassWithMoreComplexMethodAndMain instance; // // public boolean moreComplexMethod() { diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ComplexClass.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ComplexClass.java similarity index 99% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ComplexClass.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ComplexClass.java index 3c26f32..5ae3bdb 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_ComplexClass.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_ComplexClass.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST; +package TypeCheckTests.MoreTestsTypedASTs; import de.maishai.ast.Operator; import de.maishai.typedast.Type; diff --git a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_PublicClass.java b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_PublicClass.java similarity index 95% rename from src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_PublicClass.java rename to src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_PublicClass.java index 70279c7..41c8fe1 100644 --- a/src/test/java/MoreTestResources/TypedAST/TypedAbstractSyntax_PublicClass.java +++ b/src/test/java/TypeCheckTests/MoreTestsTypedASTs/TypedAbstractSyntax_PublicClass.java @@ -1,4 +1,4 @@ -package MoreTestResources.TypedAST;//public class PublicClass { +package TypeCheckTests.MoreTestsTypedASTs;//public class PublicClass { //} import de.maishai.typedast.Type; diff --git a/src/test/java/TypingTests.java b/src/test/java/TypeCheckTests/TypingTests.java similarity index 90% rename from src/test/java/TypingTests.java rename to src/test/java/TypeCheckTests/TypingTests.java index aef2a59..44efe13 100644 --- a/src/test/java/TypingTests.java +++ b/src/test/java/TypeCheckTests/TypingTests.java @@ -1,12 +1,20 @@ +package TypeCheckTests; + +import ScannerParserTests.MoreTestsASTs.AbstractSyntax_ClassWithConstructor; +import ScannerParserTests.MoreTestsASTs.AbstractSyntax_ClassWithField; +import ScannerParserTests.MoreTestsASTs.AbstractSyntax_ComplexClass; +import ScannerParserTests.MoreTestsASTs.AbstractSyntax_PublicClass; +import TypeCheckTests.MoreTestsTypedASTs.TypedAbstractSyntax_ClassWithConstructor; +import TypeCheckTests.MoreTestsTypedASTs.TypedAbstractSyntax_ClassWithField; +import TypeCheckTests.MoreTestsTypedASTs.TypedAbstractSyntax_ComplexClass; +import TypeCheckTests.MoreTestsTypedASTs.TypedAbstractSyntax_PublicClass; +import ScannerParserTests.FeaturesASTs.*; import de.maishai.Compiler; import de.maishai.typedast.typedclass.TypedProgram; import org.junit.jupiter.api.Test; -import FeatureTestResources.AST.*; -import FeatureTestResources.TypedAST.*; - -import MoreTestResources.AST.*; -import MoreTestResources.TypedAST.*; +import TypeCheckTests.AST.*; +import TypeCheckTests.FeaturesTypedASTs.*; import static org.junit.jupiter.api.Assertions.assertEquals; /** From b03f6b61af2daa77d49822191b46e87dd353c205 Mon Sep 17 00:00:00 2001 From: JonathanFleischmann Date: Fri, 5 Jul 2024 10:45:33 +0200 Subject: [PATCH 3/3] fixed error in test --- src/test/java/ScannerParserTests/ScannerParserTests.java | 3 --- src/test/java/TypeCheckTests/TypingTests.java | 1 - 2 files changed, 4 deletions(-) diff --git a/src/test/java/ScannerParserTests/ScannerParserTests.java b/src/test/java/ScannerParserTests/ScannerParserTests.java index 6f35894..42fdebe 100644 --- a/src/test/java/ScannerParserTests/ScannerParserTests.java +++ b/src/test/java/ScannerParserTests/ScannerParserTests.java @@ -1,14 +1,11 @@ package ScannerParserTests; -import TypeCheckTests.MoreTestResources.MoreTestsASTs.*; import ScannerParserTests.FeaturesASTs.*; import ScannerParserTests.MoreTestsASTs.*; import de.maishai.Compiler; import de.maishai.ast.records.Program; import org.junit.jupiter.api.Test; -import TypeCheckTests.AST.*; - import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/TypeCheckTests/TypingTests.java b/src/test/java/TypeCheckTests/TypingTests.java index 44efe13..ec1cad5 100644 --- a/src/test/java/TypeCheckTests/TypingTests.java +++ b/src/test/java/TypeCheckTests/TypingTests.java @@ -13,7 +13,6 @@ import de.maishai.Compiler; import de.maishai.typedast.typedclass.TypedProgram; import org.junit.jupiter.api.Test; -import TypeCheckTests.AST.*; import TypeCheckTests.FeaturesTypedASTs.*; import static org.junit.jupiter.api.Assertions.assertEquals;