@@ -530,27 +530,45 @@ mod tests {
530
530
let gv = GodotVersion :: from_match_str ( "stable" ) . unwrap ( ) ;
531
531
assert_eq ! ( gv. release_type. as_deref( ) , Some ( "stable" ) ) ;
532
532
533
- assert ! ( GodotVersion :: from_match_str( "4.1.1-rc1" ) . is_err( ) ) ;
533
+ let gv = GodotVersion :: from_match_str ( "4.1.1-rc1" ) . unwrap ( ) ;
534
+ assert_eq ! ( gv. major, Some ( 4 ) ) ;
535
+ assert_eq ! ( gv. minor, Some ( 1 ) ) ;
536
+ assert_eq ! ( gv. patch, Some ( 1 ) ) ;
537
+ assert_eq ! ( gv. release_type. as_deref( ) , Some ( "rc1" ) ) ;
538
+
539
+ let gv = GodotVersion :: from_match_str ( "4.1.1-csharp" ) . unwrap ( ) ;
540
+ assert_eq ! ( gv. major, Some ( 4 ) ) ;
541
+ assert_eq ! ( gv. minor, Some ( 1 ) ) ;
542
+ assert_eq ! ( gv. patch, Some ( 1 ) ) ;
543
+ assert_eq ! ( gv. release_type. as_deref( ) , Some ( "csharp" ) ) ;
534
544
}
535
545
536
546
#[ test]
537
547
fn test_to_install_str ( ) {
538
- let gv = GodotVersion :: from_install_str ( "2.0.4.1-stable-csharp" ) . unwrap ( ) ;
539
- assert_eq ! ( gv. to_install_str( ) . unwrap( ) , "2.0.4.1-stable-csharp" ) ;
548
+ let gv = GodotVersion :: from_install_str ( "2.0.4.1-stable-csharp" )
549
+ . unwrap ( )
550
+ . to_determinate ( ) ;
551
+ assert_eq ! ( gv. to_install_str( ) , "2.0.4.1-stable-csharp" ) ;
540
552
}
541
553
542
554
#[ test]
543
555
fn test_sort_by_version ( ) {
544
556
let mut versions = vec ! [
545
- GodotVersion :: from_install_str( "3.0.0-stable" ) . unwrap( ) ,
546
- GodotVersion :: from_install_str( "4.1.1-rc2" ) . unwrap( ) ,
547
- GodotVersion :: from_install_str( "4.1.1-rc1" ) . unwrap( ) ,
557
+ GodotVersion :: from_install_str( "3.0.0-stable" )
558
+ . unwrap( )
559
+ . to_determinate( ) ,
560
+ GodotVersion :: from_install_str( "4.1.1-rc2" )
561
+ . unwrap( )
562
+ . to_determinate( ) ,
563
+ GodotVersion :: from_install_str( "4.1.1-rc1" )
564
+ . unwrap( )
565
+ . to_determinate( ) ,
548
566
] ;
549
567
versions. sort_by_version ( ) ;
550
568
// We expect 4.1.1-rc2 > 4.1.1-rc1 > 3.0.0-stable
551
- assert_eq ! ( versions[ 0 ] . release_type. as_deref ( ) , Some ( "rc2" ) ) ;
552
- assert_eq ! ( versions[ 1 ] . release_type. as_deref ( ) , Some ( "rc1" ) ) ;
553
- assert_eq ! ( versions[ 2 ] . major, Some ( 3 ) ) ;
569
+ assert_eq ! ( versions[ 0 ] . release_type, "rc2" ) ;
570
+ assert_eq ! ( versions[ 1 ] . release_type, "rc1" ) ;
571
+ assert_eq ! ( versions[ 2 ] . major, 3 ) ;
554
572
}
555
573
556
574
#[ test]
@@ -568,11 +586,11 @@ mod tests {
568
586
569
587
#[ test]
570
588
fn test_get_pre_release_priority ( ) {
571
- assert_eq ! ( get_pre_release_priority( "stable" ) , 0 ) ;
572
- assert_eq ! ( get_pre_release_priority( "rc1" ) , 1 ) ;
589
+ assert_eq ! ( get_pre_release_priority( "stable" ) , 4 ) ;
590
+ assert_eq ! ( get_pre_release_priority( "rc1" ) , 3 ) ;
573
591
assert_eq ! ( get_pre_release_priority( "beta1" ) , 2 ) ;
574
- assert_eq ! ( get_pre_release_priority( "dev1" ) , 3 ) ;
575
- assert_eq ! ( get_pre_release_priority( "unknown" ) , 4 ) ;
592
+ assert_eq ! ( get_pre_release_priority( "dev1" ) , 1 ) ;
593
+ assert_eq ! ( get_pre_release_priority( "unknown" ) , 0 ) ;
576
594
}
577
595
578
596
#[ test]
0 commit comments