From 70518920779792e30cf150a9a0794579b37d7dd9 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 10 Sep 2024 21:22:02 +0200 Subject: [PATCH] Move integration tests one directory level deeper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … and rename from tests to it (integration tests). This allows enabling the mod_module_files lint everywhere again. --- crates/ruma-common/tests/api/ruma_api.rs | 10 ---------- crates/ruma-common/tests/identifiers/id_macros.rs | 7 ------- crates/ruma-common/tests/{api/mod.rs => it/api.rs} | 0 crates/ruma-common/tests/{ => it}/api/conversions.rs | 0 .../ruma-common/tests/{ => it}/api/default_status.rs | 0 .../ruma-common/tests/{ => it}/api/header_override.rs | 0 .../tests/{ => it}/api/manual_endpoint_impl.rs | 0 crates/ruma-common/tests/{ => it}/api/no_fields.rs | 0 .../ruma-common/tests/{ => it}/api/optional_headers.rs | 0 .../ruma-common/tests/{ => it}/api/required_headers.rs | 0 crates/ruma-common/tests/it/api/ruma_api.rs | 10 ++++++++++ .../ruma-common/tests/{ => it}/api/ruma_api_macros.rs | 0 .../ruma-common/tests/{ => it}/api/status_override.rs | 0 .../tests/{ => it}/api/ui/api-sanity-check.rs | 0 .../tests/{ => it}/api/ui/deprecated-without-added.rs | 0 .../{ => it}/api/ui/deprecated-without-added.stderr | 2 +- crates/ruma-common/tests/{ => it}/api/ui/move-value.rs | 0 .../{ => it}/api/ui/removed-without-deprecated.rs | 0 .../{ => it}/api/ui/removed-without-deprecated.stderr | 2 +- .../ruma-common/tests/{ => it}/api/ui/request-only.rs | 0 .../ruma-common/tests/{ => it}/api/ui/response-only.rs | 0 .../tests/{identifiers/mod.rs => it/identifiers.rs} | 0 crates/ruma-common/tests/it/identifiers/id_macros.rs | 7 +++++++ .../{ => it}/identifiers/ui/01-valid-id-macros.rs | 0 .../{ => it}/identifiers/ui/02-invalid-id-macros.rs | 0 .../identifiers/ui/02-invalid-id-macros.stderr | 0 .../identifiers/ui/03-invalid-new-id-macros.rs | 0 .../identifiers/ui/03-invalid-new-id-macros.stderr | 6 +++--- crates/ruma-common/tests/{tests.rs => it/main.rs} | 0 crates/ruma-common/tests/{serde/mod.rs => it/serde.rs} | 0 .../ruma-common/tests/{ => it}/serde/empty_strings.rs | 0 crates/ruma-common/tests/{ => it}/serde/enum_derive.rs | 0 .../ruma-federation-api/tests/{tests.rs => it/main.rs} | 0 .../tests/{membership/mod.rs => it/membership.rs} | 0 .../tests/{ => it}/membership/create_join_event.rs | 0 35 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 crates/ruma-common/tests/api/ruma_api.rs delete mode 100644 crates/ruma-common/tests/identifiers/id_macros.rs rename crates/ruma-common/tests/{api/mod.rs => it/api.rs} (100%) rename crates/ruma-common/tests/{ => it}/api/conversions.rs (100%) rename crates/ruma-common/tests/{ => it}/api/default_status.rs (100%) rename crates/ruma-common/tests/{ => it}/api/header_override.rs (100%) rename crates/ruma-common/tests/{ => it}/api/manual_endpoint_impl.rs (100%) rename crates/ruma-common/tests/{ => it}/api/no_fields.rs (100%) rename crates/ruma-common/tests/{ => it}/api/optional_headers.rs (100%) rename crates/ruma-common/tests/{ => it}/api/required_headers.rs (100%) create mode 100644 crates/ruma-common/tests/it/api/ruma_api.rs rename crates/ruma-common/tests/{ => it}/api/ruma_api_macros.rs (100%) rename crates/ruma-common/tests/{ => it}/api/status_override.rs (100%) rename crates/ruma-common/tests/{ => it}/api/ui/api-sanity-check.rs (100%) rename crates/ruma-common/tests/{ => it}/api/ui/deprecated-without-added.rs (100%) rename crates/ruma-common/tests/{ => it}/api/ui/deprecated-without-added.stderr (79%) rename crates/ruma-common/tests/{ => it}/api/ui/move-value.rs (100%) rename crates/ruma-common/tests/{ => it}/api/ui/removed-without-deprecated.rs (100%) rename crates/ruma-common/tests/{ => it}/api/ui/removed-without-deprecated.stderr (77%) rename crates/ruma-common/tests/{ => it}/api/ui/request-only.rs (100%) rename crates/ruma-common/tests/{ => it}/api/ui/response-only.rs (100%) rename crates/ruma-common/tests/{identifiers/mod.rs => it/identifiers.rs} (100%) create mode 100644 crates/ruma-common/tests/it/identifiers/id_macros.rs rename crates/ruma-common/tests/{ => it}/identifiers/ui/01-valid-id-macros.rs (100%) rename crates/ruma-common/tests/{ => it}/identifiers/ui/02-invalid-id-macros.rs (100%) rename crates/ruma-common/tests/{ => it}/identifiers/ui/02-invalid-id-macros.stderr (100%) rename crates/ruma-common/tests/{ => it}/identifiers/ui/03-invalid-new-id-macros.rs (100%) rename crates/ruma-common/tests/{ => it}/identifiers/ui/03-invalid-new-id-macros.stderr (78%) rename crates/ruma-common/tests/{tests.rs => it/main.rs} (100%) rename crates/ruma-common/tests/{serde/mod.rs => it/serde.rs} (100%) rename crates/ruma-common/tests/{ => it}/serde/empty_strings.rs (100%) rename crates/ruma-common/tests/{ => it}/serde/enum_derive.rs (100%) rename crates/ruma-federation-api/tests/{tests.rs => it/main.rs} (100%) rename crates/ruma-federation-api/tests/{membership/mod.rs => it/membership.rs} (100%) rename crates/ruma-federation-api/tests/{ => it}/membership/create_join_event.rs (100%) diff --git a/crates/ruma-common/tests/api/ruma_api.rs b/crates/ruma-common/tests/api/ruma_api.rs deleted file mode 100644 index 833fe018..00000000 --- a/crates/ruma-common/tests/api/ruma_api.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[test] -fn ui() { - let t = trybuild::TestCases::new(); - t.pass("tests/api/ui/api-sanity-check.rs"); - t.pass("tests/api/ui/move-value.rs"); - t.pass("tests/api/ui/request-only.rs"); - t.pass("tests/api/ui/response-only.rs"); - t.compile_fail("tests/api/ui/deprecated-without-added.rs"); - t.compile_fail("tests/api/ui/removed-without-deprecated.rs"); -} diff --git a/crates/ruma-common/tests/identifiers/id_macros.rs b/crates/ruma-common/tests/identifiers/id_macros.rs deleted file mode 100644 index 7c0aa7ec..00000000 --- a/crates/ruma-common/tests/identifiers/id_macros.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[test] -fn ui() { - let t = trybuild::TestCases::new(); - t.pass("tests/identifiers/ui/01-valid-id-macros.rs"); - t.compile_fail("tests/identifiers/ui/02-invalid-id-macros.rs"); - t.compile_fail("tests/identifiers/ui/03-invalid-new-id-macros.rs"); -} diff --git a/crates/ruma-common/tests/api/mod.rs b/crates/ruma-common/tests/it/api.rs similarity index 100% rename from crates/ruma-common/tests/api/mod.rs rename to crates/ruma-common/tests/it/api.rs diff --git a/crates/ruma-common/tests/api/conversions.rs b/crates/ruma-common/tests/it/api/conversions.rs similarity index 100% rename from crates/ruma-common/tests/api/conversions.rs rename to crates/ruma-common/tests/it/api/conversions.rs diff --git a/crates/ruma-common/tests/api/default_status.rs b/crates/ruma-common/tests/it/api/default_status.rs similarity index 100% rename from crates/ruma-common/tests/api/default_status.rs rename to crates/ruma-common/tests/it/api/default_status.rs diff --git a/crates/ruma-common/tests/api/header_override.rs b/crates/ruma-common/tests/it/api/header_override.rs similarity index 100% rename from crates/ruma-common/tests/api/header_override.rs rename to crates/ruma-common/tests/it/api/header_override.rs diff --git a/crates/ruma-common/tests/api/manual_endpoint_impl.rs b/crates/ruma-common/tests/it/api/manual_endpoint_impl.rs similarity index 100% rename from crates/ruma-common/tests/api/manual_endpoint_impl.rs rename to crates/ruma-common/tests/it/api/manual_endpoint_impl.rs diff --git a/crates/ruma-common/tests/api/no_fields.rs b/crates/ruma-common/tests/it/api/no_fields.rs similarity index 100% rename from crates/ruma-common/tests/api/no_fields.rs rename to crates/ruma-common/tests/it/api/no_fields.rs diff --git a/crates/ruma-common/tests/api/optional_headers.rs b/crates/ruma-common/tests/it/api/optional_headers.rs similarity index 100% rename from crates/ruma-common/tests/api/optional_headers.rs rename to crates/ruma-common/tests/it/api/optional_headers.rs diff --git a/crates/ruma-common/tests/api/required_headers.rs b/crates/ruma-common/tests/it/api/required_headers.rs similarity index 100% rename from crates/ruma-common/tests/api/required_headers.rs rename to crates/ruma-common/tests/it/api/required_headers.rs diff --git a/crates/ruma-common/tests/it/api/ruma_api.rs b/crates/ruma-common/tests/it/api/ruma_api.rs new file mode 100644 index 00000000..f863050b --- /dev/null +++ b/crates/ruma-common/tests/it/api/ruma_api.rs @@ -0,0 +1,10 @@ +#[test] +fn ui() { + let t = trybuild::TestCases::new(); + t.pass("tests/it/api/ui/api-sanity-check.rs"); + t.pass("tests/it/api/ui/move-value.rs"); + t.pass("tests/it/api/ui/request-only.rs"); + t.pass("tests/it/api/ui/response-only.rs"); + t.compile_fail("tests/it/api/ui/deprecated-without-added.rs"); + t.compile_fail("tests/it/api/ui/removed-without-deprecated.rs"); +} diff --git a/crates/ruma-common/tests/api/ruma_api_macros.rs b/crates/ruma-common/tests/it/api/ruma_api_macros.rs similarity index 100% rename from crates/ruma-common/tests/api/ruma_api_macros.rs rename to crates/ruma-common/tests/it/api/ruma_api_macros.rs diff --git a/crates/ruma-common/tests/api/status_override.rs b/crates/ruma-common/tests/it/api/status_override.rs similarity index 100% rename from crates/ruma-common/tests/api/status_override.rs rename to crates/ruma-common/tests/it/api/status_override.rs diff --git a/crates/ruma-common/tests/api/ui/api-sanity-check.rs b/crates/ruma-common/tests/it/api/ui/api-sanity-check.rs similarity index 100% rename from crates/ruma-common/tests/api/ui/api-sanity-check.rs rename to crates/ruma-common/tests/it/api/ui/api-sanity-check.rs diff --git a/crates/ruma-common/tests/api/ui/deprecated-without-added.rs b/crates/ruma-common/tests/it/api/ui/deprecated-without-added.rs similarity index 100% rename from crates/ruma-common/tests/api/ui/deprecated-without-added.rs rename to crates/ruma-common/tests/it/api/ui/deprecated-without-added.rs diff --git a/crates/ruma-common/tests/api/ui/deprecated-without-added.stderr b/crates/ruma-common/tests/it/api/ui/deprecated-without-added.stderr similarity index 79% rename from crates/ruma-common/tests/api/ui/deprecated-without-added.stderr rename to crates/ruma-common/tests/it/api/ui/deprecated-without-added.stderr index a53add42..23a452eb 100644 --- a/crates/ruma-common/tests/api/ui/deprecated-without-added.stderr +++ b/crates/ruma-common/tests/it/api/ui/deprecated-without-added.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `deprecated` - --> tests/api/ui/deprecated-without-added.rs:9:16 + --> tests/it/api/ui/deprecated-without-added.rs:9:16 | 9 | 1.1 => deprecated, | ^^^^^^^^^^ no rules expected this token in macro call diff --git a/crates/ruma-common/tests/api/ui/move-value.rs b/crates/ruma-common/tests/it/api/ui/move-value.rs similarity index 100% rename from crates/ruma-common/tests/api/ui/move-value.rs rename to crates/ruma-common/tests/it/api/ui/move-value.rs diff --git a/crates/ruma-common/tests/api/ui/removed-without-deprecated.rs b/crates/ruma-common/tests/it/api/ui/removed-without-deprecated.rs similarity index 100% rename from crates/ruma-common/tests/api/ui/removed-without-deprecated.rs rename to crates/ruma-common/tests/it/api/ui/removed-without-deprecated.rs diff --git a/crates/ruma-common/tests/api/ui/removed-without-deprecated.stderr b/crates/ruma-common/tests/it/api/ui/removed-without-deprecated.stderr similarity index 77% rename from crates/ruma-common/tests/api/ui/removed-without-deprecated.stderr rename to crates/ruma-common/tests/it/api/ui/removed-without-deprecated.stderr index 25b8582d..7f081c73 100644 --- a/crates/ruma-common/tests/api/ui/removed-without-deprecated.stderr +++ b/crates/ruma-common/tests/it/api/ui/removed-without-deprecated.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `removed` - --> tests/api/ui/removed-without-deprecated.rs:9:16 + --> tests/it/api/ui/removed-without-deprecated.rs:9:16 | 9 | 1.1 => removed, | ^^^^^^^ no rules expected this token in macro call diff --git a/crates/ruma-common/tests/api/ui/request-only.rs b/crates/ruma-common/tests/it/api/ui/request-only.rs similarity index 100% rename from crates/ruma-common/tests/api/ui/request-only.rs rename to crates/ruma-common/tests/it/api/ui/request-only.rs diff --git a/crates/ruma-common/tests/api/ui/response-only.rs b/crates/ruma-common/tests/it/api/ui/response-only.rs similarity index 100% rename from crates/ruma-common/tests/api/ui/response-only.rs rename to crates/ruma-common/tests/it/api/ui/response-only.rs diff --git a/crates/ruma-common/tests/identifiers/mod.rs b/crates/ruma-common/tests/it/identifiers.rs similarity index 100% rename from crates/ruma-common/tests/identifiers/mod.rs rename to crates/ruma-common/tests/it/identifiers.rs diff --git a/crates/ruma-common/tests/it/identifiers/id_macros.rs b/crates/ruma-common/tests/it/identifiers/id_macros.rs new file mode 100644 index 00000000..032c4c4f --- /dev/null +++ b/crates/ruma-common/tests/it/identifiers/id_macros.rs @@ -0,0 +1,7 @@ +#[test] +fn ui() { + let t = trybuild::TestCases::new(); + t.pass("tests/it/identifiers/ui/01-valid-id-macros.rs"); + t.compile_fail("tests/it/identifiers/ui/02-invalid-id-macros.rs"); + t.compile_fail("tests/it/identifiers/ui/03-invalid-new-id-macros.rs"); +} diff --git a/crates/ruma-common/tests/identifiers/ui/01-valid-id-macros.rs b/crates/ruma-common/tests/it/identifiers/ui/01-valid-id-macros.rs similarity index 100% rename from crates/ruma-common/tests/identifiers/ui/01-valid-id-macros.rs rename to crates/ruma-common/tests/it/identifiers/ui/01-valid-id-macros.rs diff --git a/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.rs b/crates/ruma-common/tests/it/identifiers/ui/02-invalid-id-macros.rs similarity index 100% rename from crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.rs rename to crates/ruma-common/tests/it/identifiers/ui/02-invalid-id-macros.rs diff --git a/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.stderr b/crates/ruma-common/tests/it/identifiers/ui/02-invalid-id-macros.stderr similarity index 100% rename from crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.stderr rename to crates/ruma-common/tests/it/identifiers/ui/02-invalid-id-macros.stderr diff --git a/crates/ruma-common/tests/identifiers/ui/03-invalid-new-id-macros.rs b/crates/ruma-common/tests/it/identifiers/ui/03-invalid-new-id-macros.rs similarity index 100% rename from crates/ruma-common/tests/identifiers/ui/03-invalid-new-id-macros.rs rename to crates/ruma-common/tests/it/identifiers/ui/03-invalid-new-id-macros.rs diff --git a/crates/ruma-common/tests/identifiers/ui/03-invalid-new-id-macros.stderr b/crates/ruma-common/tests/it/identifiers/ui/03-invalid-new-id-macros.stderr similarity index 78% rename from crates/ruma-common/tests/identifiers/ui/03-invalid-new-id-macros.stderr rename to crates/ruma-common/tests/it/identifiers/ui/03-invalid-new-id-macros.stderr index cedf3724..798353c4 100644 --- a/crates/ruma-common/tests/identifiers/ui/03-invalid-new-id-macros.stderr +++ b/crates/ruma-common/tests/it/identifiers/ui/03-invalid-new-id-macros.stderr @@ -1,13 +1,13 @@ error[E0080]: evaluation of constant value failed - --> tests/identifiers/ui/03-invalid-new-id-macros.rs:2:13 + --> tests/it/identifiers/ui/03-invalid-new-id-macros.rs:2:13 | 2 | let _ = ruma_common::session_id!("invalid~"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the evaluated program panicked at 'Invalid Session ID: contains invalid characters', $DIR/tests/identifiers/ui/03-invalid-new-id-macros.rs:2:13 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the evaluated program panicked at 'Invalid Session ID: contains invalid characters', $DIR/tests/it/identifiers/ui/03-invalid-new-id-macros.rs:2:13 | = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `ruma_common::session_id` (in Nightly builds, run with -Z macro-backtrace for more info) note: erroneous constant encountered - --> tests/identifiers/ui/03-invalid-new-id-macros.rs:2:13 + --> tests/it/identifiers/ui/03-invalid-new-id-macros.rs:2:13 | 2 | let _ = ruma_common::session_id!("invalid~"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/crates/ruma-common/tests/tests.rs b/crates/ruma-common/tests/it/main.rs similarity index 100% rename from crates/ruma-common/tests/tests.rs rename to crates/ruma-common/tests/it/main.rs diff --git a/crates/ruma-common/tests/serde/mod.rs b/crates/ruma-common/tests/it/serde.rs similarity index 100% rename from crates/ruma-common/tests/serde/mod.rs rename to crates/ruma-common/tests/it/serde.rs diff --git a/crates/ruma-common/tests/serde/empty_strings.rs b/crates/ruma-common/tests/it/serde/empty_strings.rs similarity index 100% rename from crates/ruma-common/tests/serde/empty_strings.rs rename to crates/ruma-common/tests/it/serde/empty_strings.rs diff --git a/crates/ruma-common/tests/serde/enum_derive.rs b/crates/ruma-common/tests/it/serde/enum_derive.rs similarity index 100% rename from crates/ruma-common/tests/serde/enum_derive.rs rename to crates/ruma-common/tests/it/serde/enum_derive.rs diff --git a/crates/ruma-federation-api/tests/tests.rs b/crates/ruma-federation-api/tests/it/main.rs similarity index 100% rename from crates/ruma-federation-api/tests/tests.rs rename to crates/ruma-federation-api/tests/it/main.rs diff --git a/crates/ruma-federation-api/tests/membership/mod.rs b/crates/ruma-federation-api/tests/it/membership.rs similarity index 100% rename from crates/ruma-federation-api/tests/membership/mod.rs rename to crates/ruma-federation-api/tests/it/membership.rs diff --git a/crates/ruma-federation-api/tests/membership/create_join_event.rs b/crates/ruma-federation-api/tests/it/membership/create_join_event.rs similarity index 100% rename from crates/ruma-federation-api/tests/membership/create_join_event.rs rename to crates/ruma-federation-api/tests/it/membership/create_join_event.rs