diff --git a/standalone/README.md b/standalone/README.md
index 15792fcd..0d8a2524 100644
--- a/standalone/README.md
+++ b/standalone/README.md
@@ -6,12 +6,21 @@ This Maven project produces a standalone command line executable `tvdformat.jar`
The startup time of standalone JAR file and the native image are identical since the image still requires a JDK to execute. However, it is faster than running `format.js` from SQLcl.
+This project contains JUnit tests for
+
+- the SQLDev/SQLcl formatter settings `trivadis_advanced_format.xml` and `trivadis_custom_format.arbori`
+- the SQLcl script `format.js`
+- the SQLcl command `tvdformat`
+- the standalone executable `tvdformat`
+
+The project requires a JDK 17, but it produces a Java 8 JAR file. A GraalVM JDK is required only if you want to produce a native image.
+
## How to Build
-1. [Download](https://www.oracle.com/tools/downloads/sqlcl-downloads.html) and install SQLcl 21.3.0
-2. [Download](https://github.com/graalvm/graalvm-ce-builds/releases) and install the GraalVM JDK 11 21.2.0
-3. Go to the bin directory of the GraalVM JDK and run `gu install native-image`, if you want to produce a native image
-4. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.8.3
+1. [Download](https://www.oracle.com/tools/downloads/sqlcl-downloads.html) and install SQLcl 21.4.0
+2. [Download](https://github.com/graalvm/graalvm-ce-builds/releases) and install the GraalVM JDK 17 21.3.0
+3. Go to the `bin` directory of the GraalVM JDK and run `./gu install native-image`, if you want to produce a native image
+4. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.8.4
5. [Download](https://git-scm.com/downloads) and install a git command line client
6. Clone the plsql-formatter-settings repository
7. Open a terminal window in the plsql-formatter-settings root folder and type
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 07cd52ab..adab7a59 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -33,7 +33,14 @@
${graalvm.version}
compile
-
+
+
+ com.google.guava
+ guava
+ 31.0.1-jre
+ test
+
+
oracle.dbtools
dbtools-common
@@ -41,6 +48,35 @@
system
${sqlcl.libdir}/dbtools-common.jar
+
+
+ oracle.dbtools
+ dbtools-sqlcl
+ ${sqlcl.version}
+ system
+ ${sqlcl.libdir}/dbtools-sqlcl.jar
+
+
+ oracle.xml
+ xmlparserv2-sans-jaxp-services
+ ${sqlcl.version}
+ system
+ ${sqlcl.libdir}/xmlparserv2_sans_jaxp_services.jar
+
+
+ oracle.i18n
+ orai18n
+ ${sqlcl.version}
+ system
+ ${sqlcl.libdir}/orai18n.jar
+
+
+ oracle.soda
+ orajsoda
+ ${sqlcl.version}
+ system
+ ${sqlcl.libdir}/orajsoda.jar
+
org.graalvm.sdk
@@ -56,6 +92,17 @@
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-report-plugin
+ 2.22.2
+
+
+
+
${project.basedir}/src/main/java
@@ -192,6 +239,7 @@
maven-surefire-plugin
2.22.2
+ ${project.basedir}
**/*.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/ConfiguredTestFormatter.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/ConfiguredTestFormatter.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/ConfiguredTestFormatter.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/ConfiguredTestFormatter.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/AllroundAutomations.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/AllroundAutomations.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/AllroundAutomations.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/AllroundAutomations.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/Oracle.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/Oracle.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/Oracle.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/Oracle.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/Strange.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/Strange.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/Strange.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/Strange.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/Trivadis.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/Trivadis.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/examples/Trivadis.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/examples/Trivadis.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Comment.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Comment.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Comment.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Comment.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Json_functions.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Json_functions.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Json_functions.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Json_functions.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Paren_expr_list.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Paren_expr_list.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Paren_expr_list.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Paren_expr_list.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Select_list.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Select_list.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Select_list.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Select_list.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Xml_functions.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Xml_functions.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Xml_functions.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/Xml_functions.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Accessible_by_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Accessible_by_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Accessible_by_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Accessible_by_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Aggregate_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Aggregate_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Aggregate_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Aggregate_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Assignment_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Assignment_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Assignment_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Assignment_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Autonamous_transaction_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Autonamous_transaction_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Autonamous_transaction_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Autonamous_transaction_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Basic_loop_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Basic_loop_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Basic_loop_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Basic_loop_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Block.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Block.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Block.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Block.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Call_specification.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Call_specification.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Call_specification.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Call_specification.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Case_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Case_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Case_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Case_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Close_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Close_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Close_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Close_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_method_invokation.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_method_invokation.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_method_invokation.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_method_invokation.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_variable_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_variable_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_variable_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Collection_variable_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Comment.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Comment.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Comment.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Comment.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Compile_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Compile_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Compile_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Compile_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Constant_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Constant_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Constant_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Constant_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Continue_Statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Continue_Statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Continue_Statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Continue_Statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Coverage_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Coverage_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Coverage_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Coverage_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_for_loop_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_for_loop_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_for_loop_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_for_loop_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_variable_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_variable_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_variable_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Cursor_variable_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Datatype_attribute.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Datatype_attribute.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Datatype_attribute.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Datatype_attribute.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Default_collation_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Default_collation_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Default_collation_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Default_collation_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Delete_statement_extension.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Delete_statement_extension.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Delete_statement_extension.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Delete_statement_extension.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deprecate_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deprecate_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deprecate_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deprecate_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deterministic_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deterministic_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deterministic_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Deterministic_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Element_specification.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Element_specification.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Element_specification.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Element_specification.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_handler.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_handler.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_handler.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_handler.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_init_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_init_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_init_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exception_init_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Execute_immediate_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Execute_immediate_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Execute_immediate_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Execute_immediate_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exit_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exit_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exit_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Exit_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Explicit_Cursor.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Explicit_Cursor.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Explicit_Cursor.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Explicit_Cursor.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Expression.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Expression.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Expression.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Expression.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Fetch_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Fetch_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Fetch_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Fetch_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/For_loop_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/For_loop_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/For_loop_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/For_loop_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Forall_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Forall_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Forall_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Forall_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Formal_parameter_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Formal_parameter_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Formal_parameter_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Formal_parameter_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Function_declaration_and_definition.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Function_declaration_and_definition.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Function_declaration_and_definition.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Function_declaration_and_definition.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Goto_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Goto_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Goto_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Goto_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/If_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/If_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/If_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/If_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Implicit_cursor_attribute.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Implicit_cursor_attribute.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Implicit_cursor_attribute.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Implicit_cursor_attribute.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Inline_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Inline_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Inline_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Inline_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Insert_statement_extension.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Insert_statement_extension.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Insert_statement_extension.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Insert_statement_extension.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Invokers_rights_and_definers_rights_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Invokers_rights_and_definers_rights_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Invokers_rights_and_definers_rights_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Invokers_rights_and_definers_rights_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Iterator.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Iterator.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Iterator.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Iterator.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Named_cursor_attribute.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Named_cursor_attribute.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Named_cursor_attribute.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Named_cursor_attribute.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Null_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Null_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Null_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Null_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_for_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_for_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_for_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_for_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Open_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Parallel_enable_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Parallel_enable_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Parallel_enable_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Parallel_enable_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipe_row_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipe_row_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipe_row_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipe_row_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipelined_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipelined_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipelined_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Pipelined_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Procedure_declaration_and_definition.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Procedure_declaration_and_definition.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Procedure_declaration_and_definition.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Procedure_declaration_and_definition.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Qualified_expression.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Qualified_expression.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Qualified_expression.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Qualified_expression.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Raise_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Raise_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Raise_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Raise_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Record_variable_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Record_variable_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Record_variable_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Record_variable_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Restrict_references_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Restrict_references_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Restrict_references_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Restrict_references_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Result_cache_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Result_cache_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Result_cache_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Result_cache_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Return_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Return_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Return_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Return_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Returning_into_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Returning_into_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Returning_into_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Returning_into_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Rowtype_attribute.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Rowtype_attribute.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Rowtype_attribute.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Rowtype_attribute.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Scalar_variable_declaration.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Scalar_variable_declaration.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Scalar_variable_declaration.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Scalar_variable_declaration.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Select_into_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Select_into_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Select_into_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Select_into_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Serially_reusable_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Serially_reusable_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Serially_reusable_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Serially_reusable_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sharing_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sharing_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sharing_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sharing_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sql_macro_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sql_macro_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sql_macro_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sql_macro_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlcode_function.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlcode_function.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlcode_function.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlcode_function.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlerrm_function.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlerrm_function.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlerrm_function.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Sqlerrm_function.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Suppresses_warning_6009_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Suppresses_warning_6009_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Suppresses_warning_6009_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Suppresses_warning_6009_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Type_attribute.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Type_attribute.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Type_attribute.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Type_attribute.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Udf_pragma.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Udf_pragma.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Udf_pragma.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Udf_pragma.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Update_statement_extensions.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Update_statement_extensions.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Update_statement_extensions.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Update_statement_extensions.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/While_loop_statement.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/While_loop_statement.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/While_loop_statement.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/While_loop_statement.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/sql/Create_materialized_view.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/sql/Create_materialized_view.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/sql/Create_materialized_view.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/sql/Create_materialized_view.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_114_honor_no_space_after_commas_config.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_114_honor_no_space_after_commas_config.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_114_honor_no_space_after_commas_config.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_114_honor_no_space_after_commas_config.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_126_create_view_column_list.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_126_create_view_column_list.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_126_create_view_column_list.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_126_create_view_column_list.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_129_in_out_parameter.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_129_in_out_parameter.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_129_in_out_parameter.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_129_in_out_parameter.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_133_wrong_ws_removal.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_133_wrong_ws_removal.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_133_wrong_ws_removal.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_133_wrong_ws_removal.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_139_xmltable.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_139_xmltable.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_139_xmltable.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_139_xmltable.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_13_do_not_right_align_set.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_13_do_not_right_align_set.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_13_do_not_right_align_set.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_13_do_not_right_align_set.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_149_spool.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_149_spool.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_149_spool.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_149_spool.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_150_define.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_150_define.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_150_define.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_150_define.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_152_extract.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_152_extract.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_152_extract.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_152_extract.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_158_indent_collection_item.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_158_indent_collection_item.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_158_indent_collection_item.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_158_indent_collection_item.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_167_leading_commas_and_comments.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_167_leading_commas_and_comments.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_167_leading_commas_and_comments.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_167_leading_commas_and_comments.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_1_json_case_sensitive.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_1_json_case_sensitive.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_1_json_case_sensitive.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_1_json_case_sensitive.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_21_line_open_cursor_for.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_21_line_open_cursor_for.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_21_line_open_cursor_for.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_21_line_open_cursor_for.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_26_create_tablespace.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_26_create_tablespace.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_26_create_tablespace.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_26_create_tablespace.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_29_not_in.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_29_not_in.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_29_not_in.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_29_not_in.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_30_into_clause.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_30_into_clause.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_30_into_clause.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_30_into_clause.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_33_split_arguments.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_33_split_arguments.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_33_split_arguments.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_33_split_arguments.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_36_conditional_compilation.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_36_conditional_compilation.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_36_conditional_compilation.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_36_conditional_compilation.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_53_comma_before_without_ws.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_53_comma_before_without_ws.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_53_comma_before_without_ws.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_53_comma_before_without_ws.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_54_align_table_alias.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_54_align_table_alias.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_54_align_table_alias.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_54_align_table_alias.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_57_xmltable.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_57_xmltable.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_57_xmltable.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_57_xmltable.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_5_type_members.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_5_type_members.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_5_type_members.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_5_type_members.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_62_xmlquery.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_62_xmlquery.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_62_xmlquery.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_62_xmlquery.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_64_update.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_64_update.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_64_update.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_64_update.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_68_merge.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_68_merge.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_68_merge.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_68_merge.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_6_max_one_empty_line.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_6_max_one_empty_line.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_6_max_one_empty_line.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_6_max_one_empty_line.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_78_correlated_subquery.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_78_correlated_subquery.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_78_correlated_subquery.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_78_correlated_subquery.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_81_boolean_conditions_and_parenthesis.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_81_boolean_conditions_and_parenthesis.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_81_boolean_conditions_and_parenthesis.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_81_boolean_conditions_and_parenthesis.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_82_outer_apply.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_82_outer_apply.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_82_outer_apply.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_82_outer_apply.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_83_nested_function_calls.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_83_nested_function_calls.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_83_nested_function_calls.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_83_nested_function_calls.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_84_long_assignments.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_84_long_assignments.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_84_long_assignments.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_84_long_assignments.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A10_align_parameter_modes.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A10_align_parameter_modes.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A10_align_parameter_modes.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A10_align_parameter_modes.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A11_align_parameter_names.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A11_align_parameter_names.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A11_align_parameter_names.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A11_align_parameter_names.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A12_line_breaks_before_then.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A12_line_breaks_before_then.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A12_line_breaks_before_then.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A12_line_breaks_before_then.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A13_keep_short_nodes_on_same_line.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A13_keep_short_nodes_on_same_line.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A13_keep_short_nodes_on_same_line.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A13_keep_short_nodes_on_same_line.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A14_line_break_after_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A14_line_break_after_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A14_line_break_after_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A14_line_break_after_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A15_line_break_before_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A15_line_break_before_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A15_line_break_before_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A15_line_break_before_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A16_line_break_for_multiline_parents.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A16_line_break_for_multiline_parents.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A16_line_break_for_multiline_parents.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A16_line_break_for_multiline_parents.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A17_whitespace_around_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A17_whitespace_around_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A17_whitespace_around_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A17_whitespace_around_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A18_indent_comment.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A18_indent_comment.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A18_indent_comment.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A18_indent_comment.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A19_restore_indent_in_conditional_branch.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A19_restore_indent_in_conditional_branch.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A19_restore_indent_in_conditional_branch.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A19_restore_indent_in_conditional_branch.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A1_tabs.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A1_tabs.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A1_tabs.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A1_tabs.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A20_align_json_table_columns.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A20_align_json_table_columns.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A20_align_json_table_columns.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A20_align_json_table_columns.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A21_remove_non_ws_indent.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A21_remove_non_ws_indent.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A21_remove_non_ws_indent.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A21_remove_non_ws_indent.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A2_trailing_spaces.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A2_trailing_spaces.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A2_trailing_spaces.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A2_trailing_spaces.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A3_formatter_off_on.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A3_formatter_off_on.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A3_formatter_off_on.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A3_formatter_off_on.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A4_line_overflow.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A4_line_overflow.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A4_line_overflow.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A4_line_overflow.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A5_no_space_before_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A5_no_space_before_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A5_no_space_before_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A5_no_space_before_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A6_no_space_after_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A6_no_space_after_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A6_no_space_after_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A6_no_space_after_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A7_one_space_before_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A7_one_space_before_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A7_one_space_before_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A7_one_space_before_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A8_one_space_after_node.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A8_one_space_after_node.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A8_one_space_after_node.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A8_one_space_after_node.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A9_align_xmltable_columns.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A9_align_xmltable_columns.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A9_align_xmltable_columns.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A9_align_xmltable_columns.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/I10_determine_and_normalize_line_separator.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/I10_determine_and_normalize_line_separator.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/I10_determine_and_normalize_line_separator.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/I10_determine_and_normalize_line_separator.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O10_line_break_on_ansi_joins.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O10_line_break_on_ansi_joins.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O10_line_break_on_ansi_joins.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O10_line_break_on_ansi_joins.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O11_line_break_on_subqueries.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O11_line_break_on_subqueries.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O11_line_break_on_subqueries.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O11_line_break_on_subqueries.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O12_line_breaks_on_flowcontrol.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O12_line_breaks_on_flowcontrol.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O12_line_breaks_on_flowcontrol.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O12_line_breaks_on_flowcontrol.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O1_line_breaks_on_concatenation.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O1_line_breaks_on_concatenation.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O1_line_breaks_on_concatenation.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O1_line_breaks_on_concatenation.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O2_whitespace_around_operators.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O2_whitespace_around_operators.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O2_whitespace_around_operators.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O2_whitespace_around_operators.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O3_whitespace_around_parenthesis.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O3_whitespace_around_parenthesis.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O3_whitespace_around_parenthesis.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O3_whitespace_around_parenthesis.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O4_align_assignment_operator.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O4_align_assignment_operator.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O4_align_assignment_operator.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O4_align_assignment_operator.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O5_align_column_and_table_aliases.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O5_align_column_and_table_aliases.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O5_align_column_and_table_aliases.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O5_align_column_and_table_aliases.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O6_line_breaks_after_select.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O6_line_breaks_after_select.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O6_line_breaks_after_select.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O6_line_breaks_after_select.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O7_align_equality_predicate.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O7_align_equality_predicate.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O7_align_equality_predicate.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O7_align_equality_predicate.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O8_align_datatypes.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O8_align_datatypes.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O8_align_datatypes.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O8_align_datatypes.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O9_line_breaks_on_boolean_connectors.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O9_line_breaks_on_boolean_connectors.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O9_line_breaks_on_boolean_connectors.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/O9_line_breaks_on_boolean_connectors.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R2_indentation.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R2_indentation.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R2_indentation.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R2_indentation.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R3_one_command_per_line.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R3_one_command_per_line.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R3_one_command_per_line.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R3_one_command_per_line.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R5_commas.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R5_commas.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R5_commas.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R5_commas.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R6_align_parameters.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R6_align_parameters.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R6_align_parameters.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R6_align_parameters.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R7_right_align_keywords.java b/standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R7_right_align_keywords.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R7_right_align_keywords.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/R7_right_align_keywords.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractFormatTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractFormatTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractFormatTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractFormatTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractSqlclTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractSqlclTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractSqlclTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/AbstractSqlclTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatWrongArgumentTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatWrongArgumentTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatWrongArgumentTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/FormatWrongArgumentTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/RunType.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/RunType.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/RunType.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/RunType.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatIgnoreTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatIgnoreTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatIgnoreTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatIgnoreTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatPathWithSpaceTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatPathWithSpaceTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatPathWithSpaceTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatPathWithSpaceTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatRegisterTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatRegisterTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatRegisterTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatRegisterTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatTest.java
diff --git a/tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatWrongArgumentTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatWrongArgumentTest.java
similarity index 100%
rename from tests/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatWrongArgumentTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/sqlcl/tests/TvdFormatWrongArgumentTest.java
diff --git a/standalone/src/test/java/com/trivadis/plsql/formatter/AbstractTvdFormatTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/standalone/tests/AbstractTvdFormatTest.java
similarity index 64%
rename from standalone/src/test/java/com/trivadis/plsql/formatter/AbstractTvdFormatTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/standalone/tests/AbstractTvdFormatTest.java
index 6be36454..1550ab7a 100644
--- a/standalone/src/test/java/com/trivadis/plsql/formatter/AbstractTvdFormatTest.java
+++ b/standalone/src/test/java/com/trivadis/plsql/formatter/standalone/tests/AbstractTvdFormatTest.java
@@ -1,22 +1,29 @@
-package com.trivadis.plsql.formatter;
+package com.trivadis.plsql.formatter.standalone.tests;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.PrintStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Objects;
import java.util.stream.Collectors;
public abstract class AbstractTvdFormatTest {
+ static final PrintStream originalPrintStream = System.out;
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ PrintStream printStream = new PrintStream(outputStream);
Path tempDir;
@BeforeEach
public void setup() {
try {
tempDir = Files.createTempDirectory("tvdformat-test-");
- var url = Thread.currentThread().getContextClassLoader().getResource("input");
+ var url = Thread.currentThread().getContextClassLoader().getResource("unformatted");
assert url != null;
var resourceDir = Paths.get(url.getPath());
var sources = Files.walk(resourceDir)
@@ -26,11 +33,20 @@ public void setup() {
var target = Paths.get(tempDir.toString() + File.separator + source.getFileName());
Files.copy(source, target);
}
+ System.setOut(printStream);
+ outputStream.reset();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
+ @AfterEach
+ public void teardown() {
+ System.clearProperty("tvdformat.standalone");
+ System.clearProperty("polyglot.engine.WarnInterpreterOnly");
+ System.setOut(originalPrintStream);
+ }
+
private String getFileContent(Path file) {
try {
return new String(Files.readAllBytes(file));
@@ -44,9 +60,7 @@ public String getFormattedContent(String fileName) {
return getFileContent(file);
}
- public String getExpectedContent(String fileName) {
- var url = Thread.currentThread().getContextClassLoader().getResource("expected");
- assert url != null;
- return getFileContent(Paths.get(url.getPath() + File.separator + fileName));
+ public String getConsoleOutput() {
+ return outputStream.toString();
}
}
diff --git a/standalone/src/test/java/com/trivadis/plsql/formatter/TvdFormatTest.java b/standalone/src/test/java/com/trivadis/plsql/formatter/standalone/tests/TvdFormatTest.java
similarity index 50%
rename from standalone/src/test/java/com/trivadis/plsql/formatter/TvdFormatTest.java
rename to standalone/src/test/java/com/trivadis/plsql/formatter/standalone/tests/TvdFormatTest.java
index 64e49ab5..b364d283 100644
--- a/standalone/src/test/java/com/trivadis/plsql/formatter/TvdFormatTest.java
+++ b/standalone/src/test/java/com/trivadis/plsql/formatter/standalone/tests/TvdFormatTest.java
@@ -1,5 +1,6 @@
-package com.trivadis.plsql.formatter;
+package com.trivadis.plsql.formatter.standalone.tests;
+import com.trivadis.plsql.formatter.TvdFormat;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -8,9 +9,31 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.util.Objects;
public class TvdFormatTest extends AbstractTvdFormatTest {
+ private final String EXPECTED_QUERY_SQL = """
+ select d.department_name,
+ v.employee_id,
+ v.last_name
+ from departments d
+ cross apply (
+ select *
+ from employees e
+ where e.department_id = d.department_id
+ ) v
+ where d.department_name in ('Marketing', 'Operations', 'Public Relations')
+ order by d.department_name, v.employee_id;
+ """;
+
+ private final String XML = Objects.requireNonNull(
+ Thread.currentThread().getContextClassLoader().getResource("trivadis_advanced_format.xml")).getPath();
+
+ private final String ARBORI = Objects.requireNonNull(
+ Thread.currentThread().getContextClassLoader().getResource("trivadis_custom_format.arbori")).getPath();
+
+
@Test
public void jsonArrayDirTest() throws ScriptException, IOException {
var configFileContent = """
@@ -20,13 +43,11 @@ public void jsonArrayDirTest() throws ScriptException, IOException {
""".replace("#TEMP_DIR#", tempDir.toString());
var configFile = Paths.get(tempDir + File.separator + "config.json");
Files.write(configFile, configFileContent.getBytes());
- var args = new String[]{tempDir + File.separator + "config.json",
- "xml=" + tempDir + File.separator + "trivadis_advanced_format.xml",
- "arbori=" + tempDir + File.separator + "trivadis_custom_format.arbori"};
+ var args = new String[]{tempDir + File.separator + "config.json", "xml=" + XML, "arbori=" + ARBORI};
TvdFormat.main(args);
- var expected = getExpectedContent("query.sql");
var actual = getFormattedContent("query.sql");
- Assertions.assertEquals(expected, actual);
+ Assertions.assertEquals(EXPECTED_QUERY_SQL, actual);
+ Assertions.assertTrue(getConsoleOutput().contains("1 of 4"));
}
@Test
@@ -38,32 +59,34 @@ public void jsonArrayFileTest() throws ScriptException, IOException {
""".replace("#TEMP_DIR#", tempDir.toString()).replace("#FILE_SEP#", File.separator);
var configFile = Paths.get(tempDir + File.separator + "config.json");
Files.write(configFile, configFileContent.getBytes());
- var args = new String[]{tempDir + File.separator + "config.json",
- "xml=" + tempDir + File.separator + "trivadis_advanced_format.xml",
- "arbori=" + tempDir + File.separator + "trivadis_custom_format.arbori"};
+ var args = new String[]{tempDir + File.separator + "config.json", "xml=" + XML, "arbori=" + ARBORI};
TvdFormat.main(args);
- var expected = getExpectedContent("query.sql");
var actual = getFormattedContent("query.sql");
- Assertions.assertEquals(expected, actual);
+ Assertions.assertEquals(EXPECTED_QUERY_SQL, actual);
+ Assertions.assertTrue(getConsoleOutput().contains("1 of 1"));
}
@Test
public void jsonObjectFileTest() throws ScriptException, IOException {
var configFileContent = """
{
- "xml": "#TEMP_DIR##FILE_SEP#trivadis_advanced_format.xml",
- "arbori": "#TEMP_DIR##FILE_SEP#trivadis_custom_format.arbori",
+ "xml": "#XML#",
+ "arbori": "#ARBORI#",
"files": [
- "#TEMP_DIR##FILE_SEP#query.sql"
+ "#TEMP_DIR##FILE_SEP#query.sql",
+ "#TEMP_DIR##FILE_SEP#package_body.pkb"
]
}
- """.replace("#TEMP_DIR#", tempDir.toString()).replace("#FILE_SEP#", File.separator);
+ """.replace("#XML#", XML)
+ .replace("#ARBORI#", ARBORI)
+ .replace("#TEMP_DIR#", tempDir.toString())
+ .replace("#FILE_SEP#", File.separator);
var configFile = Paths.get(tempDir + File.separator + "config.json");
Files.write(configFile, configFileContent.getBytes());
var args = new String[]{tempDir + File.separator + "config.json"};
TvdFormat.main(args);
- var expected = getExpectedContent("query.sql");
var actual = getFormattedContent("query.sql");
- Assertions.assertEquals(expected, actual);
+ Assertions.assertEquals(EXPECTED_QUERY_SQL, actual);
+ Assertions.assertTrue(getConsoleOutput().contains("1 of 2"));
}
}
diff --git a/tests/src/test/resources/advanced_format.xml b/standalone/src/test/resources/advanced_format.xml
similarity index 100%
rename from tests/src/test/resources/advanced_format.xml
rename to standalone/src/test/resources/advanced_format.xml
diff --git a/standalone/src/test/resources/expected/query.sql b/standalone/src/test/resources/expected/query.sql
deleted file mode 100644
index ab92ac4f..00000000
--- a/standalone/src/test/resources/expected/query.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-select d.department_name,
- v.employee_id,
- v.last_name
- from departments d
- cross apply (
- select *
- from employees e
- where e.department_id = d.department_id
- ) v
- where d.department_name in ('Marketing', 'Operations', 'Public Relations')
- order by d.department_name, v.employee_id;
diff --git a/standalone/src/test/resources/input/trivadis_advanced_format.xml b/standalone/src/test/resources/input/trivadis_advanced_format.xml
deleted file mode 120000
index e15d5d37..00000000
--- a/standalone/src/test/resources/input/trivadis_advanced_format.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../settings/sql_developer/trivadis_advanced_format.xml
\ No newline at end of file
diff --git a/standalone/src/test/resources/input/trivadis_custom_format.arbori b/standalone/src/test/resources/input/trivadis_custom_format.arbori
deleted file mode 120000
index 3ac1379d..00000000
--- a/standalone/src/test/resources/input/trivadis_custom_format.arbori
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../settings/sql_developer/trivadis_custom_format.arbori
\ No newline at end of file
diff --git a/tests/src/test/resources/logging.conf b/standalone/src/test/resources/logging.conf
similarity index 100%
rename from tests/src/test/resources/logging.conf
rename to standalone/src/test/resources/logging.conf
diff --git a/tests/src/test/resources/trivadis_advanced_format.xml b/standalone/src/test/resources/trivadis_advanced_format.xml
similarity index 100%
rename from tests/src/test/resources/trivadis_advanced_format.xml
rename to standalone/src/test/resources/trivadis_advanced_format.xml
diff --git a/tests/src/test/resources/trivadis_custom_format.arbori b/standalone/src/test/resources/trivadis_custom_format.arbori
similarity index 100%
rename from tests/src/test/resources/trivadis_custom_format.arbori
rename to standalone/src/test/resources/trivadis_custom_format.arbori
diff --git a/tests/src/test/resources/unformatted/dont_format.txt b/standalone/src/test/resources/unformatted/dont_format.txt
similarity index 100%
rename from tests/src/test/resources/unformatted/dont_format.txt
rename to standalone/src/test/resources/unformatted/dont_format.txt
diff --git a/tests/src/test/resources/unformatted/markdown.md b/standalone/src/test/resources/unformatted/markdown.md
similarity index 100%
rename from tests/src/test/resources/unformatted/markdown.md
rename to standalone/src/test/resources/unformatted/markdown.md
diff --git a/tests/src/test/resources/unformatted/package_body.pkb b/standalone/src/test/resources/unformatted/package_body.pkb
similarity index 100%
rename from tests/src/test/resources/unformatted/package_body.pkb
rename to standalone/src/test/resources/unformatted/package_body.pkb
diff --git a/standalone/src/test/resources/input/query.sql b/standalone/src/test/resources/unformatted/query.sql
similarity index 100%
rename from standalone/src/test/resources/input/query.sql
rename to standalone/src/test/resources/unformatted/query.sql
diff --git a/tests/src/test/resources/unformatted/sql.txt b/standalone/src/test/resources/unformatted/sql.txt
similarity index 100%
rename from tests/src/test/resources/unformatted/sql.txt
rename to standalone/src/test/resources/unformatted/sql.txt
diff --git a/tests/src/test/resources/unformatted/syntax_error.sql b/standalone/src/test/resources/unformatted/syntax_error.sql
similarity index 100%
rename from tests/src/test/resources/unformatted/syntax_error.sql
rename to standalone/src/test/resources/unformatted/syntax_error.sql
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index b981d917..00000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,47 +0,0 @@
-# Compiled class file
-*.class
-
-# Xtend files and temporary directories
-*._trace
-*.xtendbin
-**/xtend-gen
-**/generated-sources
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Eclipse
-.project
-.classpath
-**/.settings
-
-# IntelliJ
-.idea
-
-# Windows
-Thumbs.db
-
-# macOS
-.DS_Store
-
-# Targets
-**/target
-**/bin
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index 25013c39..00000000
--- a/tests/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Unit Tests for PL/SQL & SQL Formatter Settings
-
-## Introduction
-
-This is a Maven project that does not produce an artifact. It's designed to execute tests only. The idea is to unit test the settings for the SQL Developer's formatter and to test the SQLcl script `format.js`.
-
-## How to Run Tests
-
-1. [Download](https://www.oracle.com/tools/downloads/sqlcl-downloads.html) and install SQLcl 21.3.0
-2. Download and install a JDK 17, e.g. from
- - https://www.oracle.com/java/technologies/downloads/#JDK17
- - https://jdk.java.net/17/
-3. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.8.3
-4. [Download](https://git-scm.com/downloads) and install a git command line client
-5. Clone the plsql-formatter-settings repository
-6. Open a terminal window in the plsql-formatter-settings root folder and type
-
- cd tests
-
-6. Run maven build by the following command
-
- mvn -Dsqlcl.libdir=/usr/local/bin/sqlcl/lib clean test
-
- Amend the parameter `sqlcl.libdir` to match the path of the lib directory of you SQLcl installation. This folder is used to reference the `dbtools-common.jar` library (containing the formatter and its dependencies) and the `dbtools-sqlcl.jar` (containing SQLcl related features) which are not available in public Maven repositories.
-
-## Excerpt of `mvn clean test` Output
-
-```
-[INFO] Scanning for projects...
-[INFO]
-[INFO] ---------------< com.trivadis:plsql.formatter.settings >----------------
-[INFO] Building com.trivadis.org.plsql.formatter.settings 21.3.0-SNAPSHOT
-[INFO] --------------------------------[ jar ]---------------------------------
-[INFO]
-...
-[INFO]
-[INFO] -------------------------------------------------------
-[INFO] T E S T S
-[INFO] -------------------------------------------------------
-...
-[INFO]
-[INFO] Results:
-[INFO]
-[WARNING] Tests run: 520, Failures: 0, Errors: 0, Skipped: 2
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESS
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 55.466 s
-[INFO] Finished at: 2021-10-10T19:00:13+02:00
-[INFO] ------------------------------------------------------------------------
-```
diff --git a/tests/pom.xml b/tests/pom.xml
deleted file mode 100644
index 98190942..00000000
--- a/tests/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-
- 4.0.0
-
-
- com.trivadis
- plsql.formatter.settings
- 21.4.1-SNAPSHOT
- jar
-
- UTF-8
- 17
- /usr/local/bin/sqlcl/lib
- 21.4.0
- 21.3.0
-
-
-
-
-
- org.graalvm.js
- js
- ${graalvm.version}
- test
-
-
- org.graalvm.js
- js-scriptengine
- ${graalvm.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter
- 5.8.2
- test
-
-
-
- com.google.guava
- guava
- 31.0.1-jre
-
-
-
- oracle.dbtools
- dbtools-common
- ${sqlcl.version}
- system
- ${sqlcl.libdir}/dbtools-common.jar
-
-
- oracle.dbtools
- dbtools-sqlcl
- ${sqlcl.version}
- system
- ${sqlcl.libdir}/dbtools-sqlcl.jar
-
-
- oracle.xml
- xmlparserv2-sans-jaxp-services
- ${sqlcl.version}
- system
- ${sqlcl.libdir}/xmlparserv2_sans_jaxp_services.jar
-
-
- oracle.i18n
- orai18n
- ${sqlcl.version}
- system
- ${sqlcl.libdir}/orai18n.jar
-
-
- oracle.soda
- orajsoda
- ${sqlcl.version}
- system
- ${sqlcl.libdir}/orajsoda.jar
-
-
-
-
-
- ${project.basedir}/src/test/java
-
-
- src/main/resources
-
- **/*.*
-
-
-
-
-
- org.apache.maven.plugins
- 3.8.1
- maven-compiler-plugin
-
- ${jdk.version}
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.2
-
-
- **/*.java
-
-
-
-
-
-
-
- com.trivadis.org.plsql.formatter.settings
- Testing PL/SQL and SQL Formatter Settings for SQL Developer
- https://github.com/Trivadis/plsql-formatter-settings
- 2020
-
-
- Apache License, Version 2.0
- https://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
- Trivadis
- https://www.trivadis.com/
-
-
-
- philipp.salvisberg@trivadis.com
- Philipp Salvisberg
- https://github.com/PhilippSalvisberg/
- PhilippSalvisberg
-
- lead
- developer
-
-
-
-
-
-
- GitHub Issues
- https://github.com/Trivadis/plsql-formatter-settings/issues
-
-
- scm:git:git://github.com/Trivadis/plsql-formater-settings.git
- scm:git:git@github.com:Triviadis/plsql-formatter-settings.git
- main
- https://github.com/Trivadis/plsql-formatter-settings
-
-
-
\ No newline at end of file
diff --git a/tests/src/test/resources/format.js b/tests/src/test/resources/format.js
deleted file mode 120000
index c7a6b312..00000000
--- a/tests/src/test/resources/format.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../sqlcl/format.js
\ No newline at end of file
diff --git a/tests/src/test/resources/unformatted/query.sql b/tests/src/test/resources/unformatted/query.sql
deleted file mode 100644
index 31ac08cd..00000000
--- a/tests/src/test/resources/unformatted/query.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-Select d.department_name,v. employee_id
-,v
-. last_name frOm departments d CROSS APPLY(select*from employees e
- wHERE e.department_id=d.department_id) v WHeRE
-d.department_name in ('Marketing'
-,'Operations',
-'Public Relations') Order By d.
-department_name,v.employee_id;
\ No newline at end of file