test(object): 修复单测

tu6ge · Mar 9, 2023 · ecc6cc0 · ecc6cc0
1 parent c006da4
commit ecc6cc0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/object.rs b/src/object.rs
@@ -1238,7 +1238,7 @@ mod tests {
         let object_list = init_object_list(Some(String::from("foo3")), vec![]);
         assert_eq!(
             format!("{object_list:?}"),
-            "ObjectList { bucket: BucketBase { endpoint: CnShanghai, name: BucketName(\"abc\") }, prefix: \"foo2\", max_keys: 100, key_count: 200, next_continuation_token: Some(\"foo3\"), common_prefixes: [], search_query: Query { inner: {Custom(\"key1\"): QueryValue(\"value1\")} } }"
+            "ObjectList { bucket: BucketBase { endpoint: CnShanghai, name: BucketName(\"abc\") }, prefix: Some(ObjectDir(\"foo2/\")), max_keys: 100, key_count: 200, next_continuation_token: Some(\"foo3\"), common_prefixes: [], search_query: Query { inner: {Custom(\"key1\"): QueryValue(\"value1\")} } }"
         );
     }
 

diff --git a/src/tests/bucket.rs b/src/tests/bucket.rs
@@ -56,7 +56,7 @@ async fn test_get_bucket_list() {
     //println!("{:?}", res);
     assert_eq!(
         format!("{:?}", res),
-        r#"Ok(ListBuckets { prefix: None, marker: None, max_keys: 0, is_truncated: false, next_marker: None, id: None, display_name: None, buckets: [] })"#
+        r#"Ok(ListBuckets { prefix: "", marker: "", max_keys: 0, is_truncated: false, next_marker: "", id: "", display_name: "", buckets: [] })"#
     );
 }
 
@@ -106,7 +106,7 @@ fn test_get_blocking_bucket_list() {
     //println!("{:?}", res);
     assert_eq!(
         format!("{:?}", res),
-        r#"Ok(ListBuckets { prefix: None, marker: None, max_keys: 0, is_truncated: false, next_marker: None, id: None, display_name: None, buckets: [] })"#
+        r#"Ok(ListBuckets { prefix: "", marker: "", max_keys: 0, is_truncated: false, next_marker: "", id: "", display_name: "", buckets: [] })"#
     );
 }
 

diff --git a/src/tests/object.rs b/src/tests/object.rs
@@ -65,7 +65,7 @@ fn object_list_get_object_list() {
                     r#"<?xml version="1.0" encoding="UTF-8"?>
                 <ListBucketResult>
                   <Name>barname</Name>
-                  <Prefix></Prefix>
+                  <Prefix>foo2</Prefix>
                   <MaxKeys>100</MaxKeys>
                   <Delimiter></Delimiter>
                   <IsTruncated>false</IsTruncated>
@@ -96,7 +96,7 @@ fn object_list_get_object_list() {
 
     let mut object_list = ObjectList::<RcPointer>::new(
         "abc.oss-cn-shanghai.aliyuncs.com".parse().unwrap(),
-        String::from("foo2"),
+        Some("foo2/".parse().unwrap()),
         100,
         200,
         Vec::new(),
@@ -113,7 +113,7 @@ fn object_list_get_object_list() {
         list,
         EndPoint::CnShanghai,
         "abc".parse().unwrap(),
-        "".to_string(),
+        Some("foo2/".parse().unwrap()),
         100,
         23,
         None,

diff --git a/src/tests/traits.rs b/src/tests/traits.rs
@@ -108,7 +108,7 @@ mod object_list_xml {
                 Ok(())
             }
             fn set_prefix(&mut self, prefix: &str) -> Result<(), MyError> {
-                assert_eq!(prefix, "");
+                assert_eq!(prefix, "foo_prefix");
                 Ok(())
             }
             fn set_max_keys(&mut self, max_keys: &str) -> Result<(), MyError> {
@@ -131,7 +131,7 @@ mod object_list_xml {
         let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
         <ListBucketResult>
           <Name>foo_bucket</Name>
-          <Prefix></Prefix>
+          <Prefix>foo_prefix</Prefix>
           <MaxKeys>100</MaxKeys>
           <Delimiter></Delimiter>
           <IsTruncated>false</IsTruncated>