test(config): fix test case

Author: mmalenic

htsget-config/src/config/advanced/auth/response.rs

@@ -316,76 +316,70 @@ mod tests {
   use super::*;
   use crate::config::location::{PrefixOrId, SimpleLocation};
   use serde_json;
-  use std::result;
 
   #[test]
   fn test_authorization_response_deserialization() {
     let json_value = serde_json::json!({
       "version": 1,
-      "htsgetAuth": [
-        {
-          "location": {
-            "id": "HG00096",
-            "backend": "s3://umccr-10g-data-dev/HG00096/HG00096",
-          },
-          "rules": [
-            {
-              "format": "BAM"
-            }
-          ]
+      "htsgetAuth": [{
+        "location": {
+          "id": "path/to/file"
+        },
+        "rules": [{
+          "referenceName": "chr1",
+          "start": 1000,
+          "end": 2000,
+          "format": "BAM"
+        }]
+      }]
+    });
+    let response: AuthorizationRestrictions = serde_json::from_value(json_value).unwrap();
+
+    assert_eq!(response.version(), 1);
+    assert_eq!(response.htsget_auth().len(), 1);
+    assert_eq!(
+      response.htsget_auth()[0]
+        .location()
+        .as_simple()
+        .unwrap()
+        .prefix_or_id()
+        .unwrap()
+        .as_id()
+        .unwrap(),
+      "path/to/file"
+    );
+
+    let restrictions = response.htsget_auth()[0].rules().unwrap();
+    assert_eq!(restrictions.len(), 1);
+    assert_eq!(restrictions[0].reference_name(), Some("chr1"));
+    assert_eq!(restrictions[0].interval().start(), Some(1000));
+    assert_eq!(restrictions[0].interval().end(), Some(2000));
+    assert_eq!(restrictions[0].format(), Some(Format::Bam));
+
+    let no_restrictions_value = serde_json::json!({
+      "version": 1,
+      "htsgetAuth": [{
+        "location": {
+          "id": "path/to/file"
         }
-      ]
+      }]
     });
-    let response: result::Result<AuthorizationRestrictions, _> = serde_json::from_value(json_value);
-
-    println!("{:#?}", response);
-
-    //
-    // assert_eq!(response.version(), 1);
-    // assert_eq!(response.htsget_auth().len(), 1);
-    // assert_eq!(
-    //   response.htsget_auth()[0]
-    //     .location()
-    //     .as_simple()
-    //     .unwrap()
-    //     .prefix_or_id()
-    //     .unwrap()
-    //     .as_id()
-    //     .unwrap(),
-    //   "path/to/file"
-    // );
-    //
-    // let restrictions = response.htsget_auth()[0].rules().unwrap();
-    // assert_eq!(restrictions.len(), 1);
-    // assert_eq!(restrictions[0].reference_name(), Some("chr1"));
-    // assert_eq!(restrictions[0].interval().start(), Some(1000));
-    // assert_eq!(restrictions[0].interval().end(), Some(2000));
-    // assert_eq!(restrictions[0].format(), Some(Format::Bam));
-    //
-    // let no_restrictions_value = serde_json::json!({
-    //   "version": 1,
-    //   "htsgetAuth": [{
-    //     "location": {
-    //       "id": "path/to/file"
-    //     }
-    //   }]
-    // });
-    // let no_restrictions_response: AuthorizationRestrictions =
-    //   serde_json::from_value(no_restrictions_value).unwrap();
-    // assert_eq!(no_restrictions_response.version(), 1);
-    // assert_eq!(no_restrictions_response.htsget_auth().len(), 1);
-    // assert_eq!(
-    //   no_restrictions_response.htsget_auth()[0]
-    //     .location()
-    //     .as_simple()
-    //     .unwrap()
-    //     .prefix_or_id()
-    //     .unwrap()
-    //     .as_id()
-    //     .unwrap(),
-    //   "path/to/file"
-    // );
-    // assert!(no_restrictions_response.htsget_auth()[0].rules().is_none());
+    let no_restrictions_response: AuthorizationRestrictions =
+      serde_json::from_value(no_restrictions_value).unwrap();
+    assert_eq!(no_restrictions_response.version(), 1);
+    assert_eq!(no_restrictions_response.htsget_auth().len(), 1);
+    assert_eq!(
+      no_restrictions_response.htsget_auth()[0]
+        .location()
+        .as_simple()
+        .unwrap()
+        .prefix_or_id()
+        .unwrap()
+        .as_id()
+        .unwrap(),
+      "path/to/file"
+    );
+    assert!(no_restrictions_response.htsget_auth()[0].rules().is_none());
   }
 
   #[test]