@@ -1403,10 +1403,10 @@ mod test {
14031403
14041404 // check folders
14051405 let folders = [
1406- ( "folder_1" , None , folder_1_desc ) ,
1407- ( "folder_2" , Some ( folder_2_id) , folder_2_desc ) ,
1408- ( & tmp_folder_1_name, None , folder_3_desc ) ,
1409- ( & tmp_folder_2_name, None , folder_4_desc ) ,
1406+ ( "folder_1" , None ) ,
1407+ ( "folder_2" , Some ( folder_2_id) ) ,
1408+ ( & tmp_folder_1_name, None ) ,
1409+ ( & tmp_folder_2_name, None ) ,
14101410 ] ;
14111411 for folder in project. folders ( ) . unwrap ( ) . iter ( ) {
14121412 let found = folders
@@ -1416,27 +1416,26 @@ mod test {
14161416 if let Some ( id) = found. 1 {
14171417 assert_eq ! ( folder. id( ) . as_str( ) , id) ;
14181418 }
1419- assert_eq ! ( folder. description( ) . as_str( ) , found. 2 ) ;
14201419 }
14211420
14221421 // check files
14231422 #[ rustfmt:: skip]
14241423 let files = [
1425- ( "file_1" , & file_1_data[ ..] , file_1_desc , None , None ) ,
1426- ( "file_2" , & file_2_data[ ..] , file_2_desc , Some ( file_2_id) , None ) ,
1427- ( "file_3" , & file_3_data[ ..] , file_3_desc , None , None ) ,
1428- ( "file_4" , & file_4_data[ ..] , file_4_desc , Some ( file_4_id) , Some ( file_4_time) ) ,
1429- ( "file_5" , & input_file_1_data[ ..] , file_5_desc , None , None ) ,
1430- ( "file_6" , & input_file_2_data[ ..] , file_6_desc , Some ( file_6_id) , Some ( file_6_time) ) ,
1431- ( "input_1" , & input_file_1_data[ ..] , "" , None , None ) ,
1432- ( "input_2" , & input_file_2_data[ ..] , "" , None , None ) ,
1424+ ( "file_1" , & file_1_data[ ..] , None , None ) ,
1425+ ( "file_2" , & file_2_data[ ..] , Some ( file_2_id) , None ) ,
1426+ ( "file_3" , & file_3_data[ ..] , None , None ) ,
1427+ ( "file_4" , & file_4_data[ ..] , Some ( file_4_id) , Some ( file_4_time) ) ,
1428+ ( "file_5" , & input_file_1_data[ ..] , None , None ) ,
1429+ ( "file_6" , & input_file_2_data[ ..] , Some ( file_6_id) , Some ( file_6_time) ) ,
1430+ ( "input_1" , & input_file_1_data[ ..] , None , None ) ,
1431+ ( "input_2" , & input_file_2_data[ ..] , None , None ) ,
14331432 ] ;
14341433 for file in project. files ( ) . unwrap ( ) . iter ( ) {
14351434 let found = files. iter ( ) . find ( |f| file. name ( ) . as_str ( ) == f. 0 ) . unwrap ( ) ;
1436- if let Some ( id) = found. 3 {
1435+ if let Some ( id) = found. 2 {
14371436 assert_eq ! ( file. id( ) . as_str( ) , id) ;
14381437 }
1439- if let Some ( time) = found. 4 {
1438+ if let Some ( time) = found. 3 {
14401439 assert_eq ! (
14411440 file. creation_time( )
14421441 . duration_since( SystemTime :: UNIX_EPOCH )
@@ -1447,7 +1446,6 @@ mod test {
14471446 . as_secs( )
14481447 ) ;
14491448 }
1450- assert_eq ! ( file. description( ) . as_str( ) , found. 2 ) ;
14511449 let content = std:: fs:: read ( file. path_on_disk ( ) . as_str ( ) ) . unwrap ( ) ;
14521450 assert_eq ! ( content, found. 1 ) ;
14531451 }
0 commit comments