Group more of the WinRT tests together (#3263)

microsoft · Sep 6, 2024 · 2405bff · 2405bff
1 parent 9f86909
commit 2405bff
Show file tree

Hide file tree

Showing 48 changed files with 28 additions and 42 deletions.
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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
@@ -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

diff --git a/crates/libs/helpers/Cargo.toml b/crates/libs/helpers/Cargo.toml
@@ -7,3 +7,4 @@ publish = false
 [dependencies]
 regex = "1.7"
 windows-metadata = { workspace = true }
+windows-targets = { workspace = true }
diff --git a/crates/libs/helpers/src/lib.rs b/crates/libs/helpers/src/lib.rs
@@ -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()
+            )
+        );
+    }
+}
diff --git a/crates/tests/misc/core/Cargo.toml b/crates/tests/misc/core/Cargo.toml
@@ -25,4 +25,4 @@ workspace = true
 workspace = true
 
 [dev-dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
diff --git a/crates/tests/misc/enums/Cargo.toml b/crates/tests/misc/enums/Cargo.toml
@@ -22,4 +22,4 @@ features = [
 ]
 
 [dev-dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
diff --git a/crates/tests/misc/error/Cargo.toml b/crates/tests/misc/error/Cargo.toml
@@ -17,4 +17,4 @@ features = [
 ]
 
 [dev-dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
diff --git a/crates/tests/misc/helpers/Cargo.toml b/crates/tests/misc/helpers/Cargo.toml
diff --git a/crates/tests/misc/helpers/src/lib.rs b/crates/tests/misc/helpers/src/lib.rs
diff --git a/crates/tests/misc/result/Cargo.toml b/crates/tests/misc/result/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 workspace = true
 
 [dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
 static_assertions = "1.0"
 
 [lints.rust]

diff --git a/crates/tests/misc/strings/Cargo.toml b/crates/tests/misc/strings/Cargo.toml
@@ -22,4 +22,4 @@ features = [
 ]
 
 [dev-dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
diff --git a/crates/tests/misc/win32/Cargo.toml b/crates/tests/misc/win32/Cargo.toml
@@ -35,4 +35,4 @@ features = [
 ]
 
 [dev-dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
diff --git a/crates/tests/misc/collections/Cargo.toml → crates/tests/winrt/collections/Cargo.toml b/crates/tests/misc/collections/Cargo.toml → crates/tests/winrt/collections/Cargo.toml
diff --git a/crates/tests/misc/collections/src/lib.rs → crates/tests/winrt/collections/src/lib.rs b/crates/tests/misc/collections/src/lib.rs → crates/tests/winrt/collections/src/lib.rs
diff --git a/.../misc/collections/tests/stock_iterable.rs → ...winrt/collections/tests/stock_iterable.rs b/.../misc/collections/tests/stock_iterable.rs → ...winrt/collections/tests/stock_iterable.rs
diff --git a/.../misc/collections/tests/stock_map_view.rs → ...winrt/collections/tests/stock_map_view.rs b/.../misc/collections/tests/stock_map_view.rs → ...winrt/collections/tests/stock_map_view.rs
diff --git a/...sc/collections/tests/stock_vector_view.rs → ...rt/collections/tests/stock_vector_view.rs b/...sc/collections/tests/stock_vector_view.rs → ...rt/collections/tests/stock_vector_view.rs
diff --git a/...ests/misc/collections/tests/string_map.rs → ...sts/winrt/collections/tests/string_map.rs b/...ests/misc/collections/tests/string_map.rs → ...sts/winrt/collections/tests/string_map.rs
diff --git a/crates/tests/misc/event/Cargo.toml → crates/tests/winrt/event/Cargo.toml b/crates/tests/misc/event/Cargo.toml → crates/tests/winrt/event/Cargo.toml
diff --git a/crates/tests/misc/event/src/lib.rs → crates/tests/winrt/event/src/lib.rs b/crates/tests/misc/event/src/lib.rs → crates/tests/winrt/event/src/lib.rs
diff --git a/crates/tests/misc/event/tests/tests.rs → crates/tests/winrt/event/tests/tests.rs b/crates/tests/misc/event/tests/tests.rs → crates/tests/winrt/event/tests/tests.rs
diff --git a/crates/tests/misc/noexcept/Cargo.toml → crates/tests/winrt/noexcept/Cargo.toml b/crates/tests/misc/noexcept/Cargo.toml → crates/tests/winrt/noexcept/Cargo.toml
diff --git a/crates/tests/misc/noexcept/build.rs → crates/tests/winrt/noexcept/build.rs b/crates/tests/misc/noexcept/build.rs → crates/tests/winrt/noexcept/build.rs
diff --git a/crates/tests/misc/noexcept/src/bindings.rs → crates/tests/winrt/noexcept/src/bindings.rs b/crates/tests/misc/noexcept/src/bindings.rs → crates/tests/winrt/noexcept/src/bindings.rs
diff --git a/crates/tests/misc/noexcept/src/interop.cpp → crates/tests/winrt/noexcept/src/interop.cpp b/crates/tests/misc/noexcept/src/interop.cpp → crates/tests/winrt/noexcept/src/interop.cpp
diff --git a/crates/tests/misc/noexcept/src/lib.rs → crates/tests/winrt/noexcept/src/lib.rs b/crates/tests/misc/noexcept/src/lib.rs → crates/tests/winrt/noexcept/src/lib.rs
diff --git a/crates/tests/misc/noexcept/src/test.idl → crates/tests/winrt/noexcept/src/test.idl b/crates/tests/misc/noexcept/src/test.idl → crates/tests/winrt/noexcept/src/test.idl
diff --git a/crates/tests/misc/noexcept/tests/test.rs → crates/tests/winrt/noexcept/tests/test.rs b/crates/tests/misc/noexcept/tests/test.rs → crates/tests/winrt/noexcept/tests/test.rs
diff --git a/crates/tests/misc/winrt_old/Cargo.toml → crates/tests/winrt/old/Cargo.toml b/crates/tests/misc/winrt_old/Cargo.toml → crates/tests/winrt/old/Cargo.toml
@@ -29,4 +29,4 @@ features = [
 ]
 
 [dev-dependencies]
-helpers = { package = "test_helpers", path = "../helpers" }
+helpers = { workspace = true }
diff --git a/crates/tests/misc/winrt_old/src/lib.rs → crates/tests/winrt/old/src/lib.rs b/crates/tests/misc/winrt_old/src/lib.rs → crates/tests/winrt/old/src/lib.rs
diff --git a/crates/tests/misc/winrt_old/tests/async.rs → crates/tests/winrt/old/tests/async.rs b/crates/tests/misc/winrt_old/tests/async.rs → crates/tests/winrt/old/tests/async.rs
diff --git a/crates/tests/misc/winrt_old/tests/cast.rs → crates/tests/winrt/old/tests/cast.rs b/crates/tests/misc/winrt_old/tests/cast.rs → crates/tests/winrt/old/tests/cast.rs
diff --git a/...tests/misc/winrt_old/tests/collections.rs → crates/tests/winrt/old/tests/collections.rs b/...tests/misc/winrt_old/tests/collections.rs → crates/tests/winrt/old/tests/collections.rs
diff --git a/.../tests/misc/winrt_old/tests/collisions.rs → crates/tests/winrt/old/tests/collisions.rs b/.../tests/misc/winrt_old/tests/collisions.rs → crates/tests/winrt/old/tests/collisions.rs
diff --git a/...tests/misc/winrt_old/tests/composition.rs → crates/tests/winrt/old/tests/composition.rs b/...tests/misc/winrt_old/tests/composition.rs → crates/tests/winrt/old/tests/composition.rs
diff --git a/...s/tests/misc/winrt_old/tests/delegates.rs → crates/tests/winrt/old/tests/delegates.rs b/...s/tests/misc/winrt_old/tests/delegates.rs → crates/tests/winrt/old/tests/delegates.rs
diff --git a/crates/tests/misc/winrt_old/tests/enum.rs → crates/tests/winrt/old/tests/enum.rs b/crates/tests/misc/winrt_old/tests/enum.rs → crates/tests/winrt/old/tests/enum.rs
diff --git a/crates/tests/misc/winrt_old/tests/error.rs → crates/tests/winrt/old/tests/error.rs b/crates/tests/misc/winrt_old/tests/error.rs → crates/tests/winrt/old/tests/error.rs
diff --git a/...sts/misc/winrt_old/tests/generic_guids.rs → ...es/tests/winrt/old/tests/generic_guids.rs b/...sts/misc/winrt_old/tests/generic_guids.rs → ...es/tests/winrt/old/tests/generic_guids.rs
diff --git a/crates/tests/misc/winrt_old/tests/guid.rs → crates/tests/winrt/old/tests/guid.rs b/crates/tests/misc/winrt_old/tests/guid.rs → crates/tests/winrt/old/tests/guid.rs
diff --git a/...s/tests/misc/winrt_old/tests/interface.rs → crates/tests/winrt/old/tests/interface.rs b/...s/tests/misc/winrt_old/tests/interface.rs → crates/tests/winrt/old/tests/interface.rs
diff --git a/...s/tests/misc/winrt_old/tests/namespace.rs → crates/tests/winrt/old/tests/namespace.rs b/...s/tests/misc/winrt_old/tests/namespace.rs → crates/tests/winrt/old/tests/namespace.rs
diff --git a/...es/tests/misc/winrt_old/tests/numerics.rs → crates/tests/winrt/old/tests/numerics.rs b/...es/tests/misc/winrt_old/tests/numerics.rs → crates/tests/winrt/old/tests/numerics.rs
diff --git a/crates/tests/misc/winrt_old/tests/object.rs → crates/tests/winrt/old/tests/object.rs b/crates/tests/misc/winrt_old/tests/object.rs → crates/tests/winrt/old/tests/object.rs
diff --git a/...s/tests/misc/winrt_old/tests/send_sync.rs → crates/tests/winrt/old/tests/send_sync.rs b/...s/tests/misc/winrt_old/tests/send_sync.rs → crates/tests/winrt/old/tests/send_sync.rs
diff --git a/...ests/misc/winrt_old/tests/static_class.rs → crates/tests/winrt/old/tests/static_class.rs b/...ests/misc/winrt_old/tests/static_class.rs → crates/tests/winrt/old/tests/static_class.rs
diff --git a/crates/tests/misc/winrt_old/tests/uri.rs → crates/tests/winrt/old/tests/uri.rs b/crates/tests/misc/winrt_old/tests/uri.rs → crates/tests/winrt/old/tests/uri.rs
diff --git a/crates/tests/misc/winrt_old/tests/xml.rs → crates/tests/winrt/old/tests/xml.rs b/crates/tests/misc/winrt_old/tests/xml.rs → crates/tests/winrt/old/tests/xml.rs