@@ -651,11 +651,11 @@ public async Task TryConvertTo_Ok()
651651 MockEntity ? entity = null ;
652652
653653 // 设置数据适配器
654- var adapter = new MockEntityDataPackageAdapter
654+ var adapter = new DataPackageAdapter
655655 {
656656 DataPackageHandler = new FixLengthDataPackageHandler ( 7 ) ,
657657 } ;
658- client . SetDataPackageAdapter < MockEntity > ( adapter , t =>
658+ client . SetDataPackageAdapter ( adapter , new MockEntitySocketDataConverter ( ) , t =>
659659 {
660660 entity = t ;
661661 tcs . SetResult ( ) ;
@@ -676,9 +676,10 @@ public async Task TryConvertTo_Ok()
676676
677677 // 测试异常流程
678678 var adapter2 = new DataPackageAdapter ( ) ;
679- var result = adapter2 . TryConvertTo ( data , out var t ) ;
680- Assert . False ( result ) ;
681- Assert . Null ( t ) ;
679+ var result = adapter2 . TryConvertTo ( data , new MockEntitySocketDataConverter ( ) , out var t ) ;
680+ Assert . True ( result ) ;
681+ Assert . NotNull ( t ) ;
682+ Assert . Equal ( [ 1 , 2 , 3 , 4 , 5 ] , entity . Header ) ;
682683 }
683684
684685 [ Fact ]
@@ -691,11 +692,11 @@ public async Task TryConvertTo_Null()
691692 MockEntity ? entity = null ;
692693
693694 // 设置数据适配器
694- var adapter = new MockErrorEntityDataPackageAdapter
695+ var adapter = new DataPackageAdapter
695696 {
696697 DataPackageHandler = new FixLengthDataPackageHandler ( 7 ) ,
697698 } ;
698- client . SetDataPackageAdapter < MockEntity > ( adapter , t =>
699+ client . SetDataPackageAdapter ( adapter , new MockEntitySocketDataConverter ( ) , t =>
699700 {
700701 entity = t ;
701702 tcs . SetResult ( ) ;
@@ -710,7 +711,7 @@ public async Task TryConvertTo_Null()
710711 await client . SendAsync ( data ) ;
711712 await tcs . Task ;
712713
713- Assert . Null ( entity ) ;
714+ Assert . NotNull ( entity ) ;
714715 }
715716
716717 private static TcpListener StartTcpServer ( int port , Func < TcpClient , Task > handler )
@@ -1080,9 +1081,9 @@ public void SetReceive(bool state)
10801081 }
10811082 }
10821083
1083- class MockEntityDataPackageAdapter : DataPackageAdapter
1084+ class MockEntitySocketDataConverter : SocketDataConverterBase < MockEntity >
10841085 {
1085- public override bool TryConvertTo ( ReadOnlyMemory < byte > data , [ NotNullWhen ( true ) ] out object ? entity )
1086+ public override bool TryConvertTo ( ReadOnlyMemory < byte > data , [ NotNullWhen ( true ) ] out MockEntity ? entity )
10861087 {
10871088 entity = new MockEntity
10881089 {
@@ -1093,15 +1094,6 @@ public override bool TryConvertTo(ReadOnlyMemory<byte> data, [NotNullWhen(true)]
10931094 }
10941095 }
10951096
1096- class MockErrorEntityDataPackageAdapter : DataPackageAdapter
1097- {
1098- public override bool TryConvertTo ( ReadOnlyMemory < byte > data , [ NotNullWhen ( true ) ] out object ? entity )
1099- {
1100- entity = new Foo ( ) ;
1101- return true ;
1102- }
1103- }
1104-
11051097 class MockEntity
11061098 {
11071099 public byte [ ] ? Header { get ; set ; }
0 commit comments