1 files changed, 22 insertions, 5 deletions
diff --git a/rust/tests/test_fcid.rs b/rust/tests/test_fcid.rs
index aac27129..31f7030a 100644
--- a/rust/tests/test_fcid.rs
+++ b/rust/tests/test_fcid.rs
@@ -1,17 +1,19 @@
 extern crate fatcat;
 extern crate uuid;
 
-use fatcat::identifiers::{fcid2uuid, uuid2fcid};
+// TODO: these should just be in-line in identifiers.rs
+
+use fatcat::identifiers::{fcid2uuid, uuid2fcid, FatCatId};
 use uuid::Uuid;
 
 #[test]
 fn test_fcid_conversions() {
     let test_uuid = Uuid::parse_str("86daea5b-1b6b-432a-bb67-ea97795f80fe").unwrap();
-    let test_fcid = "q3nouwy3nnbsvo3h5klxsx4a7y";
+    let test_str  = "q3nouwy3nnbsvo3h5klxsx4a7y";
 
-    assert_eq!(test_fcid, uuid2fcid(&test_uuid));
-    assert_eq!(test_uuid, fcid2uuid(test_fcid).unwrap());
-    assert_eq!(test_uuid, fcid2uuid(&test_fcid.to_uppercase()).unwrap());
+    assert_eq!(test_str,  uuid2fcid(&test_uuid));
+    assert_eq!(test_uuid, fcid2uuid(test_str).unwrap());
+    assert_eq!(test_uuid, fcid2uuid(&test_str.to_uppercase()).unwrap());
     assert_eq!(test_uuid, fcid2uuid(&uuid2fcid(&test_uuid)).unwrap());
 
     assert_eq!(
@@ -24,3 +26,18 @@ fn test_fcid_conversions() {
     assert_eq!(false, fcid2uuid("10Oouwy3nnbsvo3h5klxsx4a7y").is_ok());
     assert_eq!(false, fcid2uuid("cccccccccccccccccccccccccc").is_ok());
 }
+
+#[test]
+fn test_fcid_struct() {
+    let test_uuid = Uuid::parse_str("86daea5b-1b6b-432a-bb67-ea97795f80fe").unwrap();
+    let test_str  = "q3nouwy3nnbsvo3h5klxsx4a7y";
+    let test_fcid = FatCatId::from_uuid(&test_uuid);
+
+    assert_eq!(test_str,  test_fcid.to_string());
+    assert_eq!(test_str,  format!("{}", test_fcid));
+    assert_eq!(test_uuid, test_fcid.to_uuid());
+
+    // Inner UUID isn't public, so this doesn't work
+    //let test_fcid2 = FatCatId(test_uuid);
+    //assert_eq!(test_fcid, test_fcid2);
+}