Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Group more of the WinRT tests together #3263

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Group more of the WinRT tests together #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/clippy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ jobs:
run: cargo clippy -p test_extensions
- name: Clippy test_handles
run: cargo clippy -p test_handles
- name: Clippy test_helpers
run: cargo clippy -p test_helpers
- name: Clippy test_implement
run: cargo clippy -p test_implement
- name: Clippy test_implement_core
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ jobs:
run: cargo test -p test_extensions --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Test test_handles
run: cargo test -p test_handles --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Test test_helpers
run: cargo test -p test_helpers --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Test test_implement
run: cargo test -p test_implement --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Test test_implement_core
Expand Down Expand Up @@ -255,10 +253,10 @@ jobs:
run: cargo test -p test_reference_float --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Test test_registry
run: cargo test -p test_registry --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Clean
run: cargo clean
- name: Test test_registry_default
run: cargo test -p test_registry_default --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Clean
run: cargo clean
- name: Test test_reserved
run: cargo test -p test_reserved --target ${{ matrix.target }} ${{ matrix.etc }}
- name: Test test_resources
Expand Down
1 change: 1 addition & 0 deletions crates/libs/helpers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ publish = false
[dependencies]
regex = "1.7"
windows-metadata = { workspace = true }
windows-targets = { workspace = true }
18 changes: 18 additions & 0 deletions crates/libs/helpers/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,21 @@ fn find<P: AsRef<Path>>(path: P, regex: &Regex) -> Vec<(String, String)> {

names
}

pub fn set_thread_ui_language() {
// Enables testing without pulling in a dependency on the `windows` crate.
windows_targets::link!("kernel32.dll" "system" fn SetThreadPreferredUILanguages(flags : u32, language : *const u16, _ : *mut u32) -> i32);
pub const MUI_LANGUAGE_NAME: u32 = 8u32;

let language: Vec<_> = "en-US".encode_utf16().chain(std::iter::once(0)).collect();
unsafe {
assert_eq!(
1,
SetThreadPreferredUILanguages(
MUI_LANGUAGE_NAME,
language.as_ptr(),
std::ptr::null_mut()
)
);
}
}
2 changes: 1 addition & 1 deletion crates/tests/misc/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ workspace = true
workspace = true

[dev-dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
2 changes: 1 addition & 1 deletion crates/tests/misc/enums/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ features = [
]

[dev-dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
2 changes: 1 addition & 1 deletion crates/tests/misc/error/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ features = [
]

[dev-dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
12 changes: 0 additions & 12 deletions crates/tests/misc/helpers/Cargo.toml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions crates/tests/misc/helpers/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion crates/tests/misc/result/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace = true
workspace = true

[dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
static_assertions = "1.0"

[lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion crates/tests/misc/strings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ features = [
]

[dev-dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
2 changes: 1 addition & 1 deletion crates/tests/misc/win32/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ features = [
]

[dev-dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
0 crates/tests/misc/collections/Cargo.toml → crates/tests/winrt/collections/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/collections/src/lib.rs → crates/tests/winrt/collections/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 .../misc/collections/tests/stock_iterable.rs → ...winrt/collections/tests/stock_iterable.rs
View file
Open in desktop
File renamed without changes.
0 .../misc/collections/tests/stock_map_view.rs → ...winrt/collections/tests/stock_map_view.rs
View file
Open in desktop
File renamed without changes.
0 ...sc/collections/tests/stock_vector_view.rs → ...rt/collections/tests/stock_vector_view.rs
View file
Open in desktop
File renamed without changes.
0 ...ests/misc/collections/tests/string_map.rs → ...sts/winrt/collections/tests/string_map.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/event/Cargo.toml → crates/tests/winrt/event/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/event/src/lib.rs → crates/tests/winrt/event/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/event/tests/tests.rs → crates/tests/winrt/event/tests/tests.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/Cargo.toml → crates/tests/winrt/noexcept/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/build.rs → crates/tests/winrt/noexcept/build.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/src/bindings.rs → crates/tests/winrt/noexcept/src/bindings.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/src/interop.cpp → crates/tests/winrt/noexcept/src/interop.cpp
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/src/lib.rs → crates/tests/winrt/noexcept/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/src/test.idl → crates/tests/winrt/noexcept/src/test.idl
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/noexcept/tests/test.rs → crates/tests/winrt/noexcept/tests/test.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/tests/misc/winrt_old/Cargo.toml → crates/tests/winrt/old/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ features = [
]

[dev-dependencies]
helpers = { package = "test_helpers", path = "../helpers" }
helpers = { workspace = true }
0 crates/tests/misc/winrt_old/src/lib.rs → crates/tests/winrt/old/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/async.rs → crates/tests/winrt/old/tests/async.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/cast.rs → crates/tests/winrt/old/tests/cast.rs
View file
Open in desktop
File renamed without changes.
0 ...tests/misc/winrt_old/tests/collections.rs → crates/tests/winrt/old/tests/collections.rs
View file
Open in desktop
File renamed without changes.
0 .../tests/misc/winrt_old/tests/collisions.rs → crates/tests/winrt/old/tests/collisions.rs
View file
Open in desktop
File renamed without changes.
0 ...tests/misc/winrt_old/tests/composition.rs → crates/tests/winrt/old/tests/composition.rs
View file
Open in desktop
File renamed without changes.
0 ...s/tests/misc/winrt_old/tests/delegates.rs → crates/tests/winrt/old/tests/delegates.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/enum.rs → crates/tests/winrt/old/tests/enum.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/error.rs → crates/tests/winrt/old/tests/error.rs
View file
Open in desktop
File renamed without changes.
0 ...sts/misc/winrt_old/tests/generic_guids.rs → ...es/tests/winrt/old/tests/generic_guids.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/guid.rs → crates/tests/winrt/old/tests/guid.rs
View file
Open in desktop
File renamed without changes.
0 ...s/tests/misc/winrt_old/tests/interface.rs → crates/tests/winrt/old/tests/interface.rs
View file
Open in desktop
File renamed without changes.
0 ...s/tests/misc/winrt_old/tests/namespace.rs → crates/tests/winrt/old/tests/namespace.rs
View file
Open in desktop
File renamed without changes.
0 ...es/tests/misc/winrt_old/tests/numerics.rs → crates/tests/winrt/old/tests/numerics.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/object.rs → crates/tests/winrt/old/tests/object.rs
View file
Open in desktop
File renamed without changes.
0 ...s/tests/misc/winrt_old/tests/send_sync.rs → crates/tests/winrt/old/tests/send_sync.rs
View file
Open in desktop
File renamed without changes.
0 ...ests/misc/winrt_old/tests/static_class.rs → crates/tests/winrt/old/tests/static_class.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/uri.rs → crates/tests/winrt/old/tests/uri.rs
View file
Open in desktop
File renamed without changes.
0 crates/tests/misc/winrt_old/tests/xml.rs → crates/tests/winrt/old/tests/xml.rs
View file
Open in desktop
File renamed without changes.