stackabletech · Techassi · Sep 11, 2024 · Sep 5, 2024 · Sep 5, 2024 · Sep 5, 2024
diff --git a/...able-versioned-macros/tests/bad/README.md → ...ioned-macros/tests/default/fail/README.md b/...able-versioned-macros/tests/bad/README.md → ...ioned-macros/tests/default/fail/README.md
diff --git a/...e-versioned-macros/tests/bad/deprecate.rs → ...ed-macros/tests/default/fail/deprecate.rs b/...e-versioned-macros/tests/bad/deprecate.rs → ...ed-macros/tests/default/fail/deprecate.rs
diff --git a/...rsioned-macros/tests/bad/deprecate.stderr → ...acros/tests/default/fail/deprecate.stderr b/...rsioned-macros/tests/bad/deprecate.stderr → ...acros/tests/default/fail/deprecate.stderr
@@ -1,5 +1,5 @@
 error: deprecation must be done using #[versioned(deprecated(since = "VERSION"))]
-  --> tests/bad/deprecate.rs:10:9
+  --> tests/default/fail/deprecate.rs:10:9
    |
 10 |         #[deprecated]
    |         ^
diff --git a/...rsioned-macros/tests/bad/skip_from_all.rs → ...acros/tests/default/fail/skip_from_all.rs b/...rsioned-macros/tests/bad/skip_from_all.rs → ...acros/tests/default/fail/skip_from_all.rs
diff --git a/...ned-macros/tests/bad/skip_from_all.stderr → ...s/tests/default/fail/skip_from_all.stderr b/...ned-macros/tests/bad/skip_from_all.stderr → ...s/tests/default/fail/skip_from_all.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> tests/bad/skip_from_all.rs:23:42
+  --> tests/default/fail/skip_from_all.rs:23:42
    |
 23 |     let foo_v1beta1 = v1beta1::Foo::from(foo_v1alpha1);
    |                       ------------------ ^^^^^^^^^^^^ expected `v1beta1::Foo`, found `v1alpha1::Foo`
@@ -8,7 +8,7 @@ error[E0308]: mismatched types
    |
    = note: `v1alpha1::Foo` and `v1beta1::Foo` have similar names, but are actually distinct types
 note: `v1alpha1::Foo` is defined in module `crate::main::v1alpha1` of the current crate
-  --> tests/bad/skip_from_all.rs:4:5
+  --> tests/default/fail/skip_from_all.rs:4:5
    |
 4  | /     #[versioned(
 5  | |         version(name = "v1alpha1"),
@@ -18,7 +18,7 @@ note: `v1alpha1::Foo` is defined in module `crate::main::v1alpha1` of the curren
 9  | |     )]
    | |______^
 note: `v1beta1::Foo` is defined in module `crate::main::v1beta1` of the current crate
-  --> tests/bad/skip_from_all.rs:4:5
+  --> tests/default/fail/skip_from_all.rs:4:5
    |
 4  | /     #[versioned(
 5  | |         version(name = "v1alpha1"),

diff --git a/...ned-macros/tests/bad/skip_from_version.rs → ...s/tests/default/fail/skip_from_version.rs b/...ned-macros/tests/bad/skip_from_version.rs → ...s/tests/default/fail/skip_from_version.rs
diff --git a/...macros/tests/bad/skip_from_version.stderr → ...sts/default/fail/skip_from_version.stderr b/...macros/tests/bad/skip_from_version.stderr → ...sts/default/fail/skip_from_version.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> tests/bad/skip_from_version.rs:23:32
+  --> tests/default/fail/skip_from_version.rs:23:32
    |
 23 |     let foo_v1 = v1::Foo::from(foo_v1beta1);
    |                  ------------- ^^^^^^^^^^^ expected `main::v1::Foo`, found `v1beta1::Foo`
@@ -8,7 +8,7 @@ error[E0308]: mismatched types
    |
    = note: `v1beta1::Foo` and `main::v1::Foo` have similar names, but are actually distinct types
 note: `v1beta1::Foo` is defined in module `crate::main::v1beta1` of the current crate
-  --> tests/bad/skip_from_version.rs:4:5
+  --> tests/default/fail/skip_from_version.rs:4:5
    |
 4  | /     #[versioned(
 5  | |         version(name = "v1alpha1"),
@@ -17,7 +17,7 @@ note: `v1beta1::Foo` is defined in module `crate::main::v1beta1` of the current
 8  | |     )]
    | |______^
 note: `main::v1::Foo` is defined in module `crate::main::v1` of the current crate
-  --> tests/bad/skip_from_version.rs:4:5
+  --> tests/default/fail/skip_from_version.rs:4:5
    |
 4  | /     #[versioned(
 5  | |         version(name = "v1alpha1"),

diff --git a/...ble-versioned-macros/tests/good/README.md → ...ioned-macros/tests/default/pass/README.md b/...ble-versioned-macros/tests/good/README.md → ...ioned-macros/tests/default/pass/README.md
diff --git a/...oned-macros/tests/good/attributes_enum.rs → ...ros/tests/default/pass/attributes_enum.rs b/...oned-macros/tests/good/attributes_enum.rs → ...ros/tests/default/pass/attributes_enum.rs
diff --git a/...ed-macros/tests/good/attributes_struct.rs → ...s/tests/default/pass/attributes_struct.rs b/...ed-macros/tests/good/attributes_struct.rs → ...s/tests/default/pass/attributes_struct.rs
diff --git a/...able-versioned-macros/tests/good/basic.rs → ...sioned-macros/tests/default/pass/basic.rs b/...able-versioned-macros/tests/good/basic.rs → ...sioned-macros/tests/default/pass/basic.rs
diff --git a/...-versioned-macros/tests/good/deprecate.rs → ...ed-macros/tests/default/pass/deprecate.rs b/...-versioned-macros/tests/good/deprecate.rs → ...ed-macros/tests/default/pass/deprecate.rs
diff --git a/...ble-versioned-macros/tests/good/rename.rs → ...ioned-macros/tests/default/pass/rename.rs b/...ble-versioned-macros/tests/good/rename.rs → ...ioned-macros/tests/default/pass/rename.rs
diff --git a/...ed-macros/tests/good/skip_from_version.rs → ...s/tests/default/pass/skip_from_version.rs b/...ed-macros/tests/good/skip_from_version.rs → ...s/tests/default/pass/skip_from_version.rs
diff --git a/...ckable-versioned-macros/tests/good/crd.rs → ...ackable-versioned-macros/tests/k8s/crd.rs b/...ckable-versioned-macros/tests/good/crd.rs → ...ackable-versioned-macros/tests/k8s/crd.rs
diff --git a/crates/stackable-versioned-macros/tests/trybuild.rs b/crates/stackable-versioned-macros/tests/trybuild.rs
@@ -36,8 +36,15 @@
 // }
 
 #[test]
-fn macros() {
+fn default_macros() {
     let t = trybuild::TestCases::new();
-    t.pass("tests/good/*.rs");
-    t.compile_fail("tests/bad/*.rs");
+    t.pass("tests/default/pass/*.rs");
+    t.compile_fail("tests/default/fail/*.rs");
+}
+
+#[cfg(feature = "k8s")]
+#[test]
+fn k8s_macros() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/k8s/*.rs");
 }