3 files changed, 62 insertions, 0 deletions
diff --git a/tvix/eval/src/value/attrs.rs b/tvix/eval/src/value/attrs.rs
index 209f97778c60..75ade6a89a9f 100644
--- a/tvix/eval/src/value/attrs.rs
+++ b/tvix/eval/src/value/attrs.rs
@@ -14,6 +14,9 @@ use crate::errors::{Error, EvalResult};
 use super::string::NixString;
 use super::Value;
 
+#[cfg(test)]
+mod tests;
+
 #[derive(Clone, Debug)]
 pub enum NixAttrs {
     Empty,
diff --git a/tvix/eval/src/value/attrs/tests.rs b/tvix/eval/src/value/attrs/tests.rs
new file mode 100644
index 000000000000..9bd8305482ab
--- /dev/null
+++ b/tvix/eval/src/value/attrs/tests.rs
@@ -0,0 +1,53 @@
+use super::*;
+
+#[test]
+fn test_empty_attrs() {
+    let attrs = NixAttrs::construct(0, vec![]).expect("empty attr construction should succeed");
+
+    assert!(
+        matches!(attrs, NixAttrs::Empty),
+        "empty attribute set should use optimised representation"
+    );
+}
+
+#[test]
+fn test_simple_attrs() {
+    let attrs = NixAttrs::construct(
+        1,
+        vec![Value::String("key".into()), Value::String("value".into())],
+    )
+    .expect("simple attr construction should succeed");
+
+    assert!(
+        matches!(attrs, NixAttrs::Map(_)),
+        "simple attribute set should use map representation",
+    )
+}
+
+#[test]
+fn test_kv_attrs() {
+    let name_val = Value::String("name".into());
+    let value_val = Value::String("value".into());
+    let meaning_val = Value::String("meaning".into());
+    let forty_two_val = Value::Integer(42);
+
+    let kv_attrs = NixAttrs::construct(
+        2,
+        vec![
+            value_val.clone(),
+            forty_two_val.clone(),
+            name_val.clone(),
+            meaning_val.clone(),
+        ],
+    )
+    .expect("constructing K/V pair attrs should succeed");
+
+    match kv_attrs {
+        NixAttrs::KV { name, value } if name == meaning_val || value == forty_two_val => {}
+
+        _ => panic!(
+            "K/V attribute set should use optimised representation, but got {:?}",
+            kv_attrs
+        ),
+    }
+}
diff --git a/tvix/eval/src/value/string.rs b/tvix/eval/src/value/string.rs
index 531bcf547b0b..d4776caea403 100644
--- a/tvix/eval/src/value/string.rs
+++ b/tvix/eval/src/value/string.rs
@@ -11,3 +11,9 @@ impl Display for NixString {
         f.write_str(self.0.as_str())
     }
 }
+
+impl From<&str> for NixString {
+    fn from(s: &str) -> Self {
+        NixString(s.to_string())
+    }
+}