tests

microsoft · Aug 15, 2023 · 922159f · 922159f
1 parent 7d03cc5
commit 922159f
Show file tree

Hide file tree

Showing 43 changed files with 86 additions and 44 deletions.
diff --git a/crates/tests/component/build.rs b/crates/tests/component/build.rs
@@ -39,7 +39,7 @@ fn main() {
         "--filter",
         "test_component",
         "--config",
-        "IMPLEMENT",
+        "implement",
     ]);
 
     if !command.status().unwrap().success() {

diff --git a/crates/tests/component/src/bindings.rs b/crates/tests/component/src/bindings.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/component_client/src/bindings.rs b/crates/tests/component_client/src/bindings.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/lib/tests/win.rs b/crates/tests/lib/tests/win.rs
@@ -43,7 +43,7 @@ fn clr() -> Result<()> {
         let mut version = vec![0; 20];
         let mut len = 0;
         GetFileVersion(
-            w!("../../libs/metadata/default/Windows.winmd"),
+            w!("../../libs/bindgen/default/Windows.winmd"),
             Some(&mut version),
             &mut len,
         )?;

diff --git a/crates/tests/riddle/src/composition.rs b/crates/tests/riddle/src/composition.rs
@@ -0,0 +1 @@
+
diff --git a/crates/tests/riddle/src/generic_interfaces.rs b/crates/tests/riddle/src/generic_interfaces.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/lib.rs b/crates/tests/riddle/src/lib.rs
@@ -1,3 +1,4 @@
+mod composition;
 mod generic_interfaces;
 mod module_attributes;
 mod nested_module;
@@ -28,7 +29,7 @@ pub fn run_riddle(name: &str, dialect: &str, etc: &[&str]) -> Vec<windows_metada
     command.args([
         "run", "-p", "riddle", "--", "--in", &winmd, "--out", &rdl, "--filter", "Test", "--config",
     ]);
-    command.arg(format!("TYPE={dialect}"));
+    command.arg(format!("type={dialect}"));
     assert!(command.status().unwrap().success());
 
     // Check that .rdl is unchanged

diff --git a/crates/tests/riddle/src/module_attributes.rs b/crates/tests/riddle/src/module_attributes.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/nested_module.rs b/crates/tests/riddle/src/nested_module.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/nested_struct.rs b/crates/tests/riddle/src/nested_struct.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/params.rs b/crates/tests/riddle/src/params.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/struct.rs b/crates/tests/riddle/src/struct.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/win32_struct.rs b/crates/tests/riddle/src/win32_struct.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/src/winrt_struct.rs b/crates/tests/riddle/src/winrt_struct.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/riddle/tests/composition.rdl b/crates/tests/riddle/tests/composition.rdl
@@ -0,0 +1,24 @@
+#![winrt]
+
+mod Test {
+    // TODO: maybe sort TypeDefs by  kind at when writing out rdl from winmd
+    class CompositionObject : ICompositionObject;
+    class Compositor : ICompositor;
+    interface ICompositionObject {
+        fn get_Compositor() -> Compositor;
+    }
+    interface ICompositor {
+        fn CreateSpriteVisual() -> SpriteVisual;
+    }
+    interface ISpriteVisual {
+        fn get_Brush() -> bool;
+    }
+    interface IVisual {
+        fn get_IsVisible() -> bool;
+    }
+    interface IVisual2 {
+        fn get_Opacity(value: bool);
+    }
+    class SpriteVisual : class Visual, ISpriteVisual;
+    class Visual : class CompositionObject, IVisual, IVisual2;
+}
diff --git a/crates/tests/riddle/tests/composition.rs b/crates/tests/riddle/tests/composition.rs
@@ -0,0 +1,12 @@
+// TODO: this test won't work until we have support for writing attributes
+// since we need the DefaultAttribute for classes.
+
+// use test_riddle::run_riddle;
+// use windows_metadata::*;
+
+// #[test]
+// fn test() {
+//     let files = run_riddle("composition", "winrt", &[]);
+//     let _reader = &Reader::new(&files);
+
+// }
diff --git a/crates/tests/riddle/tests/nested_module.rs b/crates/tests/riddle/tests/nested_module.rs
@@ -11,7 +11,9 @@ fn test() {
         .collect();
 
     assert_eq!(types.len(), 1);
-    let Item::Type(def) = types[0] else { panic!("type expected") };
+    let Item::Type(def) = types[0] else {
+        panic!("type expected")
+    };
 
     assert_eq!(reader.type_def_name(def), "TestType");
     assert_eq!(reader.type_def_kind(def), TypeKind::Struct);
@@ -25,7 +27,9 @@ fn test() {
         .collect();
 
     assert_eq!(types.len(), 1);
-    let Item::Type(def) = types[0] else { panic!("type expected") };
+    let Item::Type(def) = types[0] else {
+        panic!("type expected")
+    };
 
     assert_eq!(reader.type_def_name(def), "NestedType");
     assert_eq!(reader.type_def_kind(def), TypeKind::Struct);

diff --git a/crates/tests/standalone/build.rs b/crates/tests/standalone/build.rs
@@ -138,15 +138,15 @@ fn main() {
 }
 
 fn write_sys(output: &str, filter: &[&str]) {
-    riddle(output, filter, &["FLATTEN", "SYS", "MINIMAL"]);
+    riddle(output, filter, &["flatten", "sys", "minimal"]);
 }
 
 fn write_win(output: &str, filter: &[&str]) {
-    riddle(output, filter, &["FLATTEN", "MINIMAL"]);
+    riddle(output, filter, &["flatten", "minimal"]);
 }
 
 fn write_std(output: &str, filter: &[&str]) {
-    riddle(output, filter, &["FLATTEN", "STD", "MINIMAL"]);
+    riddle(output, filter, &["flatten", "std", "minimal"]);
 }
 
 fn riddle(output: &str, filter: &[&str], config: &[&str]) {
@@ -160,7 +160,7 @@ fn riddle(output: &str, filter: &[&str], config: &[&str]) {
         "../../../target/test_standalone", // TODO: workaround for https://github.com/rust-lang/cargo/issues/6412
         "--",
         "--in",
-        "../../libs/metadata/default",
+        "../../libs/bindgen/default",
         "--out",
         output,
         "--filter",

diff --git a/crates/tests/standalone/src/b_arch.rs b/crates/tests/standalone/src/b_arch.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_arch_dependencies.rs b/crates/tests/standalone/src/b_arch_dependencies.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_bstr.rs b/crates/tests/standalone/src/b_bstr.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_calendar.rs b/crates/tests/standalone/src/b_calendar.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_constant_types.rs b/crates/tests/standalone/src/b_constant_types.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_depends.rs b/crates/tests/standalone/src/b_depends.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_enumeration.rs b/crates/tests/standalone/src/b_enumeration.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_enumerator.rs b/crates/tests/standalone/src/b_enumerator.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_guid.rs b/crates/tests/standalone/src/b_guid.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_hresult.rs b/crates/tests/standalone/src/b_hresult.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_hstring.rs b/crates/tests/standalone/src/b_hstring.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_inspectable.rs b/crates/tests/standalone/src/b_inspectable.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_nested.rs b/crates/tests/standalone/src/b_nested.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_none.rs b/crates/tests/standalone/src/b_none.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_overloads.rs b/crates/tests/standalone/src/b_overloads.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_pcstr.rs b/crates/tests/standalone/src/b_pcstr.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_pcwstr.rs b/crates/tests/standalone/src/b_pcwstr.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_pstr.rs b/crates/tests/standalone/src/b_pstr.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_pwstr.rs b/crates/tests/standalone/src/b_pwstr.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_std.rs b/crates/tests/standalone/src/b_std.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_stringable.rs b/crates/tests/standalone/src/b_stringable.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_test.rs b/crates/tests/standalone/src/b_test.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_unknown.rs b/crates/tests/standalone/src/b_unknown.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_uri.rs b/crates/tests/standalone/src/b_uri.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,

diff --git a/crates/tests/standalone/src/b_win_enumerator.rs b/crates/tests/standalone/src/b_win_enumerator.rs
@@ -1,4 +1,4 @@
-// Bindings generated by `riddle` 0.0.1
+// Bindings generated by `windows-bindgen` 0.49.0
 
 #![allow(
     non_snake_case,