Improve tests

Author: Bennett Hardwick

cryptonamo-derive/src/settings/builder.rs

@@ -169,6 +169,21 @@ impl SettingsBuilder {
                         }
                     }
 
+                    if field_name == "sk" {
+                        let has_partition_key_attr = field
+                            .attrs
+                            .iter()
+                            .find(|x| x.path().is_ident("sort_key"))
+                            .is_some();
+
+                        if !has_partition_key_attr {
+                            return Err(syn::Error::new_spanned(
+                                field,
+                                format!("field named 'sk' must be annotated with #[sort_key]"),
+                            ));
+                        }
+                    }
+
                     // Parse the meta for the field
                     for attr in &field.attrs {
                         if attr.path().is_ident("sort_key") {

tests/compile_tests.rs

@@ -1,17 +1,40 @@
-#[test]
-fn ui_tests() {
-    let t = trybuild::TestCases::new();
+use std::path::Path;
 
-    t.compile_fail("tests/ui/compound-index-missing-field.rs");
-    t.compile_fail("tests/ui/compound-index-missing-config.rs");
-    t.compile_fail("tests/ui/compound-index-too-many-fields.rs");
-    t.compile_fail("tests/ui/index-unsupported.rs");
-    t.compile_fail("tests/ui/compound-index-unsupported.rs");
-    t.compile_fail("tests/ui/using-pk-instead-of-pk-sk.rs");
-    t.compile_fail("tests/ui/invalid-field-name.rs");
-    t.compile_fail("tests/ui/pk-field-no-partition.rs");
-    t.compile_fail("tests/ui/pk-field-wrong-partition.rs");
+macro_rules! run_tests {
+    (fail => {$($f:expr),*}, pass => {$($p:expr),*}) => {
+        #[test]
+        fn ui_tests() {
+            let t = trybuild::TestCases::new();
+            let base = Path::new("tests");
 
-    t.pass("tests/ui/pk-field-on-struct.rs");
-    t.pass("tests/ui/pass.rs");
+            $(
+                t.compile_fail(base.join($f));
+            )*
+
+            $(
+                t.pass(base.join($p));
+            )*
+        }
+    }
+}
+
+run_tests! {
+    fail => {
+        "./ui/compound-index-missing-config.rs",
+        "./ui/compound-index-missing-field.rs",
+        "./ui/compound-index-too-many-fields.rs",
+        "./ui/compound-index-unsupported.rs",
+        "./ui/index-unsupported.rs",
+        "./ui/invalid-field-name.rs",
+        "./ui/pk-field-no-partition.rs",
+        "./ui/pk-field-wrong-partition.rs",
+        "./ui/sk-field-no-sort.rs",
+        "./ui/sk-field-wrong-sort.rs",
+        "./ui/using-pk-instead-of-pk-sk.rs"
+    },
+
+    pass => {
+        "./ui/pass.rs",
+        "./ui/pk-field-on-struct.rs"
+    }
 }

tests/ui/compound-index-missing-config.stderr

@@ -1,5 +1,5 @@
 error: Compound attribute was specified but no query options were. Specify how this field should be queried with the attribute #[cryptonamo(query = <option>, compound = "email#name")]
- --> tests/ui/compound-index-missing-config.rs:5:41
+ --> tests/./ui/compound-index-missing-config.rs:5:41
   |
 5 |     #[cryptonamo(compound = "email#name")]
   |                                         ^

tests/ui/compound-index-missing-field.stderr

@@ -1,5 +1,5 @@
 error: Not all fields were annotated with the #[cryptonamo(compound)] attribute. Missing fields: name
- --> tests/ui/compound-index-missing-field.rs:3:10
+ --> tests/./ui/compound-index-missing-field.rs:3:10
   |
 3 | #[derive(Encryptable)]
   |          ^^^^^^^^^^^

tests/ui/compound-index-too-many-fields.stderr

@@ -1,5 +1,5 @@
 error: Compound index 'email#name' does not include current field 'age'.
- --> tests/ui/compound-index-too-many-fields.rs:9:35
+ --> tests/./ui/compound-index-too-many-fields.rs:9:35
   |
 9 |     #[cryptonamo(query = "exact", compound = "email#name")]
   |                                   ^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/compound-index-unsupported.stderr

@@ -1,5 +1,5 @@
 error: Unsupported index type: blah
- --> tests/ui/compound-index-unsupported.rs:8:26
+ --> tests/./ui/compound-index-unsupported.rs:8:26
   |
 8 |     #[cryptonamo(query = "blah", compound = "email#name")]
   |                          ^^^^^^

tests/ui/index-unsupported.stderr

@@ -1,5 +1,5 @@
 error: Unsupported index type: blah
- --> tests/ui/index-unsupported.rs:5:26
+ --> tests/./ui/index-unsupported.rs:5:26
   |
 5 |     #[cryptonamo(query = "blah")]
   |                          ^^^^^^

tests/ui/invalid-field-name.stderr

@@ -1,5 +1,5 @@
 error: Invalid field '__name': fields must not be prefixed with __
- --> tests/ui/invalid-field-name.rs:8:5
+ --> tests/./ui/invalid-field-name.rs:8:5
   |
 8 |     __name: String
   |     ^^^^^^^^^^^^^^

tests/ui/pk-field-no-partition.stderr

@@ -1,5 +1,5 @@
 error: field named 'pk' must be annotated with #[partition_key]
- --> tests/ui/pk-field-no-partition.rs:5:5
+ --> tests/./ui/pk-field-no-partition.rs:5:5
   |
 5 |     pk: String,
   |     ^^^^^^^^^^

tests/ui/pk-field-wrong-partition.stderr

@@ -1,5 +1,5 @@
 error: field 'email' cannot be used as partition key as struct contains field named 'pk' which must be used
- --> tests/ui/pk-field-wrong-partition.rs:5:5
+ --> tests/./ui/pk-field-wrong-partition.rs:5:5
   |
 5 | /     #[partition_key]
 6 | |     #[cryptonamo(query = "exact", compound = "email#name")]