From ca977cf6d78a431d0022142de1f77b114292d042 Mon Sep 17 00:00:00 2001 From: Philip Wedemann <22521688+hfhbd@users.noreply.github.com> Date: Sat, 12 Aug 2023 16:54:26 +0200 Subject: [PATCH] Use test fixture plugin (#551) * Use test fixture plugin * Exclude intellij dep from text fixtures --------- Co-authored-by: hfhbd --- core/build.gradle | 7 ++++++- .../alecstrong/sql/psi/test/fixtures/CompileFile.kt | 0 .../alecstrong/sql/psi/test/fixtures/FixturesTest.kt | 0 .../sql/psi/test/fixtures/TestHeadlessParser.kt | 0 .../resources/fixtures/adjacent-columns/Test.s | 0 .../resources/fixtures/alias-in-having/Test.s | 0 .../resources/fixtures/alias-in-subquery/Test.s | 0 .../resources/fixtures/alter-in-unordered/Test.s | 0 .../resources/fixtures/alter-table-multiple/1.s | 0 .../resources/fixtures/bind-failures/Test.s | 0 .../resources/fixtures/bind-failures/failure.txt | 0 .../resources/fixtures/bind-parameters-valid/Test.s | 0 .../resources/fixtures/bitwise-operator/Test.s | 0 .../src/testFixtures}/resources/fixtures/cast/Test.s | 0 .../resources/fixtures/collate-nocase/Test.s | 0 .../fixtures/column-through-join-alias/Test.s | 0 .../resources/fixtures/create-if-not-exists/1.s | 0 .../resources/fixtures/create-index-collision/Test.s | 0 .../fixtures/create-index-collision/failure.txt | 0 .../fixtures/create-index-validation-failures/Test.s | 0 .../create-index-validation-failures/failure.txt | 0 .../create-table-validation-failures/Child1.s | 0 .../create-table-validation-failures/Child10.s | 0 .../create-table-validation-failures/Child11.s | 0 .../create-table-validation-failures/Child2.s | 0 .../create-table-validation-failures/Child3.s | 0 .../create-table-validation-failures/Child4.s | 0 .../create-table-validation-failures/Child5.s | 0 .../create-table-validation-failures/Child6.s | 0 .../create-table-validation-failures/Child7.s | 0 .../create-table-validation-failures/Child8.s | 0 .../create-table-validation-failures/Child9.s | 0 .../create-table-validation-failures/Parent.s | 0 .../create-table-validation-failures/Parent2.s | 0 .../fixtures/create-table-validation-failures/Test.s | 0 .../fixtures/create-table-validation-failures/Test2.s | 0 .../fixtures/create-table-validation-failures/Test3.s | 0 .../fixtures/create-table-validation-failures/Test4.s | 0 .../fixtures/create-table-validation-failures/Test5.s | 0 .../fixtures/create-table-validation-failures/Test6.s | 0 .../create-table-validation-failures/failure.txt | 0 .../fixtures/create-trigger-collision/Test.s | 0 .../fixtures/create-trigger-collision/failure.txt | 0 .../resources/fixtures/create-trigger-docid/Test.s | 0 .../resources/fixtures/create-trigger-raise/Test.s | 0 .../resources/fixtures/create-trigger-success/Test.s | 0 .../create-trigger-validation-failures/Test.s | 0 .../create-trigger-validation-failures/failure.txt | 0 .../resources/fixtures/delete-error/Test.s | 0 .../fixtures/delete-validation-failures/Test.s | 0 .../fixtures/delete-validation-failures/failure.txt | 0 .../resources/fixtures/double-error/Test.s | 0 .../resources/fixtures/double-error/failure.txt | 0 .../fixtures/duplicate-column-name/IdentifierTable.s | 0 .../resources/fixtures/duplicate-column-name/Table.s | 0 .../fixtures/duplicate-column-name/failure.txt | 0 .../resources/fixtures/duplicate-table-name/Table.s | 0 .../resources/fixtures/duplicate-table-name/Table2.s | 0 .../fixtures/duplicate-table-name/failure.txt | 0 .../resources/fixtures/exists-clause/Test.s | 0 .../resources/fixtures/expression-failures/Test.s | 0 .../fixtures/expression-failures/failure.txt | 0 .../resources/fixtures/foreign-key-error/Player.s | 0 .../resources/fixtures/foreign-key-error/Team.s | 0 .../resources/fixtures/foreign-key-error/failure.txt | 0 .../fixtures/foreign-key-same-table/Player.s | 0 .../resources/fixtures/fts-tables/Test.s | 0 .../resources/fixtures/fts-tables/failure.txt | 0 .../resources/fixtures/fts-tokenizer/Test.s | 0 .../resources/fixtures/fts-tokenizer/failure.txt | 0 .../resources/fixtures/fts5-tables/Test.s | 0 .../resources/fixtures/function-from-for/Test.s | 0 .../resources/fixtures/function-name-for/Test.s | 0 .../fixtures/function-param-has-errors/Test.s | 0 .../fixtures/function-param-has-errors/failure.txt | 0 .../resources/fixtures/generated-default/Test.s | 0 .../resources/fixtures/group-by-function/Test.s | 0 .../resources/fixtures/group-by-order-by-count/Test.s | 0 .../resources/fixtures/group-by/JoinedColumn.s | 0 .../identifier/ProjectionsOfQuotedIdentifiers.s | 0 .../resources/fixtures/identifier/Test2.s | 0 .../resources/fixtures/identifier/generate_test.py | 0 .../resources/fixtures/if-not-exists/1.s | 0 .../fixtures/incorrect-compound-size/Table.s | 0 .../fixtures/incorrect-compound-size/failure.txt | 0 .../resources/fixtures/index-migration/1.s | 0 .../resources/fixtures/index-migration/2.s | 0 .../resources/fixtures/index-migration/3.s | 0 .../resources/fixtures/index-migration/master.s | 0 .../resources/fixtures/index-on-bad-table/Test.s | 0 .../fixtures/insert-bind-args-failure/Test.s | 0 .../fixtures/insert-bind-args-failure/failure.txt | 0 .../resources/fixtures/insert-default-values/Test.s | 0 .../resources/fixtures/insert-invalid-column/Test.s | 0 .../fixtures/insert-validation-failure/Test.s | 0 .../fixtures/insert-validation-failure/failure.txt | 0 .../fixtures/is-distinct-from-binary-operator/Test.s | 0 .../resources/fixtures/join-with-using-clause/Test.s | 0 .../fixtures/joined-column-wrong-name/Table.s | 0 .../fixtures/joined-column-wrong-name/failure.txt | 0 .../fixtures/joining-column-wrong-name/Table.s | 0 .../fixtures/joining-column-wrong-name/failure.txt | 0 .../resources/fixtures/match-operator/Test.s | 0 .../resources/fixtures/match-operator/failure.txt | 0 .../fixtures/missing-column-in-subquery/Test.s | 0 .../fixtures/missing-column-in-subquery/Test2.s | 0 .../fixtures/missing-column-in-subquery/failure.txt | 0 .../fixtures/multi-column-select-in-where/Test.s | 0 .../resources/fixtures/multiple-column-where/Test.s | 0 .../fixtures/multiple-column-where/failure.txt | 0 .../fixtures/multiple-errors-in-single-block/Test.s | 0 .../multiple-errors-in-single-block/failure.txt | 0 .../fixtures/multiple-validation-failures/Test.s | 0 .../fixtures/multiple-validation-failures/Test2.s | 0 .../fixtures/multiple-validation-failures/failure.txt | 0 .../resources/fixtures/multiple-views/Test.s | 0 .../resources/fixtures/no-column/Table.s | 0 .../resources/fixtures/no-column/failure.txt | 0 .../resources/fixtures/no-view-or-table/Table.s | 0 .../resources/fixtures/no-view-or-table/failure.txt | 0 .../resources/fixtures/order-by-union/Test.s | 0 .../resources/fixtures/order-by-unprojected/Test.s | 0 .../fixtures/order-by-unprojected/failure.txt | 0 .../fixtures/order-by-using-projection/Test.s | 0 .../resources/fixtures/order-by-with-tablename/Test.s | 0 .../fixtures/outer-property-inner-subquery/Test.s | 0 .../resources/fixtures/outside-columns-in-join/Test.s | 0 .../fixtures/outside-columns-in-join/failure.txt | 0 .../resources/fixtures/parentheses/Test.s | 0 .../testFixtures}/resources/fixtures/pragmas/Test.s | 0 .../resources/fixtures/predefined/Dual.predefined | 0 .../resources/fixtures/predefined/Select.s | 0 .../resources/fixtures/predefined/Table.s | 0 .../resources/fixtures/recursive-table-reference/1.s | 0 .../resources/fixtures/recursive-view/Table.s | 0 .../resources/fixtures/recursive-view/failure.txt | 0 .../resources/fixtures/rowid-orderby/Test.s | 0 .../resources/fixtures/rowid-triggers/Test.s | 0 .../fixtures/select-stmt-validation-failures/Test.s | 0 .../select-stmt-validation-failures/failure.txt | 0 .../resources/fixtures/simple-with-recursive/Test.s | 0 .../fixtures/simple-without-recursive/Test.s | 0 .../fixtures/simple-without-recursive/failure.txt | 0 .../resources/fixtures/square-brackets/Test.s | 0 .../resources/fixtures/subqueries-ambiguous/Test.s | 0 .../fixtures/subqueries-ambiguous/failure.txt | 0 .../resources/fixtures/table-alias/Table.s | 0 .../resources/fixtures/table-alias/failure.txt | 0 .../resources/fixtures/table-errors-first/Test.s | 0 .../resources/fixtures/table-errors-first/failure.txt | 0 .../resources/fixtures/table-migrations/1.s | 0 .../resources/fixtures/table-migrations/2.s | 0 .../resources/fixtures/table-migrations/3.s | 0 .../resources/fixtures/timestamp-literals/Test.s | 0 .../resources/fixtures/trigger-migration/1.s | 0 .../resources/fixtures/trigger-migration/2.s | 0 .../resources/fixtures/trigger-migration/3.s | 0 .../resources/fixtures/trigger-migration/master.s | 0 .../fixtures/trigger-new-in-expression/Test.s | 0 .../src/testFixtures}/resources/fixtures/union/Test.s | 0 .../resources/fixtures/update-inner-select/Test.s | 0 .../resources/fixtures/update-multiple-columns/Test.s | 0 .../fixtures/update-validation-failures/Test.s | 0 .../fixtures/update-validation-failures/failure.txt | 0 .../fixtures/update-view-with-trigger/Test.s | 0 .../fixtures/update-view-without-trigger/Test.s | 0 .../fixtures/update-with-columns-in-expression/Test.s | 0 .../fixtures/view-columns-validation-failures/Test.s | 0 .../view-columns-validation-failures/failure.txt | 0 .../resources/fixtures/view-columns-validation/Test.s | 0 .../resources/fixtures/well-formed-selects/Test.s | 0 .../resources/fixtures/with-inner-recursive/Test.s | 0 .../resources/fixtures/with-recursive-alias/Test.s | 0 .../resources/fixtures/with-recursive/Test.s | 0 .../resources/fixtures/with-recursive/failure.txt | 0 .../fixtures/with-table-name-collision/Test.s | 0 .../fixtures/with-table-name-collision/failure.txt | 0 .../resources/fixtures/wrong-size-values/Test.s | 0 .../resources/fixtures/wrong-size-values/failure.txt | 0 settings.gradle | 2 +- test-fixtures/build.gradle | 11 ----------- test-fixtures/gradle.properties | 4 ---- 182 files changed, 7 insertions(+), 17 deletions(-) rename {test-fixtures/src/main => core/src/testFixtures}/kotlin/com/alecstrong/sql/psi/test/fixtures/CompileFile.kt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/kotlin/com/alecstrong/sql/psi/test/fixtures/FixturesTest.kt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/kotlin/com/alecstrong/sql/psi/test/fixtures/TestHeadlessParser.kt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/adjacent-columns/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/alias-in-having/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/alias-in-subquery/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/alter-in-unordered/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/alter-table-multiple/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/bind-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/bind-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/bind-parameters-valid/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/bitwise-operator/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/cast/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/collate-nocase/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/column-through-join-alias/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-if-not-exists/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-index-collision/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-index-collision/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-index-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-index-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child10.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child11.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child3.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child4.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child5.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child6.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child7.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child8.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Child9.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Parent.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Parent2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Test2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Test3.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Test4.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Test5.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/Test6.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-table-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-collision/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-collision/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-docid/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-raise/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-success/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/create-trigger-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/delete-error/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/delete-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/delete-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/double-error/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/double-error/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/duplicate-column-name/IdentifierTable.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/duplicate-column-name/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/duplicate-column-name/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/duplicate-table-name/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/duplicate-table-name/Table2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/duplicate-table-name/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/exists-clause/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/expression-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/expression-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/foreign-key-error/Player.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/foreign-key-error/Team.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/foreign-key-error/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/foreign-key-same-table/Player.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/fts-tables/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/fts-tables/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/fts-tokenizer/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/fts-tokenizer/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/fts5-tables/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/function-from-for/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/function-name-for/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/function-param-has-errors/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/function-param-has-errors/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/generated-default/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/group-by-function/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/group-by-order-by-count/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/group-by/JoinedColumn.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/identifier/ProjectionsOfQuotedIdentifiers.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/identifier/Test2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/identifier/generate_test.py (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/if-not-exists/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/incorrect-compound-size/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/incorrect-compound-size/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/index-migration/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/index-migration/2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/index-migration/3.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/index-migration/master.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/index-on-bad-table/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/insert-bind-args-failure/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/insert-bind-args-failure/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/insert-default-values/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/insert-invalid-column/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/insert-validation-failure/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/insert-validation-failure/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/is-distinct-from-binary-operator/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/join-with-using-clause/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/joined-column-wrong-name/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/joined-column-wrong-name/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/joining-column-wrong-name/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/joining-column-wrong-name/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/match-operator/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/match-operator/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/missing-column-in-subquery/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/missing-column-in-subquery/Test2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/missing-column-in-subquery/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multi-column-select-in-where/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-column-where/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-column-where/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-errors-in-single-block/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-errors-in-single-block/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-validation-failures/Test2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/multiple-views/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/no-column/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/no-column/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/no-view-or-table/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/no-view-or-table/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/order-by-union/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/order-by-unprojected/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/order-by-unprojected/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/order-by-using-projection/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/order-by-with-tablename/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/outer-property-inner-subquery/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/outside-columns-in-join/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/outside-columns-in-join/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/parentheses/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/pragmas/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/predefined/Dual.predefined (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/predefined/Select.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/predefined/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/recursive-table-reference/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/recursive-view/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/recursive-view/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/rowid-orderby/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/rowid-triggers/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/select-stmt-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/select-stmt-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/simple-with-recursive/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/simple-without-recursive/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/simple-without-recursive/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/square-brackets/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/subqueries-ambiguous/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/subqueries-ambiguous/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-alias/Table.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-alias/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-errors-first/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-errors-first/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-migrations/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-migrations/2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/table-migrations/3.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/timestamp-literals/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/trigger-migration/1.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/trigger-migration/2.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/trigger-migration/3.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/trigger-migration/master.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/trigger-new-in-expression/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/union/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-inner-select/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-multiple-columns/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-view-with-trigger/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-view-without-trigger/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/update-with-columns-in-expression/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/view-columns-validation-failures/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/view-columns-validation-failures/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/view-columns-validation/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/well-formed-selects/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/with-inner-recursive/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/with-recursive-alias/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/with-recursive/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/with-recursive/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/with-table-name-collision/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/with-table-name-collision/failure.txt (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/wrong-size-values/Test.s (100%) rename {test-fixtures/src/main => core/src/testFixtures}/resources/fixtures/wrong-size-values/failure.txt (100%) delete mode 100644 test-fixtures/build.gradle delete mode 100644 test-fixtures/gradle.properties diff --git a/core/build.gradle b/core/build.gradle index d4e8cadf..5ed8e915 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.kotlinJvm) alias(libs.plugins.grammarKitComposer) + id("java-test-fixtures") } apply from: "$rootDir/gradle/gradle-mvn-push.gradle" @@ -16,9 +17,13 @@ sourceSets { dependencies { compileOnly libs.bundles.intelliJ + testFixturesApi project(":core") + testFixturesApi libs.junit + testFixturesCompileOnly libs.bundles.intelliJ + testImplementation libs.junit testImplementation libs.truth - testImplementation project(":test-fixtures") + testImplementation(libs.bundles.intelliJ) } generateLexer { diff --git a/test-fixtures/src/main/kotlin/com/alecstrong/sql/psi/test/fixtures/CompileFile.kt b/core/src/testFixtures/kotlin/com/alecstrong/sql/psi/test/fixtures/CompileFile.kt similarity index 100% rename from test-fixtures/src/main/kotlin/com/alecstrong/sql/psi/test/fixtures/CompileFile.kt rename to core/src/testFixtures/kotlin/com/alecstrong/sql/psi/test/fixtures/CompileFile.kt diff --git a/test-fixtures/src/main/kotlin/com/alecstrong/sql/psi/test/fixtures/FixturesTest.kt b/core/src/testFixtures/kotlin/com/alecstrong/sql/psi/test/fixtures/FixturesTest.kt similarity index 100% rename from test-fixtures/src/main/kotlin/com/alecstrong/sql/psi/test/fixtures/FixturesTest.kt rename to core/src/testFixtures/kotlin/com/alecstrong/sql/psi/test/fixtures/FixturesTest.kt diff --git a/test-fixtures/src/main/kotlin/com/alecstrong/sql/psi/test/fixtures/TestHeadlessParser.kt b/core/src/testFixtures/kotlin/com/alecstrong/sql/psi/test/fixtures/TestHeadlessParser.kt similarity index 100% rename from test-fixtures/src/main/kotlin/com/alecstrong/sql/psi/test/fixtures/TestHeadlessParser.kt rename to core/src/testFixtures/kotlin/com/alecstrong/sql/psi/test/fixtures/TestHeadlessParser.kt diff --git a/test-fixtures/src/main/resources/fixtures/adjacent-columns/Test.s b/core/src/testFixtures/resources/fixtures/adjacent-columns/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/adjacent-columns/Test.s rename to core/src/testFixtures/resources/fixtures/adjacent-columns/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/alias-in-having/Test.s b/core/src/testFixtures/resources/fixtures/alias-in-having/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/alias-in-having/Test.s rename to core/src/testFixtures/resources/fixtures/alias-in-having/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/alias-in-subquery/Test.s b/core/src/testFixtures/resources/fixtures/alias-in-subquery/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/alias-in-subquery/Test.s rename to core/src/testFixtures/resources/fixtures/alias-in-subquery/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/alter-in-unordered/Test.s b/core/src/testFixtures/resources/fixtures/alter-in-unordered/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/alter-in-unordered/Test.s rename to core/src/testFixtures/resources/fixtures/alter-in-unordered/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/alter-table-multiple/1.s b/core/src/testFixtures/resources/fixtures/alter-table-multiple/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/alter-table-multiple/1.s rename to core/src/testFixtures/resources/fixtures/alter-table-multiple/1.s diff --git a/test-fixtures/src/main/resources/fixtures/bind-failures/Test.s b/core/src/testFixtures/resources/fixtures/bind-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/bind-failures/Test.s rename to core/src/testFixtures/resources/fixtures/bind-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/bind-failures/failure.txt b/core/src/testFixtures/resources/fixtures/bind-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/bind-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/bind-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/bind-parameters-valid/Test.s b/core/src/testFixtures/resources/fixtures/bind-parameters-valid/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/bind-parameters-valid/Test.s rename to core/src/testFixtures/resources/fixtures/bind-parameters-valid/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/bitwise-operator/Test.s b/core/src/testFixtures/resources/fixtures/bitwise-operator/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/bitwise-operator/Test.s rename to core/src/testFixtures/resources/fixtures/bitwise-operator/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/cast/Test.s b/core/src/testFixtures/resources/fixtures/cast/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/cast/Test.s rename to core/src/testFixtures/resources/fixtures/cast/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/collate-nocase/Test.s b/core/src/testFixtures/resources/fixtures/collate-nocase/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/collate-nocase/Test.s rename to core/src/testFixtures/resources/fixtures/collate-nocase/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/column-through-join-alias/Test.s b/core/src/testFixtures/resources/fixtures/column-through-join-alias/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/column-through-join-alias/Test.s rename to core/src/testFixtures/resources/fixtures/column-through-join-alias/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-if-not-exists/1.s b/core/src/testFixtures/resources/fixtures/create-if-not-exists/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-if-not-exists/1.s rename to core/src/testFixtures/resources/fixtures/create-if-not-exists/1.s diff --git a/test-fixtures/src/main/resources/fixtures/create-index-collision/Test.s b/core/src/testFixtures/resources/fixtures/create-index-collision/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-index-collision/Test.s rename to core/src/testFixtures/resources/fixtures/create-index-collision/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-index-collision/failure.txt b/core/src/testFixtures/resources/fixtures/create-index-collision/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-index-collision/failure.txt rename to core/src/testFixtures/resources/fixtures/create-index-collision/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/create-index-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/create-index-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-index-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/create-index-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-index-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/create-index-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-index-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/create-index-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child1.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child1.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child1.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child10.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child10.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child10.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child10.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child11.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child11.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child11.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child11.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child2.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child2.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child2.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child3.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child3.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child3.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child3.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child4.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child4.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child4.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child4.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child5.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child5.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child5.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child5.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child6.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child6.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child6.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child6.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child7.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child7.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child7.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child7.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child8.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child8.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child8.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child8.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child9.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child9.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Child9.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Child9.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Parent.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Parent.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Parent.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Parent.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Parent2.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Parent2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Parent2.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Parent2.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test2.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test2.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test2.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test3.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test3.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test3.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test3.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test4.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test4.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test4.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test4.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test5.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test5.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test5.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test5.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test6.s b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test6.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/Test6.s rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/Test6.s diff --git a/test-fixtures/src/main/resources/fixtures/create-table-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/create-table-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-table-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/create-table-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-collision/Test.s b/core/src/testFixtures/resources/fixtures/create-trigger-collision/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-collision/Test.s rename to core/src/testFixtures/resources/fixtures/create-trigger-collision/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-collision/failure.txt b/core/src/testFixtures/resources/fixtures/create-trigger-collision/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-collision/failure.txt rename to core/src/testFixtures/resources/fixtures/create-trigger-collision/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-docid/Test.s b/core/src/testFixtures/resources/fixtures/create-trigger-docid/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-docid/Test.s rename to core/src/testFixtures/resources/fixtures/create-trigger-docid/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-raise/Test.s b/core/src/testFixtures/resources/fixtures/create-trigger-raise/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-raise/Test.s rename to core/src/testFixtures/resources/fixtures/create-trigger-raise/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-success/Test.s b/core/src/testFixtures/resources/fixtures/create-trigger-success/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-success/Test.s rename to core/src/testFixtures/resources/fixtures/create-trigger-success/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/create-trigger-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/create-trigger-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/create-trigger-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/create-trigger-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/create-trigger-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/create-trigger-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/delete-error/Test.s b/core/src/testFixtures/resources/fixtures/delete-error/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/delete-error/Test.s rename to core/src/testFixtures/resources/fixtures/delete-error/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/delete-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/delete-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/delete-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/delete-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/delete-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/delete-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/delete-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/delete-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/double-error/Test.s b/core/src/testFixtures/resources/fixtures/double-error/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/double-error/Test.s rename to core/src/testFixtures/resources/fixtures/double-error/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/double-error/failure.txt b/core/src/testFixtures/resources/fixtures/double-error/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/double-error/failure.txt rename to core/src/testFixtures/resources/fixtures/double-error/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/duplicate-column-name/IdentifierTable.s b/core/src/testFixtures/resources/fixtures/duplicate-column-name/IdentifierTable.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/duplicate-column-name/IdentifierTable.s rename to core/src/testFixtures/resources/fixtures/duplicate-column-name/IdentifierTable.s diff --git a/test-fixtures/src/main/resources/fixtures/duplicate-column-name/Table.s b/core/src/testFixtures/resources/fixtures/duplicate-column-name/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/duplicate-column-name/Table.s rename to core/src/testFixtures/resources/fixtures/duplicate-column-name/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/duplicate-column-name/failure.txt b/core/src/testFixtures/resources/fixtures/duplicate-column-name/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/duplicate-column-name/failure.txt rename to core/src/testFixtures/resources/fixtures/duplicate-column-name/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/duplicate-table-name/Table.s b/core/src/testFixtures/resources/fixtures/duplicate-table-name/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/duplicate-table-name/Table.s rename to core/src/testFixtures/resources/fixtures/duplicate-table-name/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/duplicate-table-name/Table2.s b/core/src/testFixtures/resources/fixtures/duplicate-table-name/Table2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/duplicate-table-name/Table2.s rename to core/src/testFixtures/resources/fixtures/duplicate-table-name/Table2.s diff --git a/test-fixtures/src/main/resources/fixtures/duplicate-table-name/failure.txt b/core/src/testFixtures/resources/fixtures/duplicate-table-name/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/duplicate-table-name/failure.txt rename to core/src/testFixtures/resources/fixtures/duplicate-table-name/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/exists-clause/Test.s b/core/src/testFixtures/resources/fixtures/exists-clause/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/exists-clause/Test.s rename to core/src/testFixtures/resources/fixtures/exists-clause/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/expression-failures/Test.s b/core/src/testFixtures/resources/fixtures/expression-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/expression-failures/Test.s rename to core/src/testFixtures/resources/fixtures/expression-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/expression-failures/failure.txt b/core/src/testFixtures/resources/fixtures/expression-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/expression-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/expression-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/foreign-key-error/Player.s b/core/src/testFixtures/resources/fixtures/foreign-key-error/Player.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/foreign-key-error/Player.s rename to core/src/testFixtures/resources/fixtures/foreign-key-error/Player.s diff --git a/test-fixtures/src/main/resources/fixtures/foreign-key-error/Team.s b/core/src/testFixtures/resources/fixtures/foreign-key-error/Team.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/foreign-key-error/Team.s rename to core/src/testFixtures/resources/fixtures/foreign-key-error/Team.s diff --git a/test-fixtures/src/main/resources/fixtures/foreign-key-error/failure.txt b/core/src/testFixtures/resources/fixtures/foreign-key-error/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/foreign-key-error/failure.txt rename to core/src/testFixtures/resources/fixtures/foreign-key-error/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/foreign-key-same-table/Player.s b/core/src/testFixtures/resources/fixtures/foreign-key-same-table/Player.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/foreign-key-same-table/Player.s rename to core/src/testFixtures/resources/fixtures/foreign-key-same-table/Player.s diff --git a/test-fixtures/src/main/resources/fixtures/fts-tables/Test.s b/core/src/testFixtures/resources/fixtures/fts-tables/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/fts-tables/Test.s rename to core/src/testFixtures/resources/fixtures/fts-tables/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/fts-tables/failure.txt b/core/src/testFixtures/resources/fixtures/fts-tables/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/fts-tables/failure.txt rename to core/src/testFixtures/resources/fixtures/fts-tables/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/fts-tokenizer/Test.s b/core/src/testFixtures/resources/fixtures/fts-tokenizer/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/fts-tokenizer/Test.s rename to core/src/testFixtures/resources/fixtures/fts-tokenizer/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/fts-tokenizer/failure.txt b/core/src/testFixtures/resources/fixtures/fts-tokenizer/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/fts-tokenizer/failure.txt rename to core/src/testFixtures/resources/fixtures/fts-tokenizer/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/fts5-tables/Test.s b/core/src/testFixtures/resources/fixtures/fts5-tables/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/fts5-tables/Test.s rename to core/src/testFixtures/resources/fixtures/fts5-tables/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/function-from-for/Test.s b/core/src/testFixtures/resources/fixtures/function-from-for/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/function-from-for/Test.s rename to core/src/testFixtures/resources/fixtures/function-from-for/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/function-name-for/Test.s b/core/src/testFixtures/resources/fixtures/function-name-for/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/function-name-for/Test.s rename to core/src/testFixtures/resources/fixtures/function-name-for/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/function-param-has-errors/Test.s b/core/src/testFixtures/resources/fixtures/function-param-has-errors/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/function-param-has-errors/Test.s rename to core/src/testFixtures/resources/fixtures/function-param-has-errors/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/function-param-has-errors/failure.txt b/core/src/testFixtures/resources/fixtures/function-param-has-errors/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/function-param-has-errors/failure.txt rename to core/src/testFixtures/resources/fixtures/function-param-has-errors/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/generated-default/Test.s b/core/src/testFixtures/resources/fixtures/generated-default/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/generated-default/Test.s rename to core/src/testFixtures/resources/fixtures/generated-default/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/group-by-function/Test.s b/core/src/testFixtures/resources/fixtures/group-by-function/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/group-by-function/Test.s rename to core/src/testFixtures/resources/fixtures/group-by-function/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/group-by-order-by-count/Test.s b/core/src/testFixtures/resources/fixtures/group-by-order-by-count/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/group-by-order-by-count/Test.s rename to core/src/testFixtures/resources/fixtures/group-by-order-by-count/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/group-by/JoinedColumn.s b/core/src/testFixtures/resources/fixtures/group-by/JoinedColumn.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/group-by/JoinedColumn.s rename to core/src/testFixtures/resources/fixtures/group-by/JoinedColumn.s diff --git a/test-fixtures/src/main/resources/fixtures/identifier/ProjectionsOfQuotedIdentifiers.s b/core/src/testFixtures/resources/fixtures/identifier/ProjectionsOfQuotedIdentifiers.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/identifier/ProjectionsOfQuotedIdentifiers.s rename to core/src/testFixtures/resources/fixtures/identifier/ProjectionsOfQuotedIdentifiers.s diff --git a/test-fixtures/src/main/resources/fixtures/identifier/Test2.s b/core/src/testFixtures/resources/fixtures/identifier/Test2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/identifier/Test2.s rename to core/src/testFixtures/resources/fixtures/identifier/Test2.s diff --git a/test-fixtures/src/main/resources/fixtures/identifier/generate_test.py b/core/src/testFixtures/resources/fixtures/identifier/generate_test.py similarity index 100% rename from test-fixtures/src/main/resources/fixtures/identifier/generate_test.py rename to core/src/testFixtures/resources/fixtures/identifier/generate_test.py diff --git a/test-fixtures/src/main/resources/fixtures/if-not-exists/1.s b/core/src/testFixtures/resources/fixtures/if-not-exists/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/if-not-exists/1.s rename to core/src/testFixtures/resources/fixtures/if-not-exists/1.s diff --git a/test-fixtures/src/main/resources/fixtures/incorrect-compound-size/Table.s b/core/src/testFixtures/resources/fixtures/incorrect-compound-size/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/incorrect-compound-size/Table.s rename to core/src/testFixtures/resources/fixtures/incorrect-compound-size/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/incorrect-compound-size/failure.txt b/core/src/testFixtures/resources/fixtures/incorrect-compound-size/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/incorrect-compound-size/failure.txt rename to core/src/testFixtures/resources/fixtures/incorrect-compound-size/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/index-migration/1.s b/core/src/testFixtures/resources/fixtures/index-migration/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/index-migration/1.s rename to core/src/testFixtures/resources/fixtures/index-migration/1.s diff --git a/test-fixtures/src/main/resources/fixtures/index-migration/2.s b/core/src/testFixtures/resources/fixtures/index-migration/2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/index-migration/2.s rename to core/src/testFixtures/resources/fixtures/index-migration/2.s diff --git a/test-fixtures/src/main/resources/fixtures/index-migration/3.s b/core/src/testFixtures/resources/fixtures/index-migration/3.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/index-migration/3.s rename to core/src/testFixtures/resources/fixtures/index-migration/3.s diff --git a/test-fixtures/src/main/resources/fixtures/index-migration/master.s b/core/src/testFixtures/resources/fixtures/index-migration/master.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/index-migration/master.s rename to core/src/testFixtures/resources/fixtures/index-migration/master.s diff --git a/test-fixtures/src/main/resources/fixtures/index-on-bad-table/Test.s b/core/src/testFixtures/resources/fixtures/index-on-bad-table/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/index-on-bad-table/Test.s rename to core/src/testFixtures/resources/fixtures/index-on-bad-table/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/insert-bind-args-failure/Test.s b/core/src/testFixtures/resources/fixtures/insert-bind-args-failure/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/insert-bind-args-failure/Test.s rename to core/src/testFixtures/resources/fixtures/insert-bind-args-failure/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/insert-bind-args-failure/failure.txt b/core/src/testFixtures/resources/fixtures/insert-bind-args-failure/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/insert-bind-args-failure/failure.txt rename to core/src/testFixtures/resources/fixtures/insert-bind-args-failure/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/insert-default-values/Test.s b/core/src/testFixtures/resources/fixtures/insert-default-values/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/insert-default-values/Test.s rename to core/src/testFixtures/resources/fixtures/insert-default-values/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/insert-invalid-column/Test.s b/core/src/testFixtures/resources/fixtures/insert-invalid-column/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/insert-invalid-column/Test.s rename to core/src/testFixtures/resources/fixtures/insert-invalid-column/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/insert-validation-failure/Test.s b/core/src/testFixtures/resources/fixtures/insert-validation-failure/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/insert-validation-failure/Test.s rename to core/src/testFixtures/resources/fixtures/insert-validation-failure/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/insert-validation-failure/failure.txt b/core/src/testFixtures/resources/fixtures/insert-validation-failure/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/insert-validation-failure/failure.txt rename to core/src/testFixtures/resources/fixtures/insert-validation-failure/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/is-distinct-from-binary-operator/Test.s b/core/src/testFixtures/resources/fixtures/is-distinct-from-binary-operator/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/is-distinct-from-binary-operator/Test.s rename to core/src/testFixtures/resources/fixtures/is-distinct-from-binary-operator/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/join-with-using-clause/Test.s b/core/src/testFixtures/resources/fixtures/join-with-using-clause/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/join-with-using-clause/Test.s rename to core/src/testFixtures/resources/fixtures/join-with-using-clause/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/joined-column-wrong-name/Table.s b/core/src/testFixtures/resources/fixtures/joined-column-wrong-name/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/joined-column-wrong-name/Table.s rename to core/src/testFixtures/resources/fixtures/joined-column-wrong-name/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/joined-column-wrong-name/failure.txt b/core/src/testFixtures/resources/fixtures/joined-column-wrong-name/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/joined-column-wrong-name/failure.txt rename to core/src/testFixtures/resources/fixtures/joined-column-wrong-name/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/joining-column-wrong-name/Table.s b/core/src/testFixtures/resources/fixtures/joining-column-wrong-name/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/joining-column-wrong-name/Table.s rename to core/src/testFixtures/resources/fixtures/joining-column-wrong-name/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/joining-column-wrong-name/failure.txt b/core/src/testFixtures/resources/fixtures/joining-column-wrong-name/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/joining-column-wrong-name/failure.txt rename to core/src/testFixtures/resources/fixtures/joining-column-wrong-name/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/match-operator/Test.s b/core/src/testFixtures/resources/fixtures/match-operator/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/match-operator/Test.s rename to core/src/testFixtures/resources/fixtures/match-operator/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/match-operator/failure.txt b/core/src/testFixtures/resources/fixtures/match-operator/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/match-operator/failure.txt rename to core/src/testFixtures/resources/fixtures/match-operator/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/missing-column-in-subquery/Test.s b/core/src/testFixtures/resources/fixtures/missing-column-in-subquery/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/missing-column-in-subquery/Test.s rename to core/src/testFixtures/resources/fixtures/missing-column-in-subquery/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/missing-column-in-subquery/Test2.s b/core/src/testFixtures/resources/fixtures/missing-column-in-subquery/Test2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/missing-column-in-subquery/Test2.s rename to core/src/testFixtures/resources/fixtures/missing-column-in-subquery/Test2.s diff --git a/test-fixtures/src/main/resources/fixtures/missing-column-in-subquery/failure.txt b/core/src/testFixtures/resources/fixtures/missing-column-in-subquery/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/missing-column-in-subquery/failure.txt rename to core/src/testFixtures/resources/fixtures/missing-column-in-subquery/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/multi-column-select-in-where/Test.s b/core/src/testFixtures/resources/fixtures/multi-column-select-in-where/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multi-column-select-in-where/Test.s rename to core/src/testFixtures/resources/fixtures/multi-column-select-in-where/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/multiple-column-where/Test.s b/core/src/testFixtures/resources/fixtures/multiple-column-where/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-column-where/Test.s rename to core/src/testFixtures/resources/fixtures/multiple-column-where/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/multiple-column-where/failure.txt b/core/src/testFixtures/resources/fixtures/multiple-column-where/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-column-where/failure.txt rename to core/src/testFixtures/resources/fixtures/multiple-column-where/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/multiple-errors-in-single-block/Test.s b/core/src/testFixtures/resources/fixtures/multiple-errors-in-single-block/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-errors-in-single-block/Test.s rename to core/src/testFixtures/resources/fixtures/multiple-errors-in-single-block/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/multiple-errors-in-single-block/failure.txt b/core/src/testFixtures/resources/fixtures/multiple-errors-in-single-block/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-errors-in-single-block/failure.txt rename to core/src/testFixtures/resources/fixtures/multiple-errors-in-single-block/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/multiple-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/multiple-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/multiple-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/multiple-validation-failures/Test2.s b/core/src/testFixtures/resources/fixtures/multiple-validation-failures/Test2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-validation-failures/Test2.s rename to core/src/testFixtures/resources/fixtures/multiple-validation-failures/Test2.s diff --git a/test-fixtures/src/main/resources/fixtures/multiple-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/multiple-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/multiple-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/multiple-views/Test.s b/core/src/testFixtures/resources/fixtures/multiple-views/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/multiple-views/Test.s rename to core/src/testFixtures/resources/fixtures/multiple-views/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/no-column/Table.s b/core/src/testFixtures/resources/fixtures/no-column/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/no-column/Table.s rename to core/src/testFixtures/resources/fixtures/no-column/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/no-column/failure.txt b/core/src/testFixtures/resources/fixtures/no-column/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/no-column/failure.txt rename to core/src/testFixtures/resources/fixtures/no-column/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/no-view-or-table/Table.s b/core/src/testFixtures/resources/fixtures/no-view-or-table/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/no-view-or-table/Table.s rename to core/src/testFixtures/resources/fixtures/no-view-or-table/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/no-view-or-table/failure.txt b/core/src/testFixtures/resources/fixtures/no-view-or-table/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/no-view-or-table/failure.txt rename to core/src/testFixtures/resources/fixtures/no-view-or-table/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/order-by-union/Test.s b/core/src/testFixtures/resources/fixtures/order-by-union/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/order-by-union/Test.s rename to core/src/testFixtures/resources/fixtures/order-by-union/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/order-by-unprojected/Test.s b/core/src/testFixtures/resources/fixtures/order-by-unprojected/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/order-by-unprojected/Test.s rename to core/src/testFixtures/resources/fixtures/order-by-unprojected/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/order-by-unprojected/failure.txt b/core/src/testFixtures/resources/fixtures/order-by-unprojected/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/order-by-unprojected/failure.txt rename to core/src/testFixtures/resources/fixtures/order-by-unprojected/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/order-by-using-projection/Test.s b/core/src/testFixtures/resources/fixtures/order-by-using-projection/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/order-by-using-projection/Test.s rename to core/src/testFixtures/resources/fixtures/order-by-using-projection/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/order-by-with-tablename/Test.s b/core/src/testFixtures/resources/fixtures/order-by-with-tablename/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/order-by-with-tablename/Test.s rename to core/src/testFixtures/resources/fixtures/order-by-with-tablename/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/outer-property-inner-subquery/Test.s b/core/src/testFixtures/resources/fixtures/outer-property-inner-subquery/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/outer-property-inner-subquery/Test.s rename to core/src/testFixtures/resources/fixtures/outer-property-inner-subquery/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/outside-columns-in-join/Test.s b/core/src/testFixtures/resources/fixtures/outside-columns-in-join/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/outside-columns-in-join/Test.s rename to core/src/testFixtures/resources/fixtures/outside-columns-in-join/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/outside-columns-in-join/failure.txt b/core/src/testFixtures/resources/fixtures/outside-columns-in-join/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/outside-columns-in-join/failure.txt rename to core/src/testFixtures/resources/fixtures/outside-columns-in-join/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/parentheses/Test.s b/core/src/testFixtures/resources/fixtures/parentheses/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/parentheses/Test.s rename to core/src/testFixtures/resources/fixtures/parentheses/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/pragmas/Test.s b/core/src/testFixtures/resources/fixtures/pragmas/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/pragmas/Test.s rename to core/src/testFixtures/resources/fixtures/pragmas/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/predefined/Dual.predefined b/core/src/testFixtures/resources/fixtures/predefined/Dual.predefined similarity index 100% rename from test-fixtures/src/main/resources/fixtures/predefined/Dual.predefined rename to core/src/testFixtures/resources/fixtures/predefined/Dual.predefined diff --git a/test-fixtures/src/main/resources/fixtures/predefined/Select.s b/core/src/testFixtures/resources/fixtures/predefined/Select.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/predefined/Select.s rename to core/src/testFixtures/resources/fixtures/predefined/Select.s diff --git a/test-fixtures/src/main/resources/fixtures/predefined/Table.s b/core/src/testFixtures/resources/fixtures/predefined/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/predefined/Table.s rename to core/src/testFixtures/resources/fixtures/predefined/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/recursive-table-reference/1.s b/core/src/testFixtures/resources/fixtures/recursive-table-reference/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/recursive-table-reference/1.s rename to core/src/testFixtures/resources/fixtures/recursive-table-reference/1.s diff --git a/test-fixtures/src/main/resources/fixtures/recursive-view/Table.s b/core/src/testFixtures/resources/fixtures/recursive-view/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/recursive-view/Table.s rename to core/src/testFixtures/resources/fixtures/recursive-view/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/recursive-view/failure.txt b/core/src/testFixtures/resources/fixtures/recursive-view/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/recursive-view/failure.txt rename to core/src/testFixtures/resources/fixtures/recursive-view/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/rowid-orderby/Test.s b/core/src/testFixtures/resources/fixtures/rowid-orderby/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/rowid-orderby/Test.s rename to core/src/testFixtures/resources/fixtures/rowid-orderby/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/rowid-triggers/Test.s b/core/src/testFixtures/resources/fixtures/rowid-triggers/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/rowid-triggers/Test.s rename to core/src/testFixtures/resources/fixtures/rowid-triggers/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/select-stmt-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/select-stmt-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/select-stmt-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/select-stmt-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/select-stmt-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/select-stmt-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/select-stmt-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/select-stmt-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/simple-with-recursive/Test.s b/core/src/testFixtures/resources/fixtures/simple-with-recursive/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/simple-with-recursive/Test.s rename to core/src/testFixtures/resources/fixtures/simple-with-recursive/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/simple-without-recursive/Test.s b/core/src/testFixtures/resources/fixtures/simple-without-recursive/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/simple-without-recursive/Test.s rename to core/src/testFixtures/resources/fixtures/simple-without-recursive/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/simple-without-recursive/failure.txt b/core/src/testFixtures/resources/fixtures/simple-without-recursive/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/simple-without-recursive/failure.txt rename to core/src/testFixtures/resources/fixtures/simple-without-recursive/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/square-brackets/Test.s b/core/src/testFixtures/resources/fixtures/square-brackets/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/square-brackets/Test.s rename to core/src/testFixtures/resources/fixtures/square-brackets/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/subqueries-ambiguous/Test.s b/core/src/testFixtures/resources/fixtures/subqueries-ambiguous/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/subqueries-ambiguous/Test.s rename to core/src/testFixtures/resources/fixtures/subqueries-ambiguous/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/subqueries-ambiguous/failure.txt b/core/src/testFixtures/resources/fixtures/subqueries-ambiguous/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/subqueries-ambiguous/failure.txt rename to core/src/testFixtures/resources/fixtures/subqueries-ambiguous/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/table-alias/Table.s b/core/src/testFixtures/resources/fixtures/table-alias/Table.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-alias/Table.s rename to core/src/testFixtures/resources/fixtures/table-alias/Table.s diff --git a/test-fixtures/src/main/resources/fixtures/table-alias/failure.txt b/core/src/testFixtures/resources/fixtures/table-alias/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-alias/failure.txt rename to core/src/testFixtures/resources/fixtures/table-alias/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/table-errors-first/Test.s b/core/src/testFixtures/resources/fixtures/table-errors-first/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-errors-first/Test.s rename to core/src/testFixtures/resources/fixtures/table-errors-first/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/table-errors-first/failure.txt b/core/src/testFixtures/resources/fixtures/table-errors-first/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-errors-first/failure.txt rename to core/src/testFixtures/resources/fixtures/table-errors-first/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/table-migrations/1.s b/core/src/testFixtures/resources/fixtures/table-migrations/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-migrations/1.s rename to core/src/testFixtures/resources/fixtures/table-migrations/1.s diff --git a/test-fixtures/src/main/resources/fixtures/table-migrations/2.s b/core/src/testFixtures/resources/fixtures/table-migrations/2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-migrations/2.s rename to core/src/testFixtures/resources/fixtures/table-migrations/2.s diff --git a/test-fixtures/src/main/resources/fixtures/table-migrations/3.s b/core/src/testFixtures/resources/fixtures/table-migrations/3.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/table-migrations/3.s rename to core/src/testFixtures/resources/fixtures/table-migrations/3.s diff --git a/test-fixtures/src/main/resources/fixtures/timestamp-literals/Test.s b/core/src/testFixtures/resources/fixtures/timestamp-literals/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/timestamp-literals/Test.s rename to core/src/testFixtures/resources/fixtures/timestamp-literals/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/trigger-migration/1.s b/core/src/testFixtures/resources/fixtures/trigger-migration/1.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/trigger-migration/1.s rename to core/src/testFixtures/resources/fixtures/trigger-migration/1.s diff --git a/test-fixtures/src/main/resources/fixtures/trigger-migration/2.s b/core/src/testFixtures/resources/fixtures/trigger-migration/2.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/trigger-migration/2.s rename to core/src/testFixtures/resources/fixtures/trigger-migration/2.s diff --git a/test-fixtures/src/main/resources/fixtures/trigger-migration/3.s b/core/src/testFixtures/resources/fixtures/trigger-migration/3.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/trigger-migration/3.s rename to core/src/testFixtures/resources/fixtures/trigger-migration/3.s diff --git a/test-fixtures/src/main/resources/fixtures/trigger-migration/master.s b/core/src/testFixtures/resources/fixtures/trigger-migration/master.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/trigger-migration/master.s rename to core/src/testFixtures/resources/fixtures/trigger-migration/master.s diff --git a/test-fixtures/src/main/resources/fixtures/trigger-new-in-expression/Test.s b/core/src/testFixtures/resources/fixtures/trigger-new-in-expression/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/trigger-new-in-expression/Test.s rename to core/src/testFixtures/resources/fixtures/trigger-new-in-expression/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/union/Test.s b/core/src/testFixtures/resources/fixtures/union/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/union/Test.s rename to core/src/testFixtures/resources/fixtures/union/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/update-inner-select/Test.s b/core/src/testFixtures/resources/fixtures/update-inner-select/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-inner-select/Test.s rename to core/src/testFixtures/resources/fixtures/update-inner-select/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/update-multiple-columns/Test.s b/core/src/testFixtures/resources/fixtures/update-multiple-columns/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-multiple-columns/Test.s rename to core/src/testFixtures/resources/fixtures/update-multiple-columns/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/update-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/update-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/update-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/update-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/update-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/update-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/update-view-with-trigger/Test.s b/core/src/testFixtures/resources/fixtures/update-view-with-trigger/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-view-with-trigger/Test.s rename to core/src/testFixtures/resources/fixtures/update-view-with-trigger/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/update-view-without-trigger/Test.s b/core/src/testFixtures/resources/fixtures/update-view-without-trigger/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-view-without-trigger/Test.s rename to core/src/testFixtures/resources/fixtures/update-view-without-trigger/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/update-with-columns-in-expression/Test.s b/core/src/testFixtures/resources/fixtures/update-with-columns-in-expression/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/update-with-columns-in-expression/Test.s rename to core/src/testFixtures/resources/fixtures/update-with-columns-in-expression/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/view-columns-validation-failures/Test.s b/core/src/testFixtures/resources/fixtures/view-columns-validation-failures/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/view-columns-validation-failures/Test.s rename to core/src/testFixtures/resources/fixtures/view-columns-validation-failures/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/view-columns-validation-failures/failure.txt b/core/src/testFixtures/resources/fixtures/view-columns-validation-failures/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/view-columns-validation-failures/failure.txt rename to core/src/testFixtures/resources/fixtures/view-columns-validation-failures/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/view-columns-validation/Test.s b/core/src/testFixtures/resources/fixtures/view-columns-validation/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/view-columns-validation/Test.s rename to core/src/testFixtures/resources/fixtures/view-columns-validation/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/well-formed-selects/Test.s b/core/src/testFixtures/resources/fixtures/well-formed-selects/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/well-formed-selects/Test.s rename to core/src/testFixtures/resources/fixtures/well-formed-selects/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/with-inner-recursive/Test.s b/core/src/testFixtures/resources/fixtures/with-inner-recursive/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/with-inner-recursive/Test.s rename to core/src/testFixtures/resources/fixtures/with-inner-recursive/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/with-recursive-alias/Test.s b/core/src/testFixtures/resources/fixtures/with-recursive-alias/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/with-recursive-alias/Test.s rename to core/src/testFixtures/resources/fixtures/with-recursive-alias/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/with-recursive/Test.s b/core/src/testFixtures/resources/fixtures/with-recursive/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/with-recursive/Test.s rename to core/src/testFixtures/resources/fixtures/with-recursive/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/with-recursive/failure.txt b/core/src/testFixtures/resources/fixtures/with-recursive/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/with-recursive/failure.txt rename to core/src/testFixtures/resources/fixtures/with-recursive/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/with-table-name-collision/Test.s b/core/src/testFixtures/resources/fixtures/with-table-name-collision/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/with-table-name-collision/Test.s rename to core/src/testFixtures/resources/fixtures/with-table-name-collision/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/with-table-name-collision/failure.txt b/core/src/testFixtures/resources/fixtures/with-table-name-collision/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/with-table-name-collision/failure.txt rename to core/src/testFixtures/resources/fixtures/with-table-name-collision/failure.txt diff --git a/test-fixtures/src/main/resources/fixtures/wrong-size-values/Test.s b/core/src/testFixtures/resources/fixtures/wrong-size-values/Test.s similarity index 100% rename from test-fixtures/src/main/resources/fixtures/wrong-size-values/Test.s rename to core/src/testFixtures/resources/fixtures/wrong-size-values/Test.s diff --git a/test-fixtures/src/main/resources/fixtures/wrong-size-values/failure.txt b/core/src/testFixtures/resources/fixtures/wrong-size-values/failure.txt similarity index 100% rename from test-fixtures/src/main/resources/fixtures/wrong-size-values/failure.txt rename to core/src/testFixtures/resources/fixtures/wrong-size-values/failure.txt diff --git a/settings.gradle b/settings.gradle index 4b906d35..43d808b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ pluginManagement { rootProject.name = "sql-psi" include ':core' -include ':test-fixtures' + include ':sample-core' include ':sample-headless' include ':sample-plugin' diff --git a/test-fixtures/build.gradle b/test-fixtures/build.gradle deleted file mode 100644 index 31a93c58..00000000 --- a/test-fixtures/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - alias(libs.plugins.kotlinJvm) -} - -apply from: "$rootDir/gradle/gradle-mvn-push.gradle" - -dependencies { - api project(":core") - api libs.junit - api libs.bundles.intelliJ -} diff --git a/test-fixtures/gradle.properties b/test-fixtures/gradle.properties deleted file mode 100644 index c1638fa4..00000000 --- a/test-fixtures/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -POM_ARTIFACT_ID=test-fixtures -POM_NAME=Test Fixtures -POM_DESCRIPTION=A fixture for testing extensions of SQL PSI. -POM_PACKAGING=jar