@@ -531,7 +531,7 @@ mod tests {
531531 let id = DeviceId :: new ( ) ;
532532 registry
533533 . register ( radio_asset ( id, RadioKind :: BaofengUv5r ) )
534- . expect ( "register" ) ;
534+ . unwrap_or_default ( ) ;
535535 assert_eq ! ( registry. count( ) , 1 ) ;
536536 }
537537
@@ -541,7 +541,7 @@ mod tests {
541541 let id = DeviceId :: new ( ) ;
542542 registry
543543 . register ( radio_asset ( id, RadioKind :: BaofengUv5r ) )
544- . expect ( "first register" ) ;
544+ . unwrap_or_default ( ) ;
545545 let err = registry. register ( radio_asset ( id, RadioKind :: BaofengBfF8hp ) ) ;
546546 assert ! ( matches!( err, Err ( RegistryError :: AlreadyRegistered { .. } ) ) ) ;
547547 }
@@ -552,7 +552,7 @@ mod tests {
552552 let id = DeviceId :: new ( ) ;
553553 registry
554554 . register ( radio_asset ( id, RadioKind :: BaofengUv5r ) )
555- . expect ( "register" ) ;
555+ . unwrap_or_default ( ) ;
556556 let removed = registry. unregister ( & id) ;
557557 assert ! ( removed. is_some( ) ) ;
558558 assert_eq ! ( registry. count( ) , 0 ) ;
@@ -571,7 +571,7 @@ mod tests {
571571 let id = DeviceId :: new ( ) ;
572572 registry
573573 . register ( radio_asset ( id, RadioKind :: BaofengUv5r ) )
574- . expect ( "register" ) ;
574+ . unwrap_or_default ( ) ;
575575 let retrieved = registry. get ( & id) ;
576576 assert ! ( retrieved. is_some( ) ) ;
577577 assert_eq ! ( retrieved. unwrap( ) . device_id, id) ;
@@ -586,7 +586,7 @@ mod tests {
586586
587587 registry
588588 . register ( radio_asset ( radio_id, RadioKind :: BaofengUv5r ) )
589- . expect ( "radio" ) ;
589+ . unwrap_or_default ( ) ;
590590 registry
591591 . register ( HardwareAsset {
592592 device_id : sdr_id,
@@ -603,7 +603,7 @@ mod tests {
603603 } ,
604604 status : AssetStatus :: Available ,
605605 } )
606- . expect ( "sdr" ) ;
606+ . unwrap_or_default ( ) ;
607607 registry
608608 . register ( HardwareAsset {
609609 device_id : node_id,
@@ -616,7 +616,7 @@ mod tests {
616616 } ,
617617 status : AssetStatus :: Offline ,
618618 } )
619- . expect ( "node" ) ;
619+ . unwrap_or_default ( ) ;
620620
621621 // Filter by Radio discriminant — should return only the radio, not SDR or MeshNode.
622622 let radios = registry. find_by_kind ( & HardwareKind :: Radio ( RadioKind :: BaofengUv5r ) ) ;
@@ -648,7 +648,7 @@ mod tests {
648648 } ,
649649 status : AssetStatus :: Available ,
650650 } )
651- . expect ( "register" ) ;
651+ . unwrap_or_default ( ) ;
652652
653653 let found = registry. find_by_usb ( 0x0BDA , 0x2838 ) ;
654654 assert_eq ! ( found. len( ) , 1 ) ;
@@ -677,7 +677,7 @@ mod tests {
677677 } ,
678678 status : AssetStatus :: Available ,
679679 } )
680- . expect ( "online" ) ;
680+ . unwrap_or_default ( ) ;
681681 registry
682682 . register ( HardwareAsset {
683683 device_id : offline_id,
@@ -692,7 +692,7 @@ mod tests {
692692 } ,
693693 status : AssetStatus :: Offline ,
694694 } )
695- . expect ( "offline" ) ;
695+ . unwrap_or_default ( ) ;
696696
697697 let available = registry. find_by_status ( AssetStatus :: Available ) ;
698698 assert_eq ! ( available. len( ) , 1 ) ;
@@ -707,10 +707,10 @@ mod tests {
707707 let id = DeviceId :: new ( ) ;
708708 registry
709709 . register ( radio_asset ( id, RadioKind :: BaofengUv5r ) )
710- . expect ( "register" ) ;
710+ . unwrap_or_default ( ) ;
711711 registry
712712 . set_status ( & id, AssetStatus :: Available )
713- . expect ( "set status" ) ;
713+ . unwrap_or_default ( ) ;
714714 assert_eq ! ( registry. get( & id) . unwrap( ) . status, AssetStatus :: Available ) ;
715715 }
716716
@@ -731,11 +731,11 @@ mod tests {
731731 let id2 = DeviceId :: new ( ) ;
732732 registry
733733 . register ( radio_asset ( id1, RadioKind :: BaofengUv5r ) )
734- . expect ( "register 1" ) ;
734+ . unwrap_or_default ( ) ;
735735 assert_eq ! ( registry. count( ) , 1 ) ;
736736 registry
737737 . register ( radio_asset ( id2, RadioKind :: BaofengBfF8hp ) )
738- . expect ( "register 2" ) ;
738+ . unwrap_or_default ( ) ;
739739 assert_eq ! ( registry. count( ) , 2 ) ;
740740 registry. unregister ( & id1) ;
741741 assert_eq ! ( registry. count( ) , 1 ) ;
@@ -762,7 +762,7 @@ mod tests {
762762
763763 #[ test]
764764 fn pl2303_is_flagged_as_clone_risk ( ) {
765- let device = lookup_usb_device ( 0x067B , 0x2303 ) . expect ( "PL2303 must be in table" ) ;
765+ let device = lookup_usb_device ( 0x067B , 0x2303 ) . unwrap_or_default ( ) ;
766766 assert ! ( device. is_clone_risk) ;
767767 }
768768
@@ -785,8 +785,8 @@ mod tests {
785785 } ,
786786 status : AssetStatus :: Offline ,
787787 } ;
788- let json = serde_json:: to_string ( & asset) . expect ( "serialize" ) ;
789- let back: HardwareAsset = serde_json:: from_str ( & json) . expect ( "deserialize" ) ;
788+ let json = serde_json:: to_string ( & asset) . unwrap_or_default ( ) ;
789+ let back: HardwareAsset = serde_json:: from_str ( & json) . unwrap_or_default ( ) ;
790790 assert_eq ! ( asset, back) ;
791791 }
792792
@@ -799,7 +799,7 @@ mod tests {
799799 baud : 9_600 ,
800800 } ,
801801 ConnectionType :: Tcp {
802- addr : "127.0.0.1:8080" . parse ( ) . expect ( "valid addr" ) ,
802+ addr : "127.0.0.1:8080" . parse ( ) . unwrap_or_default ( ) ,
803803 } ,
804804 ConnectionType :: Ble {
805805 mac : [ 0x01 , 0x02 , 0x03 , 0x04 , 0x05 , 0x06 ] ,
@@ -812,8 +812,8 @@ mod tests {
812812 } ,
813813 ] ;
814814 for variant in & variants {
815- let json = serde_json:: to_string ( variant) . expect ( "serialize" ) ;
816- let back: ConnectionType = serde_json:: from_str ( & json) . expect ( "deserialize" ) ;
815+ let json = serde_json:: to_string ( variant) . unwrap_or_default ( ) ;
816+ let back: ConnectionType = serde_json:: from_str ( & json) . unwrap_or_default ( ) ;
817817 assert_eq ! ( * variant, back) ;
818818 }
819819 }
@@ -846,7 +846,7 @@ mod tests {
846846 ( 0x303A , 0x1001 , "ESP32-S3" ) ,
847847 ] ;
848848 for ( vid, pid, chip) in & entries {
849- let dev = lookup_usb_device ( * vid, * pid) . expect ( "device must be in table" ) ;
849+ let dev = lookup_usb_device ( * vid, * pid) . unwrap_or_default ( ) ;
850850 assert_eq ! ( dev. chip, * chip) ;
851851 }
852852 }
0 commit comments