Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Add Kondo linter to make sure all tests are in a known module and fix violations (#66561)

Cam Saul569b976fc055
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index c094a45c41b..d490605c55d 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -67,6 +67,7 @@
:metabase/namespace-name {:level :warning}
:metabase/require-shape-checker {:level :warning}
:metabase/test-helpers-use-non-thread-safe-functions {:level :warning} ; more config in `.clj-kondo/config/test-helpers/config.edn`
+ :metabase/tests-must-live-in-known-modules {:level :warning}
:metabase/validate-defendpoint-route-uses-kebab-case {:level :warning}
:metabase/validate-defendpoint-query-params-use-kebab-case {:level :warning}
:metabase/validate-logging {:level :warning}
@@ -448,8 +449,8 @@
metabase.premium-features.settings/define-premium-feature clojure.core/def
metabase.pulse.dashboard-subscription-test/with-dashboard-sub-for-card clojure.core/let
metabase.pulse.send-test/with-pulse-for-card clojure.core/let
- metabase.query-processor-test.pipeline-queries-test/pmbql-query clojure.core/->
- metabase.query-processor-test.pipeline-queries-test/run-pmbql-query clojure.core/->
+ metabase.query-processor.pipeline-queries-test/pmbql-query clojure.core/->
+ metabase.query-processor.pipeline-queries-test/run-pmbql-query clojure.core/->
metabase.query-processor.error-type/deferror clojure.core/def
metabase.query-processor.middleware.cache.impl/with-reducible-deserialized-results clojure.core/let
metabase.query-processor.middleware.process-userland-query-test/with-query-execution! clojure.core/let
@@ -539,7 +540,7 @@
metabase.dashboards-rest.api-test/with-simple-dashboard-with-tabs hooks.common/with-one-binding
metabase.dashboards.models.dashboard-tab-test/with-dashtab-in-personal-collection hooks.common/with-one-top-level-binding
metabase.dashboards.models.dashboard-test/with-dash-in-collection! hooks.common/with-three-bindings
- metabase.driver.bigquery-cloud-sdk-test/calculate-bird-scarcity hooks.metabase.query-processor-test.expressions-test/calculate-bird-scarcity
+ metabase.driver.bigquery-cloud-sdk-test/calculate-bird-scarcity hooks.metabase.query-processor.expressions-test/calculate-bird-scarcity
metabase.driver.mongo-test/with-describe-table-for-sample hooks.metabase.driver.mongo-test/with-describe-table-for-sample
metabase.driver.oracle-test/with-temp-user hooks.common/let-one-with-optional-value
metabase.driver/register! hooks.metabase.driver/register!
@@ -579,8 +580,8 @@
metabase.queries.api.card-test/with-card-param-values-fixtures hooks.common/let-one-with-optional-value
metabase.queries.api.card-test/with-temp-native-card hooks.common/with-two-bindings
metabase.queries.api.card-test/with-temp-native-card-with-params hooks.common/with-two-bindings
- metabase.query-processor-test.expressions-test/calculate-bird-scarcity hooks.metabase.query-processor-test.expressions-test/calculate-bird-scarcity
- metabase.query-processor-test.filter-test/count-with-filter-clause hooks.metabase.test.data/$ids
+ metabase.query-processor.expressions-test/calculate-bird-scarcity hooks.metabase.query-processor.expressions-test/calculate-bird-scarcity
+ metabase.query-processor.filter-test/count-with-filter-clause hooks.metabase.test.data/$ids
metabase.query-processor.middleware.cache-test/with-mock-cache! hooks.common/with-two-bindings
metabase.request.core/with-current-request hooks.common/with-used-first-arg
metabase.request.core/with-current-user hooks.common/with-used-first-arg
diff --git a/.clj-kondo/src/hooks/clojure/test.clj b/.clj-kondo/src/hooks/clojure/test.clj
index 5a903b64665..00e79592df2 100644
--- a/.clj-kondo/src/hooks/clojure/test.clj
+++ b/.clj-kondo/src/hooks/clojure/test.clj
@@ -2,7 +2,8 @@
(:require
[clj-kondo.hooks-api :as hooks]
[clojure.string :as str]
- [hooks.common]))
+ [hooks.common]
+ [hooks.common.modules :as modules]))
(defn- warn-about-disallowed-parallel-forms [form config]
(letfn [(error! [form message]
@@ -102,7 +103,39 @@
(:children node))))]
(walk node)))
-(defn deftest [{:keys [node cljc lang config]}]
+(defn- test-namespace-lives-outside-of-module-system? [ns-symb]
+ (some (fn [prefix]
+ (str/starts-with? (name ns-symb) prefix))
+ ["build-drivers."
+ "build."
+ "i18n." ; bin/i18n
+ "lint-migrations-file-test"
+ "main-test" ; bin/release-list
+ "metabase.deps-edn-test"
+ "metabase.driver."
+ "metabase.test."
+ "metabase.test.data."
+ "metabuild-common."])) ; utils for build scripts
+
+(let [warned-namespaces (atom #{})]
+ (defn deftest-check-in-valid-module
+ "Check whether a `deftest` lives in a known module -- important so our system to only run a subset of tests based on
+ which modules have changes picks them up correctly. (DEV-1125)"
+ [{:keys [node], ns-symb :ns, :as input}]
+ (when (and ns-symb
+ (not (test-namespace-lives-outside-of-module-system? ns-symb))
+ ;; only warn once per namespace
+ (not (contains? @warned-namespaces ns-symb)))
+ (swap! warned-namespaces conj ns-symb)
+ (let [known-modules (set (keys (:metabase/modules (modules/config input))))
+ current-module (modules/module ns-symb)]
+ (when (or (not current-module)
+ (not (contains? known-modules current-module)))
+ (hooks/reg-finding! (assoc (meta node)
+ :message (format "All tests must live in a known module; %s is not a known module" (pr-str current-module))
+ :type :metabase/tests-must-live-in-known-modules)))))))
+
+(defn deftest [{:keys [node cljc lang config], :as input}]
;; run [[deftest-check-parallel]] only once... if this is a `.cljc` file only run it for the `:clj` analysis, no point
;; in running it twice.
(when (or (not cljc)
@@ -110,7 +143,8 @@
(deftest-check-parallel node (get-in config [:linters :metabase/validate-deftest])))
(deftest-check-not-horrifically-long node (get-in config [:linters :metabase/i-like-making-cams-eyes-bleed-with-horrifically-long-tests]))
(deftest-check-no-driver-keywords node (get-in config [:linters :metabase/disallow-hardcoded-driver-names-in-tests]))
- {:node node})
+ (deftest-check-in-valid-module input)
+ input)
;;; this is a hacky way to determine whether these namespaces are required in the `ns` form or not... basically `:ns`
;;; will come back as `nil` if they are not.
diff --git a/.clj-kondo/src/hooks/common/modules.clj b/.clj-kondo/src/hooks/common/modules.clj
index a7ac6480429..3d90e5ad832 100644
--- a/.clj-kondo/src/hooks/common/modules.clj
+++ b/.clj-kondo/src/hooks/common/modules.clj
@@ -1,4 +1,6 @@
-(ns hooks.common.modules)
+(ns hooks.common.modules
+ (:require
+ [clojure.string :as str]))
(defn ignored-namespace? [config ns-symb]
(some
@@ -17,12 +19,17 @@
(module 'metabase-enterprise.whatever.core) => enterprise/whatever"
[ns-symb]
{:pre [(simple-symbol? ns-symb)]}
- (or (some->> (re-find #"^metabase-enterprise\.([^.]+)" (str ns-symb))
- second
- (symbol "enterprise"))
- (some-> (re-find #"^metabase\.([^.]+)" (str ns-symb))
- second
- symbol)))
+ ;; treat something like `metabase.driver-test` (for a module that hasn't fully been updated to use `.core`
+ ;; namespaces) as being in the `driver` module
+ (let [ns-symb (if (str/ends-with? (name ns-symb) "-test")
+ (symbol (str/replace (name ns-symb) #"-test$" ""))
+ ns-symb)]
+ (or (some->> (re-find #"^metabase-enterprise\.([^.]+)" (str ns-symb))
+ second
+ (symbol "enterprise"))
+ (some-> (re-find #"^metabase\.([^.]+)" (str ns-symb))
+ second
+ symbol))))
(defn module-api-namespaces
"Set of API namespace symbols for a given module. `:any` means you can use anything, there are no API namespaces for
diff --git a/.clj-kondo/src/hooks/metabase/query_processor_test/expressions_test.clj b/.clj-kondo/src/hooks/metabase/query_processor/expressions_test.clj
similarity index 91%
rename from .clj-kondo/src/hooks/metabase/query_processor_test/expressions_test.clj
rename to .clj-kondo/src/hooks/metabase/query_processor/expressions_test.clj
index 96045667453..e5eb8923c9a 100644
--- a/.clj-kondo/src/hooks/metabase/query_processor_test/expressions_test.clj
+++ b/.clj-kondo/src/hooks/metabase/query_processor/expressions_test.clj
@@ -1,4 +1,4 @@
-(ns hooks.metabase.query-processor-test.expressions-test
+(ns hooks.metabase.query-processor.expressions-test
(:require
[clj-kondo.hooks-api :as hooks]
[hooks.metabase.test.data :as data]))
diff --git a/.cljfmt.edn b/.cljfmt.edn
index 51a6f37e217..c336dcf3d5f 100644
--- a/.cljfmt.edn
+++ b/.cljfmt.edn
@@ -178,16 +178,18 @@
metabase.queries.api.card-test/with-ordered-items [[:inner 0]]
metabase.queries.api.card-test/with-temp-native-card [[:block 1]]
metabase.queries.api.card-test/with-temp-native-card-with-params [[:block 1]]
- metabase.query-processor-test.pipeline-queries-test/pmbql-query [[:block 1]]
- metabase.query-processor-test.pipeline-queries-test/run-pmbql-query [[:block 1]]
metabase.query-processor.debug/debug> [[:block 0]]
metabase.query-processor.error-type/deferror [[:block 1]]
metabase.query-processor.middleware.cache-backend.interface/with-cached-results [[:block 4]]
metabase.query-processor.middleware.process-userland-query-test/with-query-execution [[:block 1]]
+ metabase.query-processor.pipeline-queries-test/pmbql-query [[:block 1]]
+ metabase.query-processor.pipeline-queries-test/run-pmbql-query [[:block 1]]
metabase.query-processor.store/cached [[:block 1]]
metabase.query-processor.store/with-metadata-provider [[:inner 0]]
metabase.query-processor.streaming/streaming-response [[:block 1]]
metabase.query-processor.test-util/format-rows-by [[:default]]
+ metabase.query-processor.timeseries-test.util/test-timeseries-drivers [[:block 0]]
+ metabase.query-processor.timeseries-test/run-mbql-query [[:inner 0]]
metabase.request.core/as-admin [[:block 0]]
metabase.request.core/with-current-request [[:inner 0]]
metabase.request.core/with-current-user [[:inner 0]]
@@ -275,12 +277,9 @@
metabase.test/with-temp-vals-in-db [[:block 3]]
metabase.test/with-test-user [[:inner 0]]
metabase.test/with-user-in-groups [[:inner 0]]
- metabase.timeseries-query-processor-test.util/test-timeseries-drivers [[:block 0]]
- metabase.timeseries-query-processor-test/run-mbql-query [[:inner 0]]
metabase.upload.impl-test/with-upload-table! [[:inner 0]]
metabase.upload.types/with-currency [[:default]]
metabase.upload.types/with-parens [[:default]]
- metabase.util/for-map [[:block 1]]
metabase.util.async/cancelable-thread [[:block 0]]
metabase.util.date-2/with-time-zone-same-instant [[:default]]
metabase.util.encryption-test/with-secret-key [[:block 1]]
@@ -301,6 +300,7 @@
metabase.util.queue-test/await-test-while [[:block 1]]
metabase.util/auto-retry [[:block 1]]
metabase.util/case-enum [[:block 1]]
+ metabase.util/for-map [[:block 1]]
metabase.util/ignore-exceptions [[:block 0]]
metabase.util/or-with [[:block 1]]
metabase.util/profile [[:block 1]]
diff --git a/.github/workflows/generative-query-test.yml b/.github/workflows/generative-query-test.yml
index f2ac83b208d..f41deda9ff2 100644
--- a/.github/workflows/generative-query-test.yml
+++ b/.github/workflows/generative-query-test.yml
@@ -16,7 +16,7 @@ on:
description: 'Seconds (Number of seconds after which next iteration will not start)'
test:
description: 'Test or namespace to run'
- default: metabase.query-processor-test.generative-test/execution-with-cards-test
+ default: metabase.query-processor.generative-test/execution-with-cards-test
ref:
description: 'Ref to run generative tests on'
default: qgen-ms2
diff --git a/deps.edn b/deps.edn
index 340e49f89cc..197e99e4925 100644
--- a/deps.edn
+++ b/deps.edn
@@ -879,7 +879,6 @@
;; clj -X:dev:ee:ee-dev:test:test/qp
:test/qp
{:exec-args {:only ["test/metabase/query_processor"
- "test/metabase/query_processor_test"
metabase.driver.sql.query-processor-test
metabase-enterprise.advanced-permissions.models.permissions.block-permissions-test
metabase-enterprise.advanced-permissions.query-processor.middleware.permissions-test
@@ -906,7 +905,6 @@
"test/metabase/lib_be"
"test/metabase/legacy_mbql"
"test/metabase/query_processor"
- "test/metabase/query_processor_test"
metabase.driver.sql.query-processor-test
metabase-enterprise.advanced-permissions.models.permissions.block-permissions-test
metabase-enterprise.advanced-permissions.query-processor.middleware.permissions-test
diff --git a/docs/developers-guide/driver-changelog.md b/docs/developers-guide/driver-changelog.md
index bd866e413c5..54976a09ef1 100644
--- a/docs/developers-guide/driver-changelog.md
+++ b/docs/developers-guide/driver-changelog.md
@@ -10,6 +10,9 @@ title: Driver interface changelog
- Added `metabase.driver/compile-insert` to implement incremental transforms.
+- All tests in `metabase.query-processor-test.*` namespaces have been moved to `metabase.query-processor.*` (This is
+ only relevant if you run individual test namespaces as part of your development workflow).
+
## Metabase 0.57.0
- `driver/field-reference-mlv2` is now deprecated, and is no longer used. Please remove your implementations.
diff --git a/enterprise/backend/test/metabase_enterprise/notification/payload/core_test.clj b/enterprise/backend/test/metabase/notification/payload/core_test.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/notification/payload/core_test.clj
rename to enterprise/backend/test/metabase/notification/payload/core_test.clj
index b9f60b00f7f..b6988a41cda 100644
--- a/enterprise/backend/test/metabase_enterprise/notification/payload/core_test.clj
+++ b/enterprise/backend/test/metabase/notification/payload/core_test.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.notification.payload.core-test
+(ns metabase.notification.payload.core-test
(:require
[clojure.test :refer :all]
[metabase.notification.payload.core :as notification.payload]
[metabase.test :as mt]))
-(deftest default-context-test
+(deftest whitelabel-default-context-test
(testing "you shouldn't delete or rename these fields without 100% sure that it's not referenced
in any channel_template.details or notification_recipient.details"
(mt/with-additional-premium-features #{:whitelabel}
diff --git a/enterprise/backend/test/metabase_enterprise/notification/payload/execute_test.clj b/enterprise/backend/test/metabase/notification/payload/execute_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/notification/payload/execute_test.clj
rename to enterprise/backend/test/metabase/notification/payload/execute_test.clj
index ba8159f76d6..2a904bc2927 100644
--- a/enterprise/backend/test/metabase_enterprise/notification/payload/execute_test.clj
+++ b/enterprise/backend/test/metabase/notification/payload/execute_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.notification.payload.execute-test
+(ns metabase.notification.payload.execute-test
(:require
[clojure.test :refer :all]
[metabase.notification.payload.execute :as notification.payload.execute]
diff --git a/enterprise/backend/test/metabase_enterprise/content_management/api/collection_test.clj b/enterprise/backend/test/metabase_enterprise/content_verification/api/collection_test.clj
similarity index 99%
rename from enterprise/backend/test/metabase_enterprise/content_management/api/collection_test.clj
rename to enterprise/backend/test/metabase_enterprise/content_verification/api/collection_test.clj
index 9c7067e8aaf..983802acdc8 100644
--- a/enterprise/backend/test/metabase_enterprise/content_management/api/collection_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/content_verification/api/collection_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.content-management.api.collection-test
+(ns metabase-enterprise.content-verification.api.collection-test
(:require
[clojure.test :refer :all]
[metabase.test :as mt]
diff --git a/enterprise/backend/test/metabase_enterprise/content_verification/api/review_test.clj b/enterprise/backend/test/metabase_enterprise/content_verification/api/moderation_review_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/content_verification/api/review_test.clj
rename to enterprise/backend/test/metabase_enterprise/content_verification/api/moderation_review_test.clj
index c82f0dcee06..a63708b847b 100644
--- a/enterprise/backend/test/metabase_enterprise/content_verification/api/review_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/content_verification/api/moderation_review_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.content-verification.api.review-test
+(ns metabase-enterprise.content-verification.api.moderation-review-test
(:require
[clojure.test :refer :all]
[metabase.content-verification.models.moderation-review :as moderation-review]
diff --git a/enterprise/backend/test/metabase_enterprise/public_settings_test.clj b/enterprise/backend/test/metabase_enterprise/public_settings_test.clj
deleted file mode 100644
index a3dafc426c7..00000000000
--- a/enterprise/backend/test/metabase_enterprise/public_settings_test.clj
+++ /dev/null
@@ -1,51 +0,0 @@
-(ns metabase-enterprise.public-settings-test
- (:require
- [clojure.test :refer :all]
- [metabase.embedding.settings :as embed.settings]
- [metabase.session.core :as session]
- [metabase.test :as mt]
- [metabase.test.fixtures :as fixtures]
- [metabase.test.util :as tu]))
-
-(use-fixtures :once (fixtures/initialize :db))
-
-(deftest can-turn-off-password-login-with-jwt-enabled
- (mt/with-premium-features #{:sso-jwt}
- (tu/with-temporary-setting-values [jwt-enabled true
- jwt-identity-provider-uri "example.com"
- jwt-shared-secret "0123456789012345678901234567890123456789012345678901234567890123"
- enable-password-login true]
- (testing "can't change enable-password-login setting if disabled-password-login feature is disabled"
- (is (thrown-with-msg?
- clojure.lang.ExceptionInfo
- #"Setting enable-password-login is not enabled because feature :disable-password-login is not available"
- (session/enable-password-login! false))))
-
- (testing "can change enable-password-login setting if jwt enabled and have disabled-password-login feature"
- (mt/with-additional-premium-features #{:disable-password-login}
- (session/enable-password-login! false)
- (is (= false
- (session/enable-password-login))))))))
-
-(deftest toggle-full-app-embedding-test
- (mt/discard-setting-changes [embedding-app-origins-interactive]
- (testing "can't change embedding-app-origins-interactive if :embedding feature is not available"
- (mt/with-premium-features #{}
- (is (thrown-with-msg?
- clojure.lang.ExceptionInfo
- #"Setting embedding-app-origins-interactive is not enabled because feature :embedding is not available"
- (embed.settings/embedding-app-origins-interactive! "https://metabase.com")))
-
- (testing "even if env is set, return the default value"
- (mt/with-temp-env-var-value! [mb-embedding-app-origins-interactive "https://metabase.com"]
- (is (nil? (embed.settings/embedding-app-origins-interactive)))))))
-
- (testing "can change embedding-app-origins-interactive if :embedding is enabled"
- (mt/with-premium-features #{:embedding}
- (embed.settings/embedding-app-origins-interactive! "https://metabase.com")
- (is (= "https://metabase.com"
- (embed.settings/embedding-app-origins-interactive)))
- (testing "it works with env too"
- (mt/with-temp-env-var-value! [mb-embedding-app-origins-interactive "ssh://metabase.com"]
- (is (= "ssh://metabase.com"
- (embed.settings/embedding-app-origins-interactive)))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/upload_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/upload_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/upload_test.clj
rename to enterprise/backend/test/metabase_enterprise/sandbox/upload_test.clj
index 775790bb0c2..dc0610ce818 100644
--- a/enterprise/backend/test/metabase_enterprise/upload_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sandbox/upload_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests ^:once metabase-enterprise.upload-test
+(ns ^:mb/driver-tests ^:once metabase-enterprise.sandbox.upload-test
(:require
[clojure.test :refer :all]
[metabase-enterprise.test :as met]
diff --git a/enterprise/backend/test/metabase_enterprise/models/entity_id_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/models/entity_id_test.clj
rename to enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj
index 2f19d99cf9c..b055e6716fe 100644
--- a/enterprise/backend/test/metabase_enterprise/models/entity_id_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.models.entity-id-test
+(ns metabase-enterprise.serialization.models.entity-id-test
"To support serialization, all exported entities should have either an external name (eg. a database path) or a
generated NanoID in a column called entity_id. There's a property :entity_id to automatically populate that field.
diff --git a/enterprise/backend/test/metabase_enterprise/sso/settings_test.clj b/enterprise/backend/test/metabase_enterprise/sso/settings_test.clj
index e9680fb7361..32a869eb5ab 100644
--- a/enterprise/backend/test/metabase_enterprise/sso/settings_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sso/settings_test.clj
@@ -2,9 +2,13 @@
(:require
[clojure.test :refer :all]
[metabase-enterprise.sso.settings :as sso-settings]
+ [metabase.session.core :as session]
[metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
[metabase.test.util :as tu]))
+(use-fixtures :once (fixtures/initialize :db))
+
(def ^:private default-idp-uri "http://test.idp.metabase.com")
(def ^:private default-idp-cert (slurp "test_resources/sso/auth0-public-idp.cert"))
@@ -201,3 +205,20 @@
clojure.lang.ExceptionInfo
#"Setting jwt-enabled is not enabled because feature :sso-jwt is not available"
(sso-settings/jwt-enabled! true))))))
+
+(deftest can-turn-off-password-login-with-jwt-enabled
+ (mt/with-premium-features #{:sso-jwt}
+ (tu/with-temporary-setting-values [jwt-enabled true
+ jwt-identity-provider-uri "example.com"
+ jwt-shared-secret "0123456789012345678901234567890123456789012345678901234567890123"
+ enable-password-login true]
+ (testing "can't change enable-password-login setting if disabled-password-login feature is disabled"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"Setting enable-password-login is not enabled because feature :disable-password-login is not available"
+ (session/enable-password-login! false))))
+ (testing "can change enable-password-login setting if jwt enabled and have disabled-password-login feature"
+ (mt/with-additional-premium-features #{:disable-password-login}
+ (session/enable-password-login! false)
+ (is (= false
+ (session/enable-password-login))))))))
diff --git a/modules/drivers/athena/test/metabase/driver/athena_test.clj b/modules/drivers/athena/test/metabase/driver/athena_test.clj
index e3cc889d430..1c981de39be 100644
--- a/modules/drivers/athena/test/metabase/driver/athena_test.clj
+++ b/modules/drivers/athena/test/metabase/driver/athena_test.clj
@@ -12,7 +12,7 @@
[metabase.lib.test-util :as lib.tu]
[metabase.premium-features.core :as premium-features]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.date-time-zone-functions-test :as qp-test.date-time-zone-functions-test]
+ [metabase.query-processor.date-time-zone-functions-test :as qp-test.date-time-zone-functions-test]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.sync.core :as sync]
[metabase.test :as mt]
@@ -333,7 +333,7 @@
:native
(update :query #(str/split-lines (driver/prettify-native-form :athena %)))))))))))
-;;; Athena version of [[metabase.query-processor-test.date-time-zone-functions-test/datetime-diff-mixed-types-test]]
+;;; Athena version of [[metabase.query-processor.date-time-zone-functions-test/datetime-diff-mixed-types-test]]
(deftest datetime-diff-mixed-types-test
(mt/test-driver :athena
(testing "datetime-diff can compare `date`, `timestamp`, and `timestamp with time zone` args with Athena"
@@ -359,7 +359,7 @@
(mt/formatted-rows [int int])
first))))))))
-;;; Athena version of [[metabase.query-processor-test.date-time-zone-functions-test/datetime-diff-time-zones-test]]
+;;; Athena version of [[metabase.query-processor.date-time-zone-functions-test/datetime-diff-time-zones-test]]
(mt/defdataset diff-time-zones-athena-cases
;; This dataset contains the same set of values as [[diff-time-zones-cases]], but without the time zones.
;; It is needed to test `datetime-diff` with Athena, since Athena supports `timestamp with time zone`
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
index 69217c4ba8b..b5609192057 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
@@ -117,7 +117,7 @@
;; TODO Temporarily disabling due to flakiness (#33140)
#_(is (= 4 @pages-retrieved))))))))
-;; These look like the macros from metabase.query-processor-test.expressions-test
+;; These look like the macros from metabase.query-processor.expressions-test
;; but conform to bigquery naming rules
(defn- calculate-bird-scarcity* [formula filter-clause]
(mt/formatted-rows
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj
index 6dae0e235a8..67d5e0e4733 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj
@@ -397,8 +397,8 @@
;;
;; It would even be better if we could use countIf and sumIf directly
;;
-;; metabase.query-processor-test.count-where-test
-;; metabase.query-processor-test.share-test
+;; metabase.query-processor.count-where-test
+;; metabase.query-processor.share-test
(defmethod sql.qp/->honeysql [:clickhouse :count-where]
[driver [_ pred]]
[:case
diff --git a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
index 720f46c71c4..abafd001b84 100644
--- a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
+++ b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
@@ -13,7 +13,7 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.sql.util :as sql.u]
[metabase.lib.schema.common :as lib.schema.common]
- [metabase.query-processor-test.alternative-date-test :as qp.alternative-date-test]
+ [metabase.query-processor.alternative-date-test :as qp.alternative-date-test]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
@@ -33,7 +33,7 @@
(defmethod driver/database-supports? [:clickhouse :metabase.driver.sql-jdbc.sync.describe-table-test/describe-materialized-view-fields]
[_driver _feature _db] false)
-(defmethod driver/database-supports? [:clickhouse :metabase.query-processor-test.parameters-test/get-parameter-count]
+(defmethod driver/database-supports? [:clickhouse :metabase.query-processor.parameters-test/get-parameter-count]
[_driver _feature _db] false)
(defmethod qp.alternative-date-test/iso-8601-text-fields-expected-rows :clickhouse
diff --git a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc/query_processor_test.clj b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc/query_processor_test.clj
index fc0ac53b95a..6e82f008a03 100644
--- a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc/query_processor_test.clj
+++ b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc/query_processor_test.clj
@@ -1,8 +1,8 @@
(ns ^:mb/driver-tests metabase.driver.druid-jdbc.query-processor-test
(:require
[clojure.test :refer :all]
- [metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]))
+ [metabase.query-processor.timeseries-test.util :as tqpt]
+ [metabase.test :as mt]))
(deftest metrics-inside-aggregation-clauses-test
(mt/test-driver :druid-jdbc
diff --git a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
index 91662c2edf9..5c0115b852a 100644
--- a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
+++ b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
@@ -10,10 +10,10 @@
[metabase.driver.util :as driver.u]
[metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.sync.core :as sync]
[metabase.sync.sync-metadata.dbms-version :as sync-dbms-ver]
[metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[metabase.util :as u]
[metabase.util.malli.registry :as mr]
[toucan2.core :as t2]))
diff --git a/modules/drivers/druid/test/metabase/driver/druid/client_test.clj b/modules/drivers/druid/test/metabase/driver/druid/client_test.clj
index 46b72149cb2..91176bbd1ac 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/client_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/client_test.clj
@@ -6,8 +6,8 @@
[metabase.driver.settings :as driver.settings]
[metabase.driver.util :as driver.u]
[metabase.query-processor :as qp]
- [metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]))
+ [metabase.query-processor.timeseries-test.util :as tqpt]
+ [metabase.test :as mt]))
(set! *warn-on-reflection* true)
diff --git a/modules/drivers/druid/test/metabase/driver/druid/execute_test.clj b/modules/drivers/druid/test/metabase/driver/druid/execute_test.clj
index d0a517b7046..b722f735f6d 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/execute_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/execute_test.clj
@@ -3,8 +3,8 @@
[clojure.java.io :as io]
[clojure.test :refer :all]
[metabase.driver.druid.execute :as druid.execute]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[metabase.util :as u]
[metabase.util.json :as json]))
diff --git a/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj b/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
index 681162bd1f6..cb5fd8991ca 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
@@ -10,8 +10,8 @@
[metabase.driver.druid.query-processor :as druid.qp]
[metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[metabase.util.date-2 :as u.date]
[metabase.util.json :as json]
[toucan2.core :as t2]))
diff --git a/modules/drivers/druid/test/metabase/driver/druid/sync_test.clj b/modules/drivers/druid/test/metabase/driver/druid/sync_test.clj
index 03a850c4596..4ea74c3031f 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/sync_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/sync_test.clj
@@ -5,10 +5,10 @@
[metabase.driver :as driver]
[metabase.driver.druid.client :as druid.client]
[metabase.driver.druid.sync :as druid.sync]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.secrets.models.secret :as secret]
[metabase.sync.sync-metadata.dbms-version :as sync-dbms-ver]
[metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[metabase.util :as u]
[metabase.util.malli.registry :as mr]
[toucan2.core :as t2]))
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj
index 0cce0c1f636..f6b9a974d19 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj
@@ -10,9 +10,9 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.alternative-date-test :as qp.alternative-date-test]
- [metabase.query-processor-test.date-time-zone-functions-test :as qp.datetime-test]
+ [metabase.query-processor.alternative-date-test :as qp.alternative-date-test]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.date-time-zone-functions-test :as qp.datetime-test]
[metabase.query-processor.pivot :as qp.pivot]
[metabase.query-processor.timezone :as qp.timezone]
[metabase.test :as mt]
diff --git a/modules/drivers/oracle/test/metabase/driver/oracle_test.clj b/modules/drivers/oracle/test/metabase/driver/oracle_test.clj
index de735f608f8..a0f811f11f7 100644
--- a/modules/drivers/oracle/test/metabase/driver/oracle_test.clj
+++ b/modules/drivers/oracle/test/metabase/driver/oracle_test.clj
@@ -19,8 +19,8 @@
[metabase.lib.test-util :as lib.tu]
[metabase.premium-features.core :as premium-features]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.order-by-test :as qp-test.order-by-test]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.order-by-test :as qp-test.order-by-test]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.sync.core :as sync]
diff --git a/modules/drivers/starburst/test/metabase/driver/starburst_test.clj b/modules/drivers/starburst/test/metabase/driver/starburst_test.clj
index 1df15365eb7..693abc5dcae 100644
--- a/modules/drivers/starburst/test/metabase/driver/starburst_test.clj
+++ b/modules/drivers/starburst/test/metabase/driver/starburst_test.clj
@@ -11,8 +11,8 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.starburst :as starburst]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.timezones-test :as timezones-test]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.timezones-test :as timezones-test]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/modules/drivers/starburst/test/metabase/test/data/starburst.clj b/modules/drivers/starburst/test/metabase/test/data/starburst.clj
index 3e03a8b101e..29b719d1a0a 100644
--- a/modules/drivers/starburst/test/metabase/test/data/starburst.clj
+++ b/modules/drivers/starburst/test/metabase/test/data/starburst.clj
@@ -28,8 +28,8 @@
(defmethod driver/database-supports? [:starburst :test/timestamptz-type] [_ _ _] false)
(defmethod driver/database-supports? [:starburst :test/dynamic-dataset-loading] [_ _ _] true)
(defmethod driver/database-supports? [:starburst :test/creates-db-on-connect] [_ _ _] true)
-(defmethod driver/database-supports? [:starburst :metabase.query-processor-test.string-extracts-test/concat-non-string-args] [_ _ _] false)
-(defmethod driver/database-supports? [:starburst :metabase.query-processor-test.alternative-date-test/yyyymmddhhss-binary-timestamps] [_ _ _] false)
+(defmethod driver/database-supports? [:starburst :metabase.query-processor.string-extracts-test/concat-non-string-args] [_ _ _] false)
+(defmethod driver/database-supports? [:starburst :metabase.query-processor.alternative-date-test/yyyymmddhhss-binary-timestamps] [_ _ _] false)
(doseq [[base-type db-type] {:type/BigInteger "BIGINT"
:type/Boolean "BOOLEAN"
diff --git a/src/metabase/driver.clj b/src/metabase/driver.clj
index 0d94f5c74e5..d7c8020e88c 100644
--- a/src/metabase/driver.clj
+++ b/src/metabase/driver.clj
@@ -1045,7 +1045,7 @@
Much of the implementation for this method is shared across drivers and lives in the
`metabase.driver.common.parameters.*` namespaces. See the `:sql` and `:mongo` drivers for sample implementations of
this method.`Driver-agnostic end-to-end native parameter tests live in
- [[metabase.query-processor-test.parameters-test]] and other namespaces."
+ [[metabase.query-processor.parameters-test]] and other namespaces."
{:added "0.34.0" :arglists '([driver inner-native-query])}
dispatch-on-initialized-driver
:hierarchy #'hierarchy)
diff --git a/src/metabase/driver/sql/query_processor.clj b/src/metabase/driver/sql/query_processor.clj
index 5da66ba79b6..b7f3266bbdd 100644
--- a/src/metabase/driver/sql/query_processor.clj
+++ b/src/metabase/driver/sql/query_processor.clj
@@ -1788,7 +1788,7 @@
(defn- apply-joins-honey-sql-2
"Use Honey SQL 2's `:join-by` so the joins are in the same order they are specified in MBQL (#15342).
- See [[metabase.query-processor-test.explicit-joins-test/join-order-test]]."
+ See [[metabase.query-processor.explicit-joins-test/join-order-test]]."
[driver honeysql-form joins]
(letfn [(append-joins [join-by]
(into (vec join-by)
diff --git a/src/metabase/lib/aggregation.cljc b/src/metabase/lib/aggregation.cljc
index 13b50a3f57d..7997a9d5fca 100644
--- a/src/metabase/lib/aggregation.cljc
+++ b/src/metabase/lib/aggregation.cljc
@@ -265,7 +265,7 @@
[query stage-number [_tag _opts first-arg :as clause]]
(merge
;; flow the `:options` from the field we're aggregating. This is important, for some reason.
- ;; See [[metabase.query-processor-test.aggregation-test/field-settings-for-aggregate-fields-test]]
+ ;; See [[metabase.query-processor.aggregation-test/field-settings-for-aggregate-fields-test]]
(when first-arg
;; This might be an inner aggregation expression without an ident of its own, but that's fine since we're only
;; here for its type!
diff --git a/src/metabase/lib/field/resolution.cljc b/src/metabase/lib/field/resolution.cljc
index b7e6e98cf0f..76591273086 100644
--- a/src/metabase/lib/field/resolution.cljc
+++ b/src/metabase/lib/field/resolution.cljc
@@ -422,7 +422,7 @@
:fk-field-id source-field-id)))
;;; See for
-;;; example [[metabase.query-processor-test.field-ref-repro-test/model-with-implicit-join-and-external-remapping-test]],
+;;; example [[metabase.query-processor.field-ref-repro-test/model-with-implicit-join-and-external-remapping-test]],
;;; if we have a field ref to an implicit join but the implicit join in a previous stage but that column is not
;;; propagated to the stage we're resolving for the query almost certainly won't work, but we can at least return
;;; somewhat more helpful metadata than the base fallback metadata that would give you a confusing error message.
diff --git a/src/metabase/lib/join.cljc b/src/metabase/lib/join.cljc
index 777b24accb3..48736a3ecdf 100644
--- a/src/metabase/lib/join.cljc
+++ b/src/metabase/lib/join.cljc
@@ -357,7 +357,7 @@
;; ignore `:source-field` in field refs... join `:fields` probably shouldn't be adding
;; implicitly joined columns anyway (this is not something you can do in the UI at any rate).
;; It might possibly be getting incorrectly propagated somewhere,
- ;; see [[metabase.query-processor-test.remapping-test/explicit-join-with-fields-and-implicitly-joined-remaps-test]]
+ ;; see [[metabase.query-processor.remapping-test/explicit-join-with-fields-and-implicitly-joined-remaps-test]]
;; for an example of where this happens. Having it here will cause `lib.equality` to fail to
;; find a match.
;;
diff --git a/src/metabase/lib/metadata/result_metadata.cljc b/src/metabase/lib/metadata/result_metadata.cljc
index ecab13bec4d..6152e35bdcd 100644
--- a/src/metabase/lib/metadata/result_metadata.cljc
+++ b/src/metabase/lib/metadata/result_metadata.cljc
@@ -420,7 +420,7 @@
(merge
;; TODO -- we also need to 'flow' the unit from previous stage(s) "so the frontend can use the correct
;; formatting to display values of the column" according
- ;; to [[metabase.query-processor-test.nested-queries-test/breakout-year-test]]
+ ;; to [[metabase.query-processor.nested-queries-test/breakout-year-test]]
(when-let [temporal-unit ((some-fn :metabase.lib.field/temporal-unit :inherited-temporal-unit) col)]
{:unit temporal-unit})
col))
diff --git a/src/metabase/query_processor/middleware/add_remaps.clj b/src/metabase/query_processor/middleware/add_remaps.clj
index 35c959f2962..53d894152c5 100644
--- a/src/metabase/query_processor/middleware/add_remaps.clj
+++ b/src/metabase/query_processor/middleware/add_remaps.clj
@@ -301,7 +301,7 @@
(contains? original-join-field-ids (get-in remap-info path)))
[[:dimension :field-id]
;; (not sure this is really something we want to support,
- ;; but [[metabase.query-processor-test.remapping-test/remapped-columns-in-joined-source-queries-test]]
+ ;; but [[metabase.query-processor.remapping-test/remapped-columns-in-joined-source-queries-test]]
;; alleges that you can include just the remapped column in
;; join `:fields` and it's supposed to work)
[:dimension :human-readable-field-id]]))
diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.clj
index d6fa0a094fe..6a16ab7d4d4 100644
--- a/test/metabase/driver/mysql_test.clj
+++ b/test/metabase/driver/mysql_test.clj
@@ -23,9 +23,9 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.string-extracts-test :as string-extracts-test]
[metabase.query-processor.compile :as qp.compile]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.string-extracts-test :as string-extracts-test]
[metabase.sync.analyze.fingerprint :as sync.fingerprint]
[metabase.sync.core :as sync]
[metabase.sync.sync-metadata.tables :as sync-tables]
@@ -89,7 +89,7 @@
(deftest date-test
;; make sure stuff at least compiles. Even if the result probably isn't as concise as it could be.
- ;; See [[metabase.query-processor-test.date-time-zone-functions-test/extract-week-tests]] for something that tests
+ ;; See [[metabase.query-processor.date-time-zone-functions-test/extract-week-tests]] for something that tests
;; that this actually returns correct results.
(testing :week-of-year-instance
(doseq [[start-of-week expected] {:sunday
diff --git a/test/metabase/driver/sql/query_processor_test.clj b/test/metabase/driver/sql/query_processor_test.clj
index 05b67c5580e..b1c15b16fed 100644
--- a/test/metabase/driver/sql/query_processor_test.clj
+++ b/test/metabase/driver/sql/query_processor_test.clj
@@ -1526,7 +1526,7 @@
(-> (qp.compile/compile query)
(update :query #(str/split-lines (driver/prettify-native-form :h2 %))))))))))
-;;; see also [[metabase.query-processor-test.order-by-test/order-by-aggregate-fields-test-6]]
+;;; see also [[metabase.query-processor.order-by-test/order-by-aggregate-fields-test-6]]
(deftest ^:parallel order-by-aggregation-reference-test
(testing "Should order by aggregation references correctly (#62885)"
(let [mp meta/metadata-provider
diff --git a/test/metabase/driver/sql_jdbc/sync/describe_table_test.clj b/test/metabase/driver/sql_jdbc/sync/describe_table_test.clj
index 4adf22c6eb7..a9d533174aa 100644
--- a/test/metabase/driver/sql_jdbc/sync/describe_table_test.clj
+++ b/test/metabase/driver/sql_jdbc/sync/describe_table_test.clj
@@ -16,12 +16,12 @@
[metabase.driver.sql-jdbc.sync.describe-table :as sql-jdbc.describe-table]
[metabase.driver.sql-jdbc.sync.interface :as sql-jdbc.sync.interface]
[metabase.driver.util :as driver.u]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.test.data.one-off-dbs :as one-off-dbs]
[metabase.test.data.sql :as sql.tx]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[metabase.util :as u]
[metabase.util.json :as json]
[metabase.util.log :as log]
diff --git a/test/metabase/embedding/settings_test.clj b/test/metabase/embedding/settings_test.clj
index 60de2815c8a..c8a3baeb84e 100644
--- a/test/metabase/embedding/settings_test.clj
+++ b/test/metabase/embedding/settings_test.clj
@@ -246,3 +246,27 @@
(testing "localhost mixed with other origins should work"
(embed.settings/embedding-app-origins-sdk! "https://example.com localhost:3000")
(is (= "https://example.com" (embed.settings/embedding-app-origins-sdk))))))))
+
+(deftest toggle-full-app-embedding-test
+ (mt/discard-setting-changes [embedding-app-origins-interactive]
+ (testing "can't change embedding-app-origins-interactive if :embedding feature is not available"
+ (mt/with-premium-features #{}
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"Setting embedding-app-origins-interactive is not enabled because feature :embedding is not available"
+ (embed.settings/embedding-app-origins-interactive! "https://metabase.com")))
+ (testing "even if env is set, return the default value"
+ (mt/with-temp-env-var-value! [mb-embedding-app-origins-interactive "https://metabase.com"]
+ (is (nil? (embed.settings/embedding-app-origins-interactive)))))))))
+
+(deftest toggle-full-app-embedding-test-2
+ (mt/discard-setting-changes [embedding-app-origins-interactive]
+ (testing "can change embedding-app-origins-interactive if :embedding is enabled"
+ (mt/with-premium-features #{:embedding}
+ (embed.settings/embedding-app-origins-interactive! "https://metabase.com")
+ (is (= "https://metabase.com"
+ (embed.settings/embedding-app-origins-interactive)))
+ (testing "it works with env too"
+ (mt/with-temp-env-var-value! [mb-embedding-app-origins-interactive "ssh://metabase.com"]
+ (is (= "ssh://metabase.com"
+ (embed.settings/embedding-app-origins-interactive)))))))))
diff --git a/test/metabase/lib/drill_thru/column_extract_test.cljc b/test/metabase/lib/drill_thru/column_extract_test.cljc
index fe5f6979c0c..a0a8b745e03 100644
--- a/test/metabase/lib/drill_thru/column_extract_test.cljc
+++ b/test/metabase/lib/drill_thru/column_extract_test.cljc
@@ -1,5 +1,5 @@
(ns metabase.lib.drill-thru.column-extract-test
- "See also [[metabase.query-processor-test.drill-thru-e2e-test/quick-filter-on-bucketed-date-test]]"
+ "See also [[metabase.query-processor.drill-thru-e2e-test/quick-filter-on-bucketed-date-test]]"
(:require
#?@(:cljs ([metabase.test-runner.assert-exprs.approximately-equal]))
[clojure.test :refer [deftest is testing]]
diff --git a/test/metabase/lib/drill_thru/distribution_test.cljc b/test/metabase/lib/drill_thru/distribution_test.cljc
index 22d318c61a4..72b66b01fd5 100644
--- a/test/metabase/lib/drill_thru/distribution_test.cljc
+++ b/test/metabase/lib/drill_thru/distribution_test.cljc
@@ -1,5 +1,5 @@
(ns metabase.lib.drill-thru.distribution-test
- "See also [[metabase.query-processor-test.drill-thru-e2e-test/distribution-drill-on-longitude-from-sql-source-card-test]]"
+ "See also [[metabase.query-processor.drill-thru-e2e-test/distribution-drill-on-longitude-from-sql-source-card-test]]"
(:require
#?@(:cljs ([metabase.test-runner.assert-exprs.approximately-equal]))
[clojure.test :refer [deftest is testing]]
diff --git a/test/metabase/lib/drill_thru/quick_filter_test.cljc b/test/metabase/lib/drill_thru/quick_filter_test.cljc
index 73f61f4f284..bf4c89955d6 100644
--- a/test/metabase/lib/drill_thru/quick_filter_test.cljc
+++ b/test/metabase/lib/drill_thru/quick_filter_test.cljc
@@ -1,5 +1,5 @@
(ns metabase.lib.drill-thru.quick-filter-test
- "See also [[metabase.query-processor-test.drill-thru-e2e-test/quick-filter-on-bucketed-date-test]]"
+ "See also [[metabase.query-processor.drill-thru-e2e-test/quick-filter-on-bucketed-date-test]]"
(:require
#?@(:cljs ([metabase.test-runner.assert-exprs.approximately-equal]))
[clojure.test :refer [deftest is testing]]
diff --git a/test/metabase/lib/field/resolution_test.cljc b/test/metabase/lib/field/resolution_test.cljc
index 11af689a02f..de5712cf52c 100644
--- a/test/metabase/lib/field/resolution_test.cljc
+++ b/test/metabase/lib/field/resolution_test.cljc
@@ -982,7 +982,7 @@
2
[:field {:base-type :type/Integer, :lib/uuid "00000000-0000-0000-0000-000000000000"} "max"]))))))))
-;;; adapted from [[metabase.query-processor-test.uuid-test/joined-uuid-query-test]]
+;;; adapted from [[metabase.query-processor.uuid-test/joined-uuid-query-test]]
(deftest ^:parallel resolve-field-missing-join-alias-test
(testing "should resolve broken refs missing join-alias correctly and return appropriate metadata"
(let [mp lib.tu.uuid-dogs-metadata-provider/metadata-provider
@@ -1355,7 +1355,7 @@
-1
[:field {:base-type :type/BigInteger, :lib/uuid "00000000-0000-0000-0000-000000000000"} "ID"]))))))
-;;; See also [[metabase.query-processor-test.field-ref-repro-test/model-with-implicit-join-and-external-remapping-test]]
+;;; See also [[metabase.query-processor.field-ref-repro-test/model-with-implicit-join-and-external-remapping-test]]
(deftest ^:parallel resolve-unreturned-column-from-reified-implicit-join-in-previous-stage-test
(let [query (lib/query
meta/metadata-provider
diff --git a/test/metabase/lib/field_test.cljc b/test/metabase/lib/field_test.cljc
index 18686ede12e..6d2c64a102d 100644
--- a/test/metabase/lib/field_test.cljc
+++ b/test/metabase/lib/field_test.cljc
@@ -1825,7 +1825,7 @@
(is (=? ["Created At: Year" "Count"]
(mapv :display-name (lib/returned-columns query))))))))
-;;; adapted from [[metabase.query-processor-test.model-test/model-self-join-test]]
+;;; adapted from [[metabase.query-processor.model-test/model-self-join-test]]
(deftest ^:parallel model-self-join-test-display-name-test
(binding [lib.metadata.calculation/*display-name-style* :long]
(let [mp meta/metadata-provider
@@ -1926,7 +1926,7 @@
(lib/aggregate (lib/count))
(lib.tu.notebook/add-breakout {:name "QB Binning"} {:display-name "People → Birth Date"} {}))))))
-;;; adapted from [[metabase.query-processor-test.remapping-test/remapped-columns-in-joined-source-queries-test]]
+;;; adapted from [[metabase.query-processor.remapping-test/remapped-columns-in-joined-source-queries-test]]
(deftest ^:parallel remapped-columns-in-joined-source-queries-display-names-test
(testing "Remapped columns in joined source queries should work (#15578)"
(let [mp (lib.tu/remap-metadata-provider meta/metadata-provider (meta/id :orders :product-id) (meta/id :products :title))
diff --git a/test/metabase/lib/metadata/result_metadata_test.cljc b/test/metabase/lib/metadata/result_metadata_test.cljc
index dc1b2914fe8..3620ef46435 100644
--- a/test/metabase/lib/metadata/result_metadata_test.cljc
+++ b/test/metabase/lib/metadata/result_metadata_test.cljc
@@ -726,7 +726,7 @@
:field-ref [:expression "prev_month"]}]
(column-info query {:cols [{}]})))))))
-;;; adapted from [[metabase.query-processor-test.nested-queries-test/breakout-year-test]]
+;;; adapted from [[metabase.query-processor.nested-queries-test/breakout-year-test]]
(deftest ^:parallel breakout-year-test
(testing (str "make sure when doing a nested query we give you metadata that would suggest you should be able to "
"break out a *YEAR*")
diff --git a/test/metabase/lib/stage_test.cljc b/test/metabase/lib/stage_test.cljc
index 4144de926fb..41f370c23be 100644
--- a/test/metabase/lib/stage_test.cljc
+++ b/test/metabase/lib/stage_test.cljc
@@ -753,7 +753,7 @@
"Price"]
(map :display-name (lib/returned-columns query))))))))))
-;;; adapted from [[metabase.query-processor-test.explicit-joins-test/join-against-saved-question-with-sort-test]]
+;;; adapted from [[metabase.query-processor.explicit-joins-test/join-against-saved-question-with-sort-test]]
(deftest ^:parallel join-against-same-table-returned-columns-test
(testing "Joining against a query that ultimately have the same source table SHOULD result in 'duplicate' columns being included."
(let [query (lib/query
diff --git a/test/metabase/lib/test_util/mocks_31769.cljc b/test/metabase/lib/test_util/mocks_31769.cljc
index 804919c1ee5..89b66da6ece 100644
--- a/test/metabase/lib/test_util/mocks_31769.cljc
+++ b/test/metabase/lib/test_util/mocks_31769.cljc
@@ -3,7 +3,7 @@
* [[metabase.lib.card-test/returned-columns-31769-test]]
* [[metabase.lib.join-test/join-source-card-with-in-previous-stage-with-joins-test]]
- * [[metabase.query-processor-test.explicit-joins-test/test-31769]]"
+ * [[metabase.query-processor.explicit-joins-test/test-31769]]"
(:require
[medley.core :as m]
[metabase.lib.core :as lib]
diff --git a/test/metabase/parameters/field_test.clj b/test/metabase/parameters/field_test.clj
index c26096be06d..d910f9f75c3 100644
--- a/test/metabase/parameters/field_test.clj
+++ b/test/metabase/parameters/field_test.clj
@@ -2,8 +2,8 @@
(:require
[clojure.test :refer :all]
[metabase.parameters.field :as parameters.field]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.test :as mt]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[toucan2.core :as t2]))
(deftest ^:parallel search-values-test
diff --git a/test/metabase/query_processor_test/advanced_math_test.clj b/test/metabase/query_processor/advanced_math_test.clj
similarity index 96%
rename from test/metabase/query_processor_test/advanced_math_test.clj
rename to test/metabase/query_processor/advanced_math_test.clj
index 1efeea5209a..b7df9c44807 100644
--- a/test/metabase/query_processor_test/advanced_math_test.clj
+++ b/test/metabase/query_processor/advanced_math_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.advanced-math-test
+(ns ^:mb/driver-tests metabase.query-processor.advanced-math-test
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
@@ -84,7 +84,7 @@
(mt/process-query query))))))))))
;;; there is a test for standard deviation itself
-;;; in [[metabase.query-processor-test.aggregation-test/standard-deviation-test]]
+;;; in [[metabase.query-processor.aggregation-test/standard-deviation-test]]
(deftest ^:parallel test-variance
(mt/test-drivers (mt/normal-drivers-with-feature :standard-deviation-aggregations)
diff --git a/test/metabase/query_processor_test/aggregation_test.clj b/test/metabase/query_processor/aggregation_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/aggregation_test.clj
rename to test/metabase/query_processor/aggregation_test.clj
index c1e52bb05c8..3b87121f470 100644
--- a/test/metabase/query_processor_test/aggregation_test.clj
+++ b/test/metabase/query_processor/aggregation_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.aggregation-test
+(ns ^:mb/driver-tests metabase.query-processor.aggregation-test
"Tests for MBQL aggregations."
(:require
[clojure.test :refer :all]
@@ -87,7 +87,7 @@
(mt/run-mbql-query venues
{:aggregation [[:stddev $latitude]]}))))))
-;;; other advanced aggregation types are tested in [[metabase.query-processor-test.advanced-math-test]]
+;;; other advanced aggregation types are tested in [[metabase.query-processor.advanced-math-test]]
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | MIN & MAX |
diff --git a/test/metabase/query_processor_test/alternative_date_test.clj b/test/metabase/query_processor/alternative_date_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/alternative_date_test.clj
rename to test/metabase/query_processor/alternative_date_test.clj
index 264aefa301f..b054e54498b 100644
--- a/test/metabase/query_processor_test/alternative_date_test.clj
+++ b/test/metabase/query_processor/alternative_date_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.alternative-date-test
+(ns ^:mb/driver-tests metabase.query-processor.alternative-date-test
"Tests for columns that mimic dates: integral types as UNIX timestamps and string columns as ISO8601DateTimeString and
related types."
(:require
diff --git a/test/metabase/query_processor_test/binning_test.clj b/test/metabase/query_processor/binning_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/binning_test.clj
rename to test/metabase/query_processor/binning_test.clj
index 28a80f24400..308467a5935 100644
--- a/test/metabase/query_processor_test/binning_test.clj
+++ b/test/metabase/query_processor/binning_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.binning-test
+(ns metabase.query-processor.binning-test
(:require
[clojure.test :refer [deftest is testing]]
[medley.core :as m]
diff --git a/test/metabase/query_processor_test/breakout_test.clj b/test/metabase/query_processor/breakout_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/breakout_test.clj
rename to test/metabase/query_processor/breakout_test.clj
index a39ed74aece..c9a2527d3e0 100644
--- a/test/metabase/query_processor_test/breakout_test.clj
+++ b/test/metabase/query_processor/breakout_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.breakout-test
+(ns ^:mb/driver-tests metabase.query-processor.breakout-test
"Tests for the `:breakout` clause."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/case_test.clj b/test/metabase/query_processor/case_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/case_test.clj
rename to test/metabase/query_processor/case_test.clj
index 18be1ecd451..ded62a27924 100644
--- a/test/metabase/query_processor_test/case_test.clj
+++ b/test/metabase/query_processor/case_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.case-test
+(ns ^:mb/driver-tests metabase.query-processor.case-test
(:require
[clojure.test :refer :all]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor_test/cast_test.clj b/test/metabase/query_processor/cast_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/cast_test.clj
rename to test/metabase/query_processor/cast_test.clj
index 96e3a3914b4..eb3b4f02349 100644
--- a/test/metabase/query_processor_test/cast_test.clj
+++ b/test/metabase/query_processor/cast_test.clj
@@ -1,11 +1,11 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.cast-test
+(ns ^:mb/driver-tests metabase.query-processor.cast-test
{:clj-kondo/config '{:linters
;; this is actually ok here since this is a drivers namespace
{:discouraged-namespace {metabase.query-processor.store {:level :off}}
;; there are several legacy usages of `field-is-type?` here, and I don't really want to add
;; clj-kondo/ignores to all of them... so this will take care of it. We do still want to remove
;; them soon.
- :deprecated-var {:exclude {metabase.types.core/field-is-type? {:namespaces ["metabase\\.query-processor-test\\.cast-test"]}}}
+ :deprecated-var {:exclude {metabase.types.core/field-is-type? {:namespaces ["metabase\\.query-processor\\.cast-test"]}}}
;; this is also ok here since this is a drivers namespace
:discouraged-var {metabase.lib.core/->legacy-MBQL {:level :off}}}}}
(:require
@@ -17,7 +17,7 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.alternative-date-test :as adt]
+ [metabase.query-processor.alternative-date-test :as adt]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
diff --git a/test/metabase/query_processor_test/coercion_test.clj b/test/metabase/query_processor/coercion_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/coercion_test.clj
rename to test/metabase/query_processor/coercion_test.clj
index f11e7f96009..edaa323ef27 100644
--- a/test/metabase/query_processor_test/coercion_test.clj
+++ b/test/metabase/query_processor/coercion_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.coercion-test
+(ns ^:mb/driver-tests metabase.query-processor.coercion-test
(:require
[clojure.test :refer [deftest is testing]]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor_test/constraints_test.clj b/test/metabase/query_processor/constraints_test.clj
similarity index 97%
rename from test/metabase/query_processor_test/constraints_test.clj
rename to test/metabase/query_processor/constraints_test.clj
index f7be69084de..2ded517d4d2 100644
--- a/test/metabase/query_processor_test/constraints_test.clj
+++ b/test/metabase/query_processor/constraints_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.constraints-test
+(ns ^:mb/driver-tests metabase.query-processor.constraints-test
"Test for MBQL `:constraints`"
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/count_where_test.clj b/test/metabase/query_processor/count_where_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/count_where_test.clj
rename to test/metabase/query_processor/count_where_test.clj
index f05235d1129..e503aae3c87 100644
--- a/test/metabase/query_processor_test/count_where_test.clj
+++ b/test/metabase/query_processor/count_where_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.count-where-test
+(ns ^:mb/driver-tests metabase.query-processor.count-where-test
(:require
[clojure.test :refer :all]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor_test/cumulative_aggregation_test.clj b/test/metabase/query_processor/cumulative_aggregation_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/cumulative_aggregation_test.clj
rename to test/metabase/query_processor/cumulative_aggregation_test.clj
index 67de4a3de65..529be2a9221 100644
--- a/test/metabase/query_processor_test/cumulative_aggregation_test.clj
+++ b/test/metabase/query_processor/cumulative_aggregation_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.cumulative-aggregation-test
+(ns ^:mb/driver-tests metabase.query-processor.cumulative-aggregation-test
(:require
[clojure.test :refer :all]
[java-time.api :as t]
diff --git a/test/metabase/query_processor_test/date_bucketing_test.clj b/test/metabase/query_processor/date_bucketing_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/date_bucketing_test.clj
rename to test/metabase/query_processor/date_bucketing_test.clj
index 79afb1d5093..f0267d2384e 100644
--- a/test/metabase/query_processor_test/date_bucketing_test.clj
+++ b/test/metabase/query_processor/date_bucketing_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.date-bucketing-test
+(ns ^:mb/driver-tests metabase.query-processor.date-bucketing-test
"The below tests cover the various date bucketing/grouping scenarios that we support. There are are always two
timezones in play when querying using these date bucketing features. The most visible is how timestamps are returned
to the user. With no report timezone specified, the JVM's timezone is used to represent the timestamps regardless of
diff --git a/test/metabase/query_processor_test/date_time_zone_functions_test.clj b/test/metabase/query_processor/date_time_zone_functions_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/date_time_zone_functions_test.clj
rename to test/metabase/query_processor/date_time_zone_functions_test.clj
index b352b365d57..59b150bf897 100644
--- a/test/metabase/query_processor_test/date_time_zone_functions_test.clj
+++ b/test/metabase/query_processor/date_time_zone_functions_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.date-time-zone-functions-test
+(ns ^:mb/driver-tests metabase.query-processor.date-time-zone-functions-test
(:require
[clojure.string :as str]
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/distinct_where_test.clj b/test/metabase/query_processor/distinct_where_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/distinct_where_test.clj
rename to test/metabase/query_processor/distinct_where_test.clj
index 295cdc7fe67..3cbc8863e6c 100644
--- a/test/metabase/query_processor_test/distinct_where_test.clj
+++ b/test/metabase/query_processor/distinct_where_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.distinct-where-test
+(ns ^:mb/driver-tests metabase.query-processor.distinct-where-test
(:require
[clojure.test :refer :all]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor_test/drill_thru_e2e_test.clj b/test/metabase/query_processor/drill_thru_e2e_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/drill_thru_e2e_test.clj
rename to test/metabase/query_processor/drill_thru_e2e_test.clj
index e76cae3b96d..69fdda8812c 100644
--- a/test/metabase/query_processor_test/drill_thru_e2e_test.clj
+++ b/test/metabase/query_processor/drill_thru_e2e_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.drill-thru-e2e-test
+(ns metabase.query-processor.drill-thru-e2e-test
(:require
[clojure.test :refer :all]
[medley.core :as m]
diff --git a/test/metabase/query_processor_test/explicit_joins_test.clj b/test/metabase/query_processor/explicit_joins_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/explicit_joins_test.clj
rename to test/metabase/query_processor/explicit_joins_test.clj
index a69f926cc7f..6ad1bc9e1bc 100644
--- a/test/metabase/query_processor_test/explicit_joins_test.clj
+++ b/test/metabase/query_processor/explicit_joins_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.explicit-joins-test
+(ns ^:mb/driver-tests metabase.query-processor.explicit-joins-test
(:require
[clojure.set :as set]
[clojure.string :as str]
@@ -13,11 +13,11 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.mocks-31769 :as lib.tu.mocks-31769]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.timezones-test :as timezones-test]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.test-util :as qp.test-util]
+ [metabase.query-processor.timezones-test :as timezones-test]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.util :as u]
diff --git a/test/metabase/query_processor_test/expression_aggregations_test.clj b/test/metabase/query_processor/expression_aggregations_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/expression_aggregations_test.clj
rename to test/metabase/query_processor/expression_aggregations_test.clj
index 0560a120237..2cfe086008c 100644
--- a/test/metabase/query_processor_test/expression_aggregations_test.clj
+++ b/test/metabase/query_processor/expression_aggregations_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.expression-aggregations-test
+(ns ^:mb/driver-tests metabase.query-processor.expression-aggregations-test
"Tests for expression aggregations and for named aggregations."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/expressions_test.clj b/test/metabase/query_processor/expressions_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/expressions_test.clj
rename to test/metabase/query_processor/expressions_test.clj
index 200bcf3eb2a..fae8c80abc1 100644
--- a/test/metabase/query_processor_test/expressions_test.clj
+++ b/test/metabase/query_processor/expressions_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.expressions-test
+(ns ^:mb/driver-tests metabase.query-processor.expressions-test
"Tests for expressions (calculated columns)."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/failure_test.clj b/test/metabase/query_processor/failure_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/failure_test.clj
rename to test/metabase/query_processor/failure_test.clj
index 579e45968bc..f0d977ffe58 100644
--- a/test/metabase/query_processor_test/failure_test.clj
+++ b/test/metabase/query_processor/failure_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.failure-test
+(ns metabase.query-processor.failure-test
"Tests for how the query processor as a whole handles failures."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/field_ref_repro_test.clj b/test/metabase/query_processor/field_ref_repro_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/field_ref_repro_test.clj
rename to test/metabase/query_processor/field_ref_repro_test.clj
index 485738773be..c08bc092412 100644
--- a/test/metabase/query_processor_test/field_ref_repro_test.clj
+++ b/test/metabase/query_processor/field_ref_repro_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.field-ref-repro-test
+(ns metabase.query-processor.field-ref-repro-test
"Reproduction tests for field ref(erence) issues. These are negative tests, if some fail,
we might have actually fixed a bug."
(:require
diff --git a/test/metabase/query_processor_test/field_visibility_test.clj b/test/metabase/query_processor/field_visibility_test.clj
similarity index 97%
rename from test/metabase/query_processor_test/field_visibility_test.clj
rename to test/metabase/query_processor/field_visibility_test.clj
index 25cb6d5c249..c1ea23cd28a 100644
--- a/test/metabase/query_processor_test/field_visibility_test.clj
+++ b/test/metabase/query_processor/field_visibility_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.field-visibility-test
+(ns ^:mb/driver-tests metabase.query-processor.field-visibility-test
"Tests for behavior of fields with different visibility settings."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/fields_test.clj b/test/metabase/query_processor/fields_test.clj
similarity index 95%
rename from test/metabase/query_processor_test/fields_test.clj
rename to test/metabase/query_processor/fields_test.clj
index 3e9113f8e73..09091d8c8ec 100644
--- a/test/metabase/query_processor_test/fields_test.clj
+++ b/test/metabase/query_processor/fields_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.fields-test
+(ns ^:mb/driver-tests metabase.query-processor.fields-test
"Tests for the `:fields` clause."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/filter_test.clj b/test/metabase/query_processor/filter_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/filter_test.clj
rename to test/metabase/query_processor/filter_test.clj
index f05c1f2c963..ff4e56e8594 100644
--- a/test/metabase/query_processor_test/filter_test.clj
+++ b/test/metabase/query_processor/filter_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.filter-test
+(ns ^:mb/driver-tests metabase.query-processor.filter-test
"Tests for the `:filter` clause."
(:require
[clojure.set :as set]
@@ -9,11 +9,11 @@
[metabase.lib.options :as lib.options]
[metabase.lib.test-util :as lib.tu]
[metabase.query-processor :as qp]
- [metabase.query-processor-test.timezones-test :as timezones-test]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.test-util :as qp.test-util]
+ [metabase.query-processor.timezones-test :as timezones-test]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/query_processor_test/generative_test.clj b/test/metabase/query_processor/generative_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/generative_test.clj
rename to test/metabase/query_processor/generative_test.clj
index 5a50dcfc6d2..263c851e469 100644
--- a/test/metabase/query_processor_test/generative_test.clj
+++ b/test/metabase/query_processor/generative_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.generative-test
+(ns metabase.query-processor.generative-test
"Query processor generative tests."
(:require
[clojure.test :refer [is testing]]
diff --git a/test/metabase/query_processor_test/implicit_joins_test.clj b/test/metabase/query_processor/implicit_joins_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/implicit_joins_test.clj
rename to test/metabase/query_processor/implicit_joins_test.clj
index 71b59cc93e4..5acee0486f1 100644
--- a/test/metabase/query_processor_test/implicit_joins_test.clj
+++ b/test/metabase/query_processor/implicit_joins_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.implicit-joins-test
+(ns ^:mb/driver-tests metabase.query-processor.implicit-joins-test
"Tests for joins that are created automatically when an `:fk->` column is present."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/inactive_fields_test.clj b/test/metabase/query_processor/inactive_fields_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/inactive_fields_test.clj
rename to test/metabase/query_processor/inactive_fields_test.clj
index b9a383dd2e0..668551a4333 100644
--- a/test/metabase/query_processor_test/inactive_fields_test.clj
+++ b/test/metabase/query_processor/inactive_fields_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.inactive-fields-test
+(ns metabase.query-processor.inactive-fields-test
"See also [[metabase.query-processor.middleware.remove-inactive-field-refs-test]] (for the middleware specifically)."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor/middleware/add_remaps_test.clj b/test/metabase/query_processor/middleware/add_remaps_test.clj
index 3035c9f600e..13280b1aaf0 100644
--- a/test/metabase/query_processor/middleware/add_remaps_test.clj
+++ b/test/metabase/query_processor/middleware/add_remaps_test.clj
@@ -483,7 +483,7 @@
;;; TODO -- this test was actually broken in the PR that introduced it (#20154) -- it used `partial` instead of
;;; `partial=`, which ended up asserting nothing of value. However, other tests for this
-;;; issue, [[metabase.query-processor-test.remapping-test/remapped-columns-in-joined-source-queries-test]], and a test
+;;; issue, [[metabase.query-processor.remapping-test/remapped-columns-in-joined-source-queries-test]], and a test
;;; in `e2e/test/scenarios/joins/joins.cy.spec.js`, are still passing. So I'm not sure what to do with this test. I
;;; updated it to use MLv2, but it's commented out for now.
;;;
diff --git a/test/metabase/query_processor/middleware/binning_test.clj b/test/metabase/query_processor/middleware/binning_test.clj
index 4864b4a233c..ff6b5fb5344 100644
--- a/test/metabase/query_processor/middleware/binning_test.clj
+++ b/test/metabase/query_processor/middleware/binning_test.clj
@@ -1,5 +1,5 @@
(ns metabase.query-processor.middleware.binning-test
- "There are more 'e2e' tests related to binning in [[metabase.query-processor-test.breakout-test]]."
+ "There are more 'e2e' tests related to binning in [[metabase.query-processor.breakout-test]]."
(:require
[clojure.test :refer :all]
[medley.core :as m]
diff --git a/test/metabase/query_processor/middleware/catch_exceptions_test.clj b/test/metabase/query_processor/middleware/catch_exceptions_test.clj
index 4eefec3f399..05288738013 100644
--- a/test/metabase/query_processor/middleware/catch_exceptions_test.clj
+++ b/test/metabase/query_processor/middleware/catch_exceptions_test.clj
@@ -1,5 +1,5 @@
(ns metabase.query-processor.middleware.catch-exceptions-test
- "There are additional tests in [[metabase.query-processor-test.failure-test]]."
+ "There are additional tests in [[metabase.query-processor.failure-test]]."
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
diff --git a/test/metabase/query_processor/middleware/parameters_test.clj b/test/metabase/query_processor/middleware/parameters_test.clj
index 0d3e42b39d8..f4f46ad3d21 100644
--- a/test/metabase/query_processor/middleware/parameters_test.clj
+++ b/test/metabase/query_processor/middleware/parameters_test.clj
@@ -361,7 +361,7 @@
[:params [:= ["G%"]]]]]]
(substitute-params mp query))))))
-;;; see also [[metabase.query-processor-test.parameters-test/filter-nested-queries-test]]
+;;; see also [[metabase.query-processor.parameters-test/filter-nested-queries-test]]
(deftest ^:parallel filter-nested-queries-test
(testing "We should be able to apply filters explicitly targeting nested native stages (#48258)"
(let [mp (lib.tu/mock-metadata-provider
diff --git a/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj b/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj
index a9689a79ac3..5b21971dbc5 100644
--- a/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj
+++ b/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj
@@ -1,5 +1,5 @@
(ns metabase.query-processor.middleware.remove-inactive-field-refs-test
- "See also [[metabase.query-processor-test.inactive-fields-test]] (for e2e tests related to inactive fields in other
+ "See also [[metabase.query-processor.inactive-fields-test]] (for e2e tests related to inactive fields in other
situations)."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor/middleware/resolve_joins_test.clj b/test/metabase/query_processor/middleware/resolve_joins_test.clj
index 4b939e49ba6..8bcc9c2aafc 100644
--- a/test/metabase/query_processor/middleware/resolve_joins_test.clj
+++ b/test/metabase/query_processor/middleware/resolve_joins_test.clj
@@ -375,7 +375,7 @@
[:field "Products__PRICE" {:base-type :type/Float}]]
(-> query qp.preprocess/preprocess lib/->legacy-MBQL :query :fields))))))
-;;; adapted from [[metabase.query-processor-test.explicit-joins-test/join-against-saved-question-with-sort-test]]
+;;; adapted from [[metabase.query-processor.explicit-joins-test/join-against-saved-question-with-sort-test]]
(deftest ^:parallel join-against-same-table-returned-columns-test
(testing "Joining against a query that ultimately have the same source table SHOULD result in 'duplicate' columns being included."
(let [query (lib/query
diff --git a/test/metabase/query_processor_test/model_test.clj b/test/metabase/query_processor/model_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/model_test.clj
rename to test/metabase/query_processor/model_test.clj
index c5940651b14..534ba2c3303 100644
--- a/test/metabase/query_processor_test/model_test.clj
+++ b/test/metabase/query_processor/model_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.model-test
+(ns metabase.query-processor.model-test
(:require
[clojure.test :refer [deftest is testing]]
[medley.core :as m]
diff --git a/test/metabase/query_processor_test/native_test.clj b/test/metabase/query_processor/native_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/native_test.clj
rename to test/metabase/query_processor/native_test.clj
index 1de12377e48..e212e9d13d5 100644
--- a/test/metabase/query_processor_test/native_test.clj
+++ b/test/metabase/query_processor/native_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.native-test
+(ns ^:mb/driver-tests metabase.query-processor.native-test
(:require
[clojure.test :refer :all]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor_test/nested_array_test.clj b/test/metabase/query_processor/nested_array_test.clj
similarity index 97%
rename from test/metabase/query_processor_test/nested_array_test.clj
rename to test/metabase/query_processor/nested_array_test.clj
index 2855bb549ee..45ab2348d49 100644
--- a/test/metabase/query_processor_test/nested_array_test.clj
+++ b/test/metabase/query_processor/nested_array_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.nested-array-test
+(ns ^:mb/driver-tests metabase.query-processor.nested-array-test
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
diff --git a/test/metabase/query_processor_test/nested_field_test.clj b/test/metabase/query_processor/nested_field_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/nested_field_test.clj
rename to test/metabase/query_processor/nested_field_test.clj
index 6aaa438d929..74680f93695 100644
--- a/test/metabase/query_processor_test/nested_field_test.clj
+++ b/test/metabase/query_processor/nested_field_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.nested-field-test
+(ns ^:mb/driver-tests metabase.query-processor.nested-field-test
"Tests for nested field access."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/nested_queries_test.clj b/test/metabase/query_processor/nested_queries_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/nested_queries_test.clj
rename to test/metabase/query_processor/nested_queries_test.clj
index 3ff8beef7db..c69251da8de 100644
--- a/test/metabase/query_processor_test/nested_queries_test.clj
+++ b/test/metabase/query_processor/nested_queries_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.nested-queries-test
+(ns ^:mb/driver-tests metabase.query-processor.nested-queries-test
"Tests for handling queries with nested expressions."
(:require
[clojure.set :as set]
diff --git a/test/metabase/query_processor_test/null_array_test.clj b/test/metabase/query_processor/null_array_test.clj
similarity index 87%
rename from test/metabase/query_processor_test/null_array_test.clj
rename to test/metabase/query_processor/null_array_test.clj
index 05f18129b90..4ef88cd0108 100644
--- a/test/metabase/query_processor_test/null_array_test.clj
+++ b/test/metabase/query_processor/null_array_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.null-array-test
+(ns ^:mb/driver-tests metabase.query-processor.null-array-test
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
diff --git a/test/metabase/query_processor_test/offset_test.clj b/test/metabase/query_processor/offset_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/offset_test.clj
rename to test/metabase/query_processor/offset_test.clj
index 346edec0dc2..1a0cf31141a 100644
--- a/test/metabase/query_processor_test/offset_test.clj
+++ b/test/metabase/query_processor/offset_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.offset-test
+(ns ^:mb/driver-tests metabase.query-processor.offset-test
"Tests for the new :offset window function clause (#9393)."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/order_by_test.clj b/test/metabase/query_processor/order_by_test.clj
similarity index 97%
rename from test/metabase/query_processor_test/order_by_test.clj
rename to test/metabase/query_processor/order_by_test.clj
index 13f7dc967e0..117ab4765ce 100644
--- a/test/metabase/query_processor_test/order_by_test.clj
+++ b/test/metabase/query_processor/order_by_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.order-by-test
+(ns ^:mb/driver-tests metabase.query-processor.order-by-test
"Tests for the `:order-by` clause."
(:require
[clojure.test :refer :all]
@@ -132,7 +132,7 @@
:breakout [$price]
:order-by [[:desc [:aggregation 0]]]}))))))))
-;;; See also [[metabase.driver.sql.query-processor-test/order-by-aggregation-reference-test]]
+;;; See also [[metabase.driver.sql.query-processor.order-by-aggregation-reference-test]]
(deftest ^:parallel order-by-aggregate-fields-test-6
(mt/test-drivers (mt/normal-drivers)
(testing "Should order by aggregation references correctly (#62885)"
diff --git a/test/metabase/query_processor_test/page_test.clj b/test/metabase/query_processor/page_test.clj
similarity index 95%
rename from test/metabase/query_processor_test/page_test.clj
rename to test/metabase/query_processor/page_test.clj
index acd42679dce..16c366188a1 100644
--- a/test/metabase/query_processor_test/page_test.clj
+++ b/test/metabase/query_processor/page_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.page-test
+(ns ^:mb/driver-tests metabase.query-processor.page-test
"Tests for the `:page` clause."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/parameters_test.clj b/test/metabase/query_processor/parameters_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/parameters_test.clj
rename to test/metabase/query_processor/parameters_test.clj
index f3a46506319..1232a573f0d 100644
--- a/test/metabase/query_processor_test/parameters_test.clj
+++ b/test/metabase/query_processor/parameters_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.parameters-test
+(ns ^:mb/driver-tests metabase.query-processor.parameters-test
"Tests for support for parameterized queries in drivers that support it. (There are other tests for parameter support
in various places; these are mainly for high-level verification that parameters are working.)"
(:require
diff --git a/test/metabase/query_processor_test/persistence_test.clj b/test/metabase/query_processor/persistence_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/persistence_test.clj
rename to test/metabase/query_processor/persistence_test.clj
index 4b70ac43f03..3394281c475 100644
--- a/test/metabase/query_processor_test/persistence_test.clj
+++ b/test/metabase/query_processor/persistence_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.persistence-test
+(ns ^:mb/driver-tests metabase.query-processor.persistence-test
{:clj-kondo/config '{:linters
;; allowing with-temp in this namespace since model persistence needs to hit the app DB
{:discouraged-var {metabase.test/with-temp {:level :off}}}}}
diff --git a/test/metabase/query_processor_test/pipeline_queries_test.clj b/test/metabase/query_processor/pipeline_queries_test.clj
similarity index 96%
rename from test/metabase/query_processor_test/pipeline_queries_test.clj
rename to test/metabase/query_processor/pipeline_queries_test.clj
index 3bd58baa8e4..32a305f0cbe 100644
--- a/test/metabase/query_processor_test/pipeline_queries_test.clj
+++ b/test/metabase/query_processor/pipeline_queries_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.pipeline-queries-test
+(ns metabase.query-processor.pipeline-queries-test
(:require
[clojure.test :refer :all]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor/preprocess_test.clj b/test/metabase/query_processor/preprocess_test.clj
index aea228a797f..3239fa82bfa 100644
--- a/test/metabase/query_processor/preprocess_test.clj
+++ b/test/metabase/query_processor/preprocess_test.clj
@@ -543,7 +543,7 @@
(map #(select-keys % [:lib/desired-column-alias :field_ref])
expected-cols))))))
-;;; adapted from [[metabase.query-processor-test.explicit-joins-test/test-31769]]
+;;; adapted from [[metabase.query-processor.explicit-joins-test/test-31769]]
(deftest ^:parallel test-31769
(testing "Make sure queries built with MLv2 that have source Cards with joins work correctly (#31769) (#33083)"
(let [mp (lib.tu.mocks-31769/mock-metadata-provider meta/metadata-provider meta/id)
diff --git a/test/metabase/query_processor_test/query_to_native_test.clj b/test/metabase/query_processor/query_to_native_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/query_to_native_test.clj
rename to test/metabase/query_processor/query_to_native_test.clj
index 43b634a89bc..d12652a7f81 100644
--- a/test/metabase/query_processor_test/query_to_native_test.clj
+++ b/test/metabase/query_processor/query_to_native_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.query-to-native-test
+(ns metabase.query-processor.query-to-native-test
"Tests around the `compile` function."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/remapping_test.clj b/test/metabase/query_processor/remapping_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/remapping_test.clj
rename to test/metabase/query_processor/remapping_test.clj
index fad77daf11a..1fc5fa2908f 100644
--- a/test/metabase/query_processor_test/remapping_test.clj
+++ b/test/metabase/query_processor/remapping_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.remapping-test
+(ns ^:mb/driver-tests metabase.query-processor.remapping-test
"Tests for the remapping results"
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/share_test.clj b/test/metabase/query_processor/share_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/share_test.clj
rename to test/metabase/query_processor/share_test.clj
index 5089bef74b9..dd9b2da7d23 100644
--- a/test/metabase/query_processor_test/share_test.clj
+++ b/test/metabase/query_processor/share_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.share-test
+(ns ^:mb/driver-tests metabase.query-processor.share-test
"Tests for the `:share` aggregation."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/split_part_test.clj b/test/metabase/query_processor/split_part_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/split_part_test.clj
rename to test/metabase/query_processor/split_part_test.clj
index efe31d0bba8..fad81f09e4b 100644
--- a/test/metabase/query_processor_test/split_part_test.clj
+++ b/test/metabase/query_processor/split_part_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.split-part-test
+(ns ^:mb/driver-tests metabase.query-processor.split-part-test
(:require
[clojure.string :as str]
[clojure.test :refer :all]
diff --git a/test/metabase/query_processor_test/string_extracts_test.clj b/test/metabase/query_processor/string_extracts_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/string_extracts_test.clj
rename to test/metabase/query_processor/string_extracts_test.clj
index 15f7c11af17..8a0d3610b41 100644
--- a/test/metabase/query_processor_test/string_extracts_test.clj
+++ b/test/metabase/query_processor/string_extracts_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.string-extracts-test
+(ns ^:mb/driver-tests metabase.query-processor.string-extracts-test
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
diff --git a/test/metabase/query_processor_test/sum_where_test.clj b/test/metabase/query_processor/sum_where_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/sum_where_test.clj
rename to test/metabase/query_processor/sum_where_test.clj
index 52af59b621e..b9b787775f3 100644
--- a/test/metabase/query_processor_test/sum_where_test.clj
+++ b/test/metabase/query_processor/sum_where_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.sum-where-test
+(ns ^:mb/driver-tests metabase.query-processor.sum-where-test
(:require
[clojure.test :refer :all]
[metabase.lib.core :as lib]
diff --git a/test/metabase/query_processor_test/temporal_bucket_test.clj b/test/metabase/query_processor/temporal_bucket_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/temporal_bucket_test.clj
rename to test/metabase/query_processor/temporal_bucket_test.clj
index ca463a183c7..aee938f719c 100644
--- a/test/metabase/query_processor_test/temporal_bucket_test.clj
+++ b/test/metabase/query_processor/temporal_bucket_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.query-processor-test.temporal-bucket-test
+(ns metabase.query-processor.temporal-bucket-test
(:require
[clojure.test :refer [are deftest is testing]]
[medley.core :as m]
diff --git a/test/metabase/query_processor_test/time_field_test.clj b/test/metabase/query_processor/time_field_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/time_field_test.clj
rename to test/metabase/query_processor/time_field_test.clj
index e8a6ff24928..69691beb2a5 100644
--- a/test/metabase/query_processor_test/time_field_test.clj
+++ b/test/metabase/query_processor/time_field_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.time-field-test
+(ns ^:mb/driver-tests metabase.query-processor.time-field-test
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
diff --git a/test/metabase/timeseries_query_processor_test.clj b/test/metabase/query_processor/timeseries_test.clj
similarity index 99%
rename from test/metabase/timeseries_query_processor_test.clj
rename to test/metabase/query_processor/timeseries_test.clj
index f0d0739ad21..68ed6609cdc 100644
--- a/test/metabase/timeseries_query_processor_test.clj
+++ b/test/metabase/query_processor/timeseries_test.clj
@@ -1,16 +1,16 @@
-(ns metabase.timeseries-query-processor-test
+(ns metabase.query-processor.timeseries-test
"Query processor tests for DBs that are event-based, like Druid.
There architecture is different enough that we can't test them along with our 'normal' DBs in `query-procesor-test`."
- {:clj-kondo/config '{:hooks {:analyze-call {metabase.timeseries-query-processor-test/run-mbql-query
+ {:clj-kondo/config '{:hooks {:analyze-call {metabase.query-processor.timeseries-test/run-mbql-query
hooks.metabase.test.data/mbql-query}}}}
(:require
[clojure.string :as str]
[clojure.test :refer :all]
[clojure.walk :as walk]
[metabase.driver :as driver]
+ [metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.test :as mt]
[metabase.test.data.mbql-query-impl :as mbql-query-impl]
- [metabase.timeseries-query-processor-test.util :as tqpt]
[metabase.util.date-2 :as u.date]))
(defn- druid-id
@@ -692,8 +692,7 @@
["2015-01-01" 267]]
[iso8601-date-part int]]]
;; TODO: Find a way how to make those work with Druid JDBC.
- :when (not (and (= driver/*driver* :druid-jdbc)
- (#{:week-of-year :day-of-week :week} unit)))]
+ :when (not (#{:week-of-year :day-of-week :week} unit))]
(testing unit
(testing "topN query"
(let [{:keys [columns rows]} (mt/formatted-rows+column-names
diff --git a/test/metabase/timeseries_query_processor_test/util.clj b/test/metabase/query_processor/timeseries_test/util.clj
similarity index 93%
rename from test/metabase/timeseries_query_processor_test/util.clj
rename to test/metabase/query_processor/timeseries_test/util.clj
index 5ab37408c9d..65283ecabc6 100644
--- a/test/metabase/timeseries_query_processor_test/util.clj
+++ b/test/metabase/query_processor/timeseries_test/util.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.timeseries-query-processor-test.util
+(ns ^:mb/driver-tests metabase.query-processor.timeseries-test.util
"Utility functions and macros for testing timeseries database drivers, such as Druid."
(:require
[metabase.test :as mt]
diff --git a/test/metabase/query_processor_test/timezones_test.clj b/test/metabase/query_processor/timezones_test.clj
similarity index 99%
rename from test/metabase/query_processor_test/timezones_test.clj
rename to test/metabase/query_processor/timezones_test.clj
index 54ada2bd9dd..0b10e9be141 100644
--- a/test/metabase/query_processor_test/timezones_test.clj
+++ b/test/metabase/query_processor/timezones_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.timezones-test
+(ns ^:mb/driver-tests metabase.query-processor.timezones-test
(:require
[clojure.set :as set]
[clojure.string :as str]
diff --git a/test/metabase/query_processor/util/add_alias_info_test.clj b/test/metabase/query_processor/util/add_alias_info_test.clj
index ff6cab73723..6c9e7120af2 100644
--- a/test/metabase/query_processor/util/add_alias_info_test.clj
+++ b/test/metabase/query_processor/util/add_alias_info_test.clj
@@ -814,7 +814,7 @@
lib/->legacy-MBQL
:query))))))))
-;;; adapted from [[metabase.query-processor-test.model-test/model-self-join-test]]
+;;; adapted from [[metabase.query-processor.model-test/model-self-join-test]]
(deftest ^:parallel model-duplicate-joins-test
(testing "Field references from model joined a second time can be resolved (#48639)"
(let [mp meta/metadata-provider
@@ -937,7 +937,7 @@
{::add/source-alias "Reviews__CREATED_AT", ::add/desired-alias "Reviews__CREATED_AT"}]]]}
(-> expected :query :source-query (dissoc :source-query)))))))))))
-;;; adapted from [[metabase.query-processor-test.uuid-test/joined-uuid-query-test]]
+;;; adapted from [[metabase.query-processor.uuid-test/joined-uuid-query-test]]
(deftest ^:parallel resolve-field-missing-join-alias-test
(testing "should resolve broken refs missing join-alias correctly"
(let [mp lib.tu.uuid-dogs-metadata-provider/metadata-provider
@@ -1265,7 +1265,7 @@
:stages
first)))))
-;;; see also [[metabase.driver.sql.query-processor-test/evil-field-ref-for-an-expression-test]]
+;;; see also [[metabase.driver.sql.query-processor.evil-field-ref-for-an-expression-test]]
;;; and [[metabase-enterprise.sandbox.query-processor.middleware.sandboxing-test/evil-field-ref-for-an-expression-test]]
(deftest ^:parallel resolve-incorrect-field-ref-for-expression-test
(testing "resolve the incorrect use of a :field ref for an expression correctly"
diff --git a/test/metabase/query_processor_test/uuid_test.clj b/test/metabase/query_processor/uuid_test.clj
similarity index 98%
rename from test/metabase/query_processor_test/uuid_test.clj
rename to test/metabase/query_processor/uuid_test.clj
index 732348fb8c7..538b41d7c50 100644
--- a/test/metabase/query_processor_test/uuid_test.clj
+++ b/test/metabase/query_processor/uuid_test.clj
@@ -1,4 +1,4 @@
-(ns ^:mb/driver-tests metabase.query-processor-test.uuid-test
+(ns ^:mb/driver-tests metabase.query-processor.uuid-test
"Tests for queries involving uuids."
(:require
[clojure.test :refer :all]
diff --git a/test/metabase/test/data.clj b/test/metabase/test/data.clj
index bf362bacd3d..94729baa25d 100644
--- a/test/metabase/test/data.clj
+++ b/test/metabase/test/data.clj
@@ -307,7 +307,7 @@
(mdb/finish-db-setup!)
~@body))
-;; Non-"normal" timeseries drivers are tested in [[metabase.timeseries-query-processor-test]] and elsewhere
+;; Non-"normal" timeseries drivers are tested in [[metabase.query-processor.timeseries-test]] and elsewhere
(def timeseries-drivers
"Drivers that are so weird that we can't use the standard dataset loading against them."
#{:druid :druid-jdbc})